Merge remote-tracking branch 'origin/master'

boman-api/boman-api-gen/pom.xml

@@ -22,11 +22,11 @@
             <groupId>com.boman</groupId>
             <artifactId>boman-common-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-modules-gen</artifactId>
             <version>2.5.0</version>
+            <scope>compile</scope>
         </dependency>
 
     </dependencies>

boman-auth/src/main/resources/bootstrap-test.yml

@@ -15,6 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         # 配置中心地址
         server-addr: 192.168.101.10:8848
@@ -23,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3

boman-gateway/src/main/resources/bootstrap-test.yml

@@ -17,6 +17,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         # 配置中心地址
         server-addr: 192.168.101.10:8848

boman-modules/boman-gen/pom.xml

@@ -74,13 +74,18 @@
     </dependencies>
 
     <build>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <classifier>execute</classifier>
-                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

boman-modules/boman-gen/src/main/resources/bootstrap-test.yml

@@ -15,6 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         # 配置中心地址
         server-addr: 192.168.101.10:8848

boman-modules/boman-system/src/main/resources/bootstrap-test.yml

@@ -10,9 +10,10 @@ spring:
     nacos:
       discovery:
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         server-addr: 192.168.101.10:8848
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3

boman-web-core/src/main/resources/bootstrap-test.yml

@@ -10,6 +10,7 @@ spring:
     nacos:
       discovery:
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         server-addr: 192.168.101.10:8848
         file-extension: yml