1.合并开源库代码

blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -47,6 +47,7 @@ public interface LauncherConstant {
 	 */
 	String NACOS_DEV_ADDR = "192.168.2.100:8848";
 
+
 	/**
 	 * nacos prod 地址
 	 */
@@ -57,6 +58,7 @@ public interface LauncherConstant {
 	 */
 	String NACOS_TEST_ADDR = "192.168.2.100:8848";
 
+
 	/**
 	 * sentinel dev 地址
 	 */
@@ -77,6 +79,7 @@ public interface LauncherConstant {
 	 */
 	String SEATA_DEV_ADDR = "192.168.2.100:8091";
 
+
 	/**
 	 * seata prod 地址
 	 */
@@ -87,6 +90,7 @@ public interface LauncherConstant {
 	 */
 	String SEATA_TEST_ADDR = "192.168.2.100:8091";
 
+
 	/**
 	 * dbuuo提供者
 	 */
@@ -162,6 +166,7 @@ public interface LauncherConstant {
 	 * 基础信息服务名称
 	 */
 	String APPLICATION_BASIC_NAME = "logpm-basic";
+
 	/**
 	 * seata 服务组格式
 	 *

blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java

@@ -34,7 +34,7 @@ public class GateWayApplication {
 
 	public static void main(String[] args) {
 
-		BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat("-pref"), GateWayApplication.class, args);
+		BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
 	}
 
 }

blade-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,5 @@
 server:
   port: 8888
-
 spring:
   cloud:
     gateway:

blade-ops/pom.xml

@@ -15,7 +15,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <!--<module>blade-xxljob</module>-->
         <module>blade-xxljob-admin</module>
     </modules>
 

blade-service-api/pom.xml

@@ -7,15 +7,13 @@
         <groupId>org.springblade</groupId>
         <version>3.1.0.RELEASE</version>
     </parent>
-
+    <description>BladeX 微服务API集合</description>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
     <version>3.1.0.RELEASE</version>
     <packaging>pom</packaging>
-    <description>BladeX 微服务API集合</description>
-
     <modules>
         <!--工厂数据-->
         <module>logpm-factory-api</module>
@@ -35,7 +33,6 @@
         <module>logpm-exception-api</module>
         <!--数据统计+结算-->
         <module>logpm-statisticsdata-api</module>
-
     </modules>
 
     <dependencies>
@@ -76,6 +73,7 @@
             <artifactId>blade-biz-common</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>

blade-service/logpm-basic/pom.xml

@@ -29,16 +29,6 @@
             <version>${bladex.project.version}</version>
         </dependency>
 
-
-
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-
-
-
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
@@ -51,6 +41,9 @@
             <version>3.1.0.RELEASE</version>
         </dependency>
     </dependencies>
+
+
+
     <groupId>org.springblade</groupId>
     <artifactId>logpm-basic</artifactId>
     <version>3.1.0.RELEASE</version>

blade-service/pom.xml

@@ -16,6 +16,8 @@
     <packaging>pom</packaging>
     <description>微服务集合</description>
 
+
+
     <modules>
         <!--工厂数据-->
         <module>logpm-factory</module>

doc/nacos/routes/blade-gateway-dev.json

@@ -12,7 +12,6 @@
     ],
     "filters": [],
     "uri": "lb://blade-desk-me"
-
   },
   {
     "id": "example-route",

pom.xml

@@ -171,7 +171,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -199,6 +198,7 @@
             <name>Release Repository</name>
             <url>http://192.168.2.100:8081/repository/logpm-release/</url>
         </repository>
+
     </repositories>
 
     <pluginRepositories>