合并新版MK代码

blade-auth/src/main/resources/application.yml

@@ -16,11 +16,11 @@ 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-api/pom.xml

@@ -21,6 +21,7 @@
         <module>blade-ratelimit-api</module>
         <module>blade-scope-api</module>
         <module>blade-system-api</module>
+        <module>blade-process-api</module>
         <module>blade-user-api</module>
         <module>blade-record-api</module>
         <module>blade-file-api</module>

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}

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <!-- bladex version -->
-        <revision>4.10.0.RELEASE</revision>
+        <revision>4.10.0.BASE-SNAPSHOT</revision>
 
         <java.version>17</java.version>
         <maven.plugin.version>3.14.1</maven.plugin.version>
@@ -109,6 +109,11 @@
                 <artifactId>blade-system-api</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-process-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springblade</groupId>
                 <artifactId>blade-transport-api</artifactId>