From 308bc8e5c0db7298a127f3478995ddc6167328e9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 25 十二月 2025 16:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_admin/pom.xml b/server/visits/dmvisit_admin/pom.xml
index ed28378..66052ae 100644
--- a/server/visits/dmvisit_admin/pom.xml
+++ b/server/visits/dmvisit_admin/pom.xml
@@ -20,6 +20,18 @@
<groupId>com.doumee</groupId>
<artifactId>dmvisit_service</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>4.31.1</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
@@ -37,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>
--
Gitblit v1.9.3