From 67197f9b3c643a99a01403d80aa20e474cfda452 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期二, 08 四月 2025 13:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java | 2 +-
aps-modules/aps-system/src/main/resources/bootstrap.yml | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-system/src/main/resources/bootstrap.yml b/aps-modules/aps-system/src/main/resources/bootstrap.yml
index e8c7779..f2dddc8 100644
--- a/aps-modules/aps-system/src/main/resources/bootstrap.yml
+++ b/aps-modules/aps-system/src/main/resources/bootstrap.yml
@@ -15,6 +15,9 @@
discovery:
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 192.168.50.160:8848
+# ip: 192.168.50.13
+# metadata:
+# local: zhl
config:
# 閰嶇疆涓績鍦板潃
server-addr: 192.168.50.160:8848
diff --git a/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java b/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
index d263001..53dda10 100644
--- a/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
+++ b/aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java
@@ -1,6 +1,6 @@
package com.aps.upload.service.impl;
-import com.aps.upload.service.ICoreService;
+import com.aps.core.service.ICoreService;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
--
Gitblit v1.9.3