From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
pom.xml | 123 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index be47d43..c28ebef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,8 @@
<version>2.3.6.RELEASE</version>
<relativePath/>
</parent>
+ <!--鎵撳寘鎴恮ar-->
+ <packaging>war</packaging>
<groupId>com.lf</groupId>
<artifactId>server</artifactId>
@@ -23,9 +25,23 @@
</properties>
<dependencies>
+ <!--spring-boot-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <!--鎺掗櫎鍐呯疆tomcat瀹瑰櫒锛岃澶栭儴瀹瑰櫒杩愯spring-boot椤圭洰-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--tomcat-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>provided</scope>
</dependency>
<!--<dependency>
<groupId>org.springframework.boot</groupId>
@@ -48,6 +64,24 @@
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
+ <!--mybatis-plus-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.1</version>
+ </dependency>
+ <!--鏀寔PGIS鐨刧eometry绫诲瀷锛歨ttps://www.91mszl.com/zhangwuji/article/details/1350-->
+ <!--<dependency>
+ <groupId>com.eyougo</groupId>
+ <artifactId>mybatis-typehandlers-postgis</artifactId>
+ <version>1.0</version>
+ </dependency>-->
+ <!--mybatis-->
+ <!--<dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>2.2.0</version>
+ </dependency>-->
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -68,23 +102,18 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
- <!--鐑儴缃�-->
+ <!--椤甸潰鐑儴缃�-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
+ <scope>true</scope>
</dependency>
<!--fastjson-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.47</version>
- </dependency>
- <!--mybatis-->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.2.0</version>
</dependency>
<!--鏁村悎druid鏁版嵁婧�-->
<dependency>
@@ -103,18 +132,13 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
- <!--hutool-->
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>4.5.7</version>
- </dependency>
<!--test-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+ <!--text-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -132,12 +156,12 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
- <!-- httpclient -->
+ <!--httpclient-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
- <!--娣诲姞WebSocket渚濊禆-->
+ <!--websocket-->
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
@@ -152,8 +176,9 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
- <version>4.4.2</version>
+ <version>6.8.0</version>
</dependency>
+ <!--hutool-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -162,33 +187,89 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>5.5.0</version>
+ <version>5.17.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <version>5.5.0</version>
+ <version>5.17.0</version>
</dependency>
<!--commons-fileupload-->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.11.0</version>
</dependency>
- <!--GDAL-->
+ <!--gdal-->
<dependency>
<groupId>org.gdal</groupId>
<artifactId>gdal</artifactId>
<version>3.2.0</version>
</dependency>
+ <!--zip4j-->
+ <dependency>
+ <groupId>net.lingala.zip4j</groupId>
+ <artifactId>zip4j</artifactId>
+ <version>2.6.4</version>
+ </dependency>
+ <!--easyexcel-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>2.2.10</version>
+ </dependency>
+ <!--access-->
+ <dependency>
+ <groupId>net.sf.ucanaccess</groupId>
+ <artifactId>ucanaccess</artifactId>
+ <version>5.0.1</version>
+ </dependency>
+ <!--war:servlet-->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--fast-md5-->
+ <dependency>
+ <groupId>com.joyent.util</groupId>
+ <artifactId>fast-md5</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <!--apache.poi-->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.16</version>
+ </dependency>
+ <!--SQLite-->
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.36.0.3</version>
+ </dependency>
+ <!--proj4j-->
+ <dependency>
+ <groupId>org.osgeo</groupId>
+ <artifactId>proj4j</artifactId>
+ <version>0.1.0</version>
+ </dependency>
+ <!--JTS-->
+ <dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>1.19.0</version>
+ </dependency>
</dependencies>
<build>
+ <finalName>server</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
--
Gitblit v1.9.3