|
@@ -14,16 +14,13 @@
|
|
<parent>
|
|
<parent>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-parent</artifactId>
|
|
<artifactId>spring-boot-starter-parent</artifactId>
|
|
- <version>2.1.0.RELEASE</version>
|
|
|
|
|
|
+ <version>2.3.4.RELEASE</version>
|
|
<relativePath/> <!-- lookup parent from repository -->
|
|
<relativePath/> <!-- lookup parent from repository -->
|
|
</parent>
|
|
</parent>
|
|
|
|
|
|
<modules>
|
|
<modules>
|
|
<module>gis_common</module>
|
|
<module>gis_common</module>
|
|
<module>gis_web</module>
|
|
<module>gis_web</module>
|
|
- <!--<module>gis_domain</module>-->
|
|
|
|
- <!--<module>gis_service</module>-->
|
|
|
|
- <!--<module>gis_mapper</module>-->
|
|
|
|
<module>gis_application</module>
|
|
<module>gis_application</module>
|
|
</modules>
|
|
</modules>
|
|
|
|
|
|
@@ -33,7 +30,7 @@
|
|
<java.version>1.8</java.version>
|
|
<java.version>1.8</java.version>
|
|
<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
|
|
<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
|
|
<gis.version>1.0.0</gis.version>
|
|
<gis.version>1.0.0</gis.version>
|
|
- <fastjson.version>1.2.51</fastjson.version>
|
|
|
|
|
|
+ <fastjson.version>1.2.75</fastjson.version>
|
|
<druid.version>1.1.14</druid.version>
|
|
<druid.version>1.1.14</druid.version>
|
|
<hutool.version>5.3.3</hutool.version>
|
|
<hutool.version>5.3.3</hutool.version>
|
|
<lombok.version>1.18.2</lombok.version>
|
|
<lombok.version>1.18.2</lombok.version>
|
|
@@ -79,12 +76,6 @@
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
|
|
|
|
- <!-- springboot -->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>org.springframework.boot</groupId>-->
|
|
|
|
- <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
|
|
|
|
- <!--<version>${spring.boot.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<groupId>org.springframework.boot</groupId>
|
|
@@ -99,19 +90,7 @@
|
|
<version>${spring.boot.version}</version>
|
|
<version>${spring.boot.version}</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
- <!--springboot中的redis依赖-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>org.springframework.boot</groupId>-->
|
|
|
|
- <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
|
|
|
|
- <!--<version>${spring.boot.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
|
|
- <!--rabbit MQ-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>org.springframework.boot</groupId>-->
|
|
|
|
- <!--<artifactId>spring-boot-starter-amqp</artifactId>-->
|
|
|
|
- <!--<version>${spring.boot.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
|
|
<!-- lombok -->
|
|
<!-- lombok -->
|
|
<dependency>
|
|
<dependency>
|
|
@@ -127,19 +106,7 @@
|
|
<version>${fastjson.version}</version>
|
|
<version>${fastjson.version}</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
- <!--阿里数据库连接池 -->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.alibaba</groupId>-->
|
|
|
|
- <!--<artifactId>druid-spring-boot-starter</artifactId>-->
|
|
|
|
- <!--<version>${druid.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
|
|
- <!-- mysql -->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>mysql</groupId>-->
|
|
|
|
- <!--<artifactId>mysql-connector-java</artifactId>-->
|
|
|
|
- <!--<version>${mysql.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
|
|
<!-- 工具类 -->
|
|
<!-- 工具类 -->
|
|
<dependency>
|
|
<dependency>
|
|
@@ -162,68 +129,7 @@
|
|
<version>${knife4j.version}</version>
|
|
<version>${knife4j.version}</version>
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
- <!-- shiro -->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>org.apache.shiro</groupId>-->
|
|
|
|
- <!--<artifactId>shiro-spring</artifactId>-->
|
|
|
|
- <!--<version>${shiro.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- <!-- jwt -->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.auth0</groupId>-->
|
|
|
|
- <!--<artifactId>java-jwt</artifactId>-->
|
|
|
|
- <!--<version>${jwt.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>io.jsonwebtoken</groupId>-->
|
|
|
|
- <!--<artifactId>jjwt</artifactId>-->
|
|
|
|
- <!--<version>${jjwt.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
- <!--aliyun sdk-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.aliyun</groupId>-->
|
|
|
|
- <!--<artifactId>aliyun-java-sdk-core</artifactId>-->
|
|
|
|
- <!--<version>${aliyun.core.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.aliyun</groupId>-->
|
|
|
|
- <!--<artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
|
|
|
|
- <!--<version>${aliyun.dysmsapi.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
- <!--aliyun oss-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.aliyun.oss</groupId>-->
|
|
|
|
- <!--<artifactId>aliyun-sdk-oss</artifactId>-->
|
|
|
|
- <!--<version>${aliyun.oss.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
- <!--tk.mybatis 依赖-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>tk.mybatis</groupId>-->
|
|
|
|
- <!--<artifactId>mapper-spring-boot-starter</artifactId>-->
|
|
|
|
- <!--<version>${tk.mybatis.version}</version>-->
|
|
|
|
- <!--<!– tk.mybatis 跟springboot jap 包冲突–>-->
|
|
|
|
- <!--<exclusions>-->
|
|
|
|
- <!--<exclusion>-->
|
|
|
|
- <!--<groupId>javax.persistence</groupId>-->
|
|
|
|
- <!--<artifactId>persistence-api</artifactId>-->
|
|
|
|
- <!--</exclusion>-->
|
|
|
|
- <!--</exclusions>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- <!--分页插件-->
|
|
|
|
- <!--<dependency>-->
|
|
|
|
- <!--<groupId>com.github.pagehelper</groupId>-->
|
|
|
|
- <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
|
|
|
|
- <!--<version>${pagehelper.version}</version>-->
|
|
|
|
- <!--</dependency>-->
|
|
|
|
|
|
+
|
|
|
|
|
|
<dependency>
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
<groupId>junit</groupId>
|