合并新版MK代码

blade-service/blade-file/src/main/resources/application.yml

@@ -16,10 +16,10 @@ spring:
       password: ${NACOS_PASSWORD:nacos}
       server-addr: ${NACOS_HOST:127.0.0.1:8848}
       discovery:
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
       config:
         file-extension: yaml
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
   datasource:
     url: ${blade.datasource.${spring.profiles.active}.url}
     username: ${blade.datasource.${spring.profiles.active}.username}

blade-service/blade-openapi/pom.xml

@@ -26,6 +26,10 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-threadpool</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-open-api</artifactId>

blade-service/blade-openapi/src/main/resources/application.yml

@@ -17,10 +17,10 @@ spring:
       password: ${NACOS_PASSWORD:nacos}
       server-addr: ${NACOS_HOST:127.0.0.1:8848}
       discovery:
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
       config:
         file-extension: yaml
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
   datasource:
     url: ${blade.datasource.${spring.profiles.active}.url}
     username: ${blade.datasource.${spring.profiles.active}.username}

blade-service/blade-system/src/main/resources/application.yml

@@ -16,10 +16,10 @@ spring:
       password: ${NACOS_PASSWORD:nacos}
       server-addr: ${NACOS_HOST:127.0.0.1:8848}
       discovery:
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
       config:
         file-extension: yaml
-        namespace: ${NACOS_NAMESPACE:${spring.profiles.active}}
+        namespace: "${NACOS_NAMESPACE:}"
   datasource:
     url: ${blade.datasource.${spring.profiles.active}.url}
     username: ${blade.datasource.${spring.profiles.active}.username}