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 | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index daab417..2483770 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -21,7 +21,7 @@
<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>
@@ -185,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>
@@ -316,7 +315,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -340,11 +338,23 @@
<type>pom</type>
<scope>import</scope>
</dependency>-->
- <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