From 01a9bdffee1f04561b3b59406cbb7a76474c55f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 10:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/pom.xml | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index d54b462..2483770 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -18,10 +18,10 @@
<swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.2.0</druid.version>
- <mybatis.plus.version>3.4.2</mybatis.plus.version>
+ <mybatis.plus.version>3.5.7</mybatis.plus.version>
<apache.shiro.version>1.7.0</apache.shiro.version>
<oshi.version>5.7.0</oshi.version>
- <jna.version>5.7.0</jna.version>
+ <jna.version>5.14.0</jna.version>
<poi.version>5.0.0</poi.version>
<spring-cloud.version>2021.0.3</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
@@ -36,7 +36,6 @@
<!-- 闃块噷浜慜SS瀛樺偍 -->
<aliyun-oss.version>3.8.0</aliyun-oss.version>
</properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -68,27 +67,33 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.3.0</version>
- <!--浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
- 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
- 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
- -->
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- </exclusion>
- <!-- 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊-->
- <exclusion>
- <artifactId>jsqlparser</artifactId>
- <groupId>com.github.jsqlparser</groupId>
- </exclusion>
- </exclusions>
+ <version>2.1.0</version>
</dependency>
+
+ <!-- <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.3.0</version>
+ <!–浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
+ 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
+ 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
+ –>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
+ </exclusion>
+ <!– 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊–>
+ <!–<exclusion>
+ <artifactId>jsqlparser</artifactId>
+ <groupId>com.github.jsqlparser</groupId>
+ </exclusion>–>
+ </exclusions>
+ </dependency>-->
<!-- 杩炴帴姹� -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -131,7 +136,12 @@
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dingtalk</artifactId>
- <version>1.3.54</version>
+ <version>2.2.25</version>
+ </dependency>
+ <dependency>
+ <groupId>com.dingtalk.open</groupId>
+ <artifactId>app-stream-client</artifactId>
+ <version>1.3.7</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
@@ -174,16 +184,16 @@
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jna-platform</artifactId>
+ <groupId>net.java.dev.jna</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jna</artifactId>
+ <groupId>net.java.dev.jna</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.yulichang/mybatis-plus-join -->
<dependency>
@@ -305,7 +315,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -329,5 +338,23 @@
<type>pom</type>
<scope>import</scope>
</dependency>-->
+ <!-- <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>4.31.1</version>
+ </dependency>
+-->
+ <!-- <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-java</artifactId>
+ <version>9.14.6206</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
</dependencies>
</project>
\ No newline at end of file
--
Gitblit v1.9.3