Merge remote-tracking branch 'shucheng/mk'

# Conflicts: # blade-service-api/blade-open-api/src/main/java/org/springblade/openapi/mk/api/IApi4MK.java # blade-service-api/pom.xml # blade-service/blade-file/src/main/java/org/springblade/file/FileApplication.java # blade-service/blade-file/src/main/resources/bootstrap.yml # blade-service/blade-openapi/src/main/java/org/springblade/openapi/OpenApiApplication.java # blade-service/blade-openapi/src/main/resources/bootstrap.yml # pom.xml
2026-08-15 12:16:05 +08:00
parent 1ca36ae153 4de1d35c2c
commit 98cd7ba4cf
77 changed files with 5134 additions and 207 deletions
@@ -0,0 +1,27 @@
+server:
+  port: 8108
+
+spring:
+  application:
+    name: blade-openapi
+  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
+      - nacos:blade-openapi-dynamictp.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: 38108
-#spring:
-#  cloud:
-#    nacos:
-#      username: nacos
-#      password: gr30wIs5%Hi7keQj
-#      server-addr: ${NACOS_ADDR:10.38.16.127:8848}