refactor(file): 重构文件服务配置管理

2026-08-10 13:40:16 +08:00
parent 8602262e16
commit 4de1d35c2c
6 changed files with 27 additions and 61 deletions
@@ -40,6 +40,7 @@ import org.springframework.context.annotation.ComponentScan;
 public class FileApplication {

 	public static void main(String[] args) {
+		BladeApplication.disableNacosLaunchConfig();
 		BladeApplication.run(AppConstant.APPLICATION_FILE_NAME, FileApplication.class, args);
 	}

@@ -0,0 +1,26 @@
+server:
+  port: 8107
+
+spring:
+  application:
+    name: blade-file
+  config:
+    import:
+      - nacos:blade.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - nacos:blade-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - nacos:third-party-api.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true
+  cloud:
+    nacos:
+      username: ${NACOS_USERNAME:nacos}
+      password: ${NACOS_PASSWORD:nacos}
+      server-addr: ${NACOS_HOST:127.0.0.1:8848}
+      discovery:
+        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+      config:
+        file-extension: yaml
+        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+  datasource:
+    url: ${blade.datasource.${spring.profiles.active}.url}
+    username: ${blade.datasource.${spring.profiles.active}.username}
+    password: ${blade.datasource.${spring.profiles.active}.password}
@@ -1,6 +0,0 @@
-#spring:
-#  cloud:
-#    nacos:
-#      username: nacos
-#      password: ${NACOS_PASSWORD:gr30wIs5%Hi7keQj}
-#      server-addr: ${NACOS_ADDR:10.38.16.127:8848}
@@ -1,6 +0,0 @@
-#spring:
-#  cloud:
-#    nacos:
-#      username: nacos
-#      password: rWrMrVTWyf%ekjuw
-#      server-addr: ${NACOS_ADDR:192.168.0.242:8848}
@@ -1,8 +0,0 @@
-#server:
-#  port: 38107
-#spring:
-#  cloud:
-#    nacos:
-#      username: nacos
-#      password: gr30wIs5%Hi7keQj
-#      server-addr: ${NACOS_ADDR:10.38.16.127:8848}
@@ -1,41 +0,0 @@
-server:
-  port: 8107
-
-#数据源配置
-spring:
-  datasource:
-    url: ${blade.datasource.dev.url}
-    username: ${blade.datasource.dev.username}
-    password: ${blade.datasource.dev.password}
-
-#spring:
-#  application:
-#    name: blade-file
-#  cloud:
-#    nacos:
-#      discovery:
-#        namespace: ${spring.profiles.active}
-#        # 不注册到nacos
-#        #registerEnabled: false
-#      config:
-#        # 文件后缀名
-#        file-extension: yaml
-#        namespace: ${spring.profiles.active}
-#        shared-configs:
-#          - data-id: blade.yaml
-#            refresh: true
-#          - data-id: blade-${spring.profiles.active}.yaml
-#            refresh: true
-#          - data-id: third-party-api.yaml
-#            refresh: true
-#    sentinel:
-#      datasource:
-#        flow:
-#          nacos:
-#            serverAddr: ${spring.cloud.nacos.server-addr}
-#            username: ${spring.cloud.nacos.username}
-#            password: ${spring.cloud.nacos.password}
-#            dataId: sentinel-${spring.application.name}.json
-#            groupId: DEFAULT_GROUP
-#            namespace: ${spring.profiles.active}
-#            ruleType: flow