From 573123827763851bba3ac301aba7515ff4ae037b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 24 二月 2025 17:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
index c648214..178c8df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
@@ -11,31 +11,31 @@
     serviceUrl:
       defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
 
-spring:
-  application:
-    name: huacheng-config
-
-  cloud:
-    config:
-      server:
-        git:
-          uri: http://gitlab.nhys.cdnhxx.com:9380/huanghongfa/config-repo.git
-#          search-paths: adminConfig
-          username: huanghongfa
-          password: huanghongfa123456
-          default-label: huacheng
-#          basedir: F:\nahan\config-repo\config-repo
-
 #spring:
 #  application:
 #    name: huacheng-config
-#  profiles:
-#    active: native
+#
 #  cloud:
 #    config:
 #      server:
-#        native:
-#          search-locations: file:E:\\work\\config\\config-repo
+#        git:
+#          uri: http://gitlab.nhys.cdnhxx.com:9380/huanghongfa/config-repo.git
+##          search-paths: adminConfig
+#          username: huanghongfa
+#          password: huanghongfa123456
+#          default-label: huacheng
+##          basedir: F:\nahan\config-repo\config-repo
+
+spring:
+  application:
+    name: huacheng-config
+  profiles:
+    active: native
+  cloud:
+    config:
+      server:
+        native:
+          search-locations: file:F:\lfl\config-repo-huacheng
 
 management:
   endpoints:

--
Gitblit v1.7.1