合并

李宇

2021-01-27 d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb

 pom.xml

@@ -27,7 +27,7 @@
  </repositories>

  <properties>
    <spring.version>4.3.8.RELEASE</spring.version>
    <spring.version>4.3.29.RELEASE</spring.version>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  </properties>
@@ -322,29 +322,29 @@
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-core</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-web</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-ehcache</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-spring</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <!--- end shiro -->

    <dependency>
      <groupId>com.alibaba</groupId>
      <artifactId>fastjson</artifactId>
      <version>1.2.8</version>
      <version>1.2.75</version>
    </dependency>
    <dependency>
      <groupId>com.google.collections</groupId>
@@ -360,7 +360,7 @@
      <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
          <version>2.9.0.pr3</version>
          <version>2.9.10.7</version>
      </dependency>
    <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
    <dependency>
@@ -452,6 +452,24 @@
        <profile.active>szygs</profile.active>
      </properties>
    </profile>
    <profile>
      <id>zkysh</id>
      <properties>
        <profile.active>zkysh</profile.active>
      </properties>
    </profile>
    <profile>
      <id>shgjs</id>
      <properties>
        <profile.active>shgjs</profile.active>
      </properties>
    </profile>
    <profile>
      <id>zkyshs</id>
      <properties>
        <profile.active>zkyshs</profile.active>
      </properties>
    </profile>
  </profiles>
  <build>
    <finalName>smartlab</finalName>
@@ -467,6 +485,14 @@
          <target>1.8</target>
          <encoding>UTF-8</encoding>
          <skip>true</skip>
          <excludes>
            <exclude>
              resources/template/*
            </exclude>
            <exclude>
              resources/*.docx
            </exclude>
          </excludes>
        </configuration>
      </plugin>
      <plugin>