From 704a1962e9920e6cb927884015c04eca72295faf Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:17 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/pom.xml | 17 --------
server/startsh/启动脚本和日志处理脚本说明.txt | 8 ++++
server/startsh/admin_start.sh | 12 +++--
server/visits/dmvisit_admin/pom.xml | 26 +++++++++++++
server/system_service/src/main/java/com/doumee/core/utils/Monitor.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java | 2
server/visits/dmvisit_service/pom.xml | 5 ++
7 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
index ae7e192..0972e32 100644
--- a/server/startsh/admin_start.sh
+++ b/server/startsh/admin_start.sh
@@ -8,8 +8,10 @@
/usr/local/nacos/nacos/bin/startup.sh -m standalone
-nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/system_gateway.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/admin_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/system_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/admin_interface.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/wuhuyancao/meeting_admin.jar > /dev/null 2>&1 &
+
+tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-31.0.log
diff --git "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt" "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
index c8720f2..692cd90 100644
--- "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
+++ "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
@@ -11,3 +11,11 @@
#鎸塃sc閿悗鍐嶈緭鍏�:wq锛�,鍥炶溅淇濆瓨
#鏌ョ湅鏄惁鍒涘缓鎴愬姛
crontab -l
+
+
+
+#JAVA spring boot涓娇鐢╣oogle鐨刼rtools(绠楁硶鍖�)
+
+Linux绯荤粺瀹夎瀵瑰簲鐨勭増鏈湇鍔★細
+https://developers.google.cn/optimization/install/java/pkg_linux?hl=zh-cn#ubuntu
+锛坔ttps://modelers.csdn.net/68db8ec14b11580edfa299c6.html?spm=1001.2101.3001.6650.5&utm_medium=distribute.pc_relevant.none-task-blog-2%7Edefault%7EBlogCommendFromBaidu%7Eactivity-5-134512600-blog-119785705.235%5Ev43%5Epc_blog_bottom_relevance_base5&depth_1-utm_source=distribute.pc_relevant.none-task-blog-2%7Edefault%7EBlogCommendFromBaidu%7Eactivity-5-134512600-blog-119785705.235%5Ev43%5Epc_blog_bottom_relevance_base5&utm_relevant_index=10锛�
diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index 1439845..2483770 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -356,22 +356,5 @@
</exclusions>
</dependency>
-->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>4.31.1</version>
- <scope>compile</scope>
- </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
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Monitor.java b/server/system_service/src/main/java/com/doumee/core/utils/Monitor.java
index 4da8296..238e569 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Monitor.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Monitor.java
@@ -1,7 +1,6 @@
package com.doumee.core.utils;
import com.doumee.core.utils.monitor.*;
-import com.sun.jna.platform.mac.DiskArbitration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_admin/pom.xml b/server/visits/dmvisit_admin/pom.xml
index 0bcd92a..66052ae 100644
--- a/server/visits/dmvisit_admin/pom.xml
+++ b/server/visits/dmvisit_admin/pom.xml
@@ -49,6 +49,32 @@
<fork>true</fork>
<mainClass>com.doumee.VisitsAdminApplication</mainClass>
<layout>ZIP</layout>
+ <requiresUnpack>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-linux-x86-64</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-darwin-x86-64</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-win32-x86-64</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-linux-aarch64</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-darwin-aarch64</artifactId>
+ </dependency>
+ </requiresUnpack>
</configuration>
<executions>
<execution>
diff --git a/server/visits/dmvisit_service/pom.xml b/server/visits/dmvisit_service/pom.xml
index c79fde7..923a209 100644
--- a/server/visits/dmvisit_service/pom.xml
+++ b/server/visits/dmvisit_service/pom.xml
@@ -21,6 +21,11 @@
<groupId>com.doumee</groupId>
<artifactId>system_service</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.ortools</groupId>
+ <artifactId>ortools-java</artifactId>
+ <version>9.14.6206</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
index d8eaa4f..8d4ccdc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
@@ -5,7 +5,7 @@
import com.google.ortools.Loader;
import com.google.ortools.constraintsolver.*;
import lombok.extern.slf4j.Slf4j;
-import com.google.protobuf.Internal.IntListAdapter.IntConverter;
+import com.google.ortools.constraintsolver.mainJNI;
import java.util.ArrayList;
import java.util.List;
--
Gitblit v1.9.3