From dd4cd96c69061da3ff80cbfb87237b16cda8abc3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 26 九月 2025 18:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/system_service/pom.xml |   78 +++++++++++++++++++++++++++------------
 1 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index 0f8156b..daab417 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -18,7 +18,7 @@
         <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>
@@ -38,6 +38,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <!-- Spring Boot -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -64,27 +68,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>
+             &lt;!&ndash;浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
+                 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
+                 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
+             &ndash;&gt;
+             <exclusions>
+                 <exclusion>
+                     <groupId>org.mybatis</groupId>
+                     <artifactId>mybatis</artifactId>
+                 </exclusion>
+                 <exclusion>
+                     <groupId>org.mybatis</groupId>
+                     <artifactId>mybatis-spring</artifactId>
+                 </exclusion>
+                 &lt;!&ndash; 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊&ndash;&gt;
+                 &lt;!&ndash;<exclusion>
+                     <artifactId>jsqlparser</artifactId>
+                     <groupId>com.github.jsqlparser</groupId>
+                 </exclusion>&ndash;&gt;
+             </exclusions>
+         </dependency>-->
         <!-- 杩炴帴姹� -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -98,12 +108,21 @@
         </dependency>
 
         <!-- swagger -->
-        <dependency>
+         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>3.0.3</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>2.1.5</version>
+        </dependency>
         <!-- lombok -->
         <dependency>
             <groupId>javax.validation</groupId>
@@ -118,7 +137,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>
@@ -316,5 +340,11 @@
             <type>pom</type>
             <scope>import</scope>
         </dependency>-->
+         <dependency>
+            <groupId>com.google.ortools</groupId>
+            <artifactId>ortools-java</artifactId>
+            <version>9.14.6206</version>
+        </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file

--
Gitblit v1.9.3