Merge pull request #33 from lawrencehj/wvp-28181-2.0

648540858

2021-01-11 d8635682bbb37253e0d14cdd9bad2a37315011f7

 pom.xml

@@ -45,9 +45,6 @@
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

      <!-- 依赖版本 -->
      <mapper.version>4.1.5</mapper.version>
      <mybatis.version>3.5.5</mybatis.version>
      <mybatis.spring.version>2.0.5</mybatis.spring.version>
      <pagehelper.version>5.2.0</pagehelper.version>
      <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
      <asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
@@ -59,30 +56,16 @@
   <dependencies>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jdbc</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-tomcat</artifactId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
      </dependency>

      <!-- redis -->
      <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-redis</artifactId>
      </dependency>
      <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
         <version>3.3.0</version>
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
      </dependency>

      <!-- druid数据库连接池 -->
@@ -106,36 +89,18 @@
         <version>3.32.3.2</version>
      </dependency>

      <!--Mybatis -->
      <dependency>
         <groupId>org.mybatis</groupId>
         <artifactId>mybatis</artifactId>
         <version>${mybatis.version}</version>
      </dependency>
      <dependency>
         <groupId>org.mybatis</groupId>
         <artifactId>mybatis-spring</artifactId>
         <version>${mybatis.spring.version}</version>
      </dependency>

      <!--分页插件 -->
      <!--Mybatis分页插件 -->
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper</artifactId>
         <version>${pagehelper.version}</version>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>1.2.10</version>
      </dependency>

      <!--通用Mapper -->
      <dependency>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper</artifactId>
         <version>${mapper.version}</version>
      </dependency>
      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
         <version>3.11</version>
      </dependency>
<!--      <dependency>-->
<!--         <groupId>org.apache.commons</groupId>-->
<!--         <artifactId>commons-lang3</artifactId>-->
<!--         <version>3.11</version>-->
<!--      </dependency>-->

      <!--Swagger2 -->
      <!--在线文档 -->
@@ -166,7 +131,7 @@
         <artifactId>jain-sip-ri</artifactId>
         <version>1.3.0-92</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
         <systemPath>${pom.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
      </dependency>
      <dependency>
         <groupId>log4j</groupId>
@@ -176,7 +141,7 @@

      <!-- xml解析库 -->
      <dependency>
            <groupId>org.dom4j</groupId>
         <groupId>org.dom4j</groupId>
         <artifactId>dom4j</artifactId>
         <version>2.1.3</version>
      </dependency>