修改依赖配置

优化启动类注解

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

@@ -27,204 +27,204 @@ import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_
  */
 public interface LauncherConstant {
 
-	/**
-	 * xxljob
-	 */
-	String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob";
+    /**
+     * xxljob
+     */
+    String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob";
 
-	/**
-	 * xxljob
-	 */
-	String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin";
+    /**
+     * xxljob
+     */
+    String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin";
 
 	/**
 	 * nacos dev 地址
 	 */
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
-	/**
-	 * nacos prod 地址
-	 */
-	String NACOS_PROD_ADDR = "139.9.76.154:8848";
+    /**
+     * nacos prod 地址
+     */
+    String NACOS_PROD_ADDR = "139.9.76.154:8848";
 
 	/**
 	 * nacos test 地址
 	 */
 	String NACOS_TEST_ADDR = "127.0.0.1:8848";
 
-	/**
-	 * sentinel dev 地址
-	 */
-	String SENTINEL_DEV_ADDR = "127.0.0.1:8858";
-
-	/**
-	 * sentinel prod 地址
-	 */
-	String SENTINEL_PROD_ADDR = "172.30.0.58:8858";
-
-	/**
-	 * sentinel test 地址
-	 */
-	String SENTINEL_TEST_ADDR = "172.30.0.58:8858";
-
-	/**
-	 * seata dev 地址
-	 */
-	String SEATA_DEV_ADDR = "127.0.0.1:8091";
-
-	/**
-	 * seata prod 地址
-	 */
-	String SEATA_PROD_ADDR = "172.30.0.68:8091";
-
-	/**
-	 * seata test 地址
-	 */
-	String SEATA_TEST_ADDR = "172.30.0.68:8091";
-
-	/**
-	 * zipkin dev 地址
-	 */
-	String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411";
-
-	/**
-	 * zipkin prod 地址
-	 */
-	String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411";
-
-	/**
-	 * zipkin test 地址
-	 */
-	String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411";
-
-	/**
-	 * elk dev 地址
-	 */
-	String ELK_DEV_ADDR = "127.0.0.1:9000";
-
-	/**
-	 * elk prod 地址
-	 */
-	String ELK_PROD_ADDR = "172.30.0.72:9000";
-
-	/**
-	 * elk test 地址
-	 */
-	String ELK_TEST_ADDR = "172.30.0.72:9000";
-
-	/**
-	 * seata file模式
-	 */
-	String FILE_MODE = "file";
-
-	/**
-	 * seata nacos模式
-	 */
-	String NACOS_MODE = "nacos";
-
-	/**
-	 * seata default模式
-	 */
-	String DEFAULT_MODE = "default";
-
-	/**
-	 * seata group后缀
-	 */
-	String GROUP_NAME = "-group";
-
-	/**
-	 * seata 服务组格式
-	 *
-	 * @param appName 服务名
-	 * @return group
-	 */
-	static String seataServiceGroup(String appName) {
-		return appName.concat(GROUP_NAME);
-	}
-
-	/**
-	 * 动态获取nacos地址
-	 *
-	 * @param profile 环境变量
-	 * @return addr
-	 */
-	static String nacosAddr(String profile) {
-		switch (profile) {
-			case (AppConstant.PROD_CODE):
-				return NACOS_PROD_ADDR;
-			case (AppConstant.TEST_CODE):
-				return NACOS_TEST_ADDR;
-			default:
-				return NACOS_DEV_ADDR;
-		}
-	}
-
-	/**
-	 * 动态获取sentinel地址
-	 *
-	 * @param profile 环境变量
-	 * @return addr
-	 */
-	static String sentinelAddr(String profile) {
-		switch (profile) {
-			case (AppConstant.PROD_CODE):
-				return SENTINEL_PROD_ADDR;
-			case (AppConstant.TEST_CODE):
-				return SENTINEL_TEST_ADDR;
-			default:
-				return SENTINEL_DEV_ADDR;
-		}
-	}
-
-	/**
-	 * 动态获取seata地址
-	 *
-	 * @param profile 环境变量
-	 * @return addr
-	 */
-	static String seataAddr(String profile) {
-		switch (profile) {
-			case (AppConstant.PROD_CODE):
-				return SEATA_PROD_ADDR;
-			case (AppConstant.TEST_CODE):
-				return SEATA_TEST_ADDR;
-			default:
-				return SEATA_DEV_ADDR;
-		}
-	}
-
-	/**
-	 * 动态获取zipkin地址
-	 *
-	 * @param profile 环境变量
-	 * @return addr
-	 */
-	static String zipkinAddr(String profile) {
-		switch (profile) {
-			case (AppConstant.PROD_CODE):
-				return ZIPKIN_PROD_ADDR;
-			case (AppConstant.TEST_CODE):
-				return ZIPKIN_TEST_ADDR;
-			default:
-				return ZIPKIN_DEV_ADDR;
-		}
-	}
-
-	/**
-	 * 动态获取elk地址
-	 *
-	 * @param profile 环境变量
-	 * @return addr
-	 */
-	static String elkAddr(String profile) {
-		switch (profile) {
-			case (AppConstant.PROD_CODE):
-				return ELK_PROD_ADDR;
-			case (AppConstant.TEST_CODE):
-				return ELK_TEST_ADDR;
-			default:
-				return ELK_DEV_ADDR;
-		}
-	}
+    /**
+     * sentinel dev 地址
+     */
+    String SENTINEL_DEV_ADDR = "127.0.0.1:8858";
+
+    /**
+     * sentinel prod 地址
+     */
+    String SENTINEL_PROD_ADDR = "172.30.0.58:8858";
+
+    /**
+     * sentinel test 地址
+     */
+    String SENTINEL_TEST_ADDR = "172.30.0.58:8858";
+
+    /**
+     * seata dev 地址
+     */
+    String SEATA_DEV_ADDR = "127.0.0.1:8091";
+
+    /**
+     * seata prod 地址
+     */
+    String SEATA_PROD_ADDR = "172.30.0.68:8091";
+
+    /**
+     * seata test 地址
+     */
+    String SEATA_TEST_ADDR = "172.30.0.68:8091";
+
+    /**
+     * zipkin dev 地址
+     */
+    String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411";
+
+    /**
+     * zipkin prod 地址
+     */
+    String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411";
+
+    /**
+     * zipkin test 地址
+     */
+    String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411";
+
+    /**
+     * elk dev 地址
+     */
+    String ELK_DEV_ADDR = "127.0.0.1:9000";
+
+    /**
+     * elk prod 地址
+     */
+    String ELK_PROD_ADDR = "172.30.0.72:9000";
+
+    /**
+     * elk test 地址
+     */
+    String ELK_TEST_ADDR = "172.30.0.72:9000";
+
+    /**
+     * seata file模式
+     */
+    String FILE_MODE = "file";
+
+    /**
+     * seata nacos模式
+     */
+    String NACOS_MODE = "nacos";
+
+    /**
+     * seata default模式
+     */
+    String DEFAULT_MODE = "default";
+
+    /**
+     * seata group后缀
+     */
+    String GROUP_NAME = "-group";
+
+    /**
+     * seata 服务组格式
+     *
+     * @param appName 服务名
+     * @return group
+     */
+    static String seataServiceGroup(String appName) {
+        return appName.concat(GROUP_NAME);
+    }
+
+    /**
+     * 动态获取nacos地址
+     *
+     * @param profile 环境变量
+     * @return addr
+     */
+    static String nacosAddr(String profile) {
+        switch (profile) {
+            case (AppConstant.PROD_CODE):
+                return NACOS_PROD_ADDR;
+            case (AppConstant.TEST_CODE):
+                return NACOS_TEST_ADDR;
+            default:
+                return NACOS_DEV_ADDR;
+        }
+    }
+
+    /**
+     * 动态获取sentinel地址
+     *
+     * @param profile 环境变量
+     * @return addr
+     */
+    static String sentinelAddr(String profile) {
+        switch (profile) {
+            case (AppConstant.PROD_CODE):
+                return SENTINEL_PROD_ADDR;
+            case (AppConstant.TEST_CODE):
+                return SENTINEL_TEST_ADDR;
+            default:
+                return SENTINEL_DEV_ADDR;
+        }
+    }
+
+    /**
+     * 动态获取seata地址
+     *
+     * @param profile 环境变量
+     * @return addr
+     */
+    static String seataAddr(String profile) {
+        switch (profile) {
+            case (AppConstant.PROD_CODE):
+                return SEATA_PROD_ADDR;
+            case (AppConstant.TEST_CODE):
+                return SEATA_TEST_ADDR;
+            default:
+                return SEATA_DEV_ADDR;
+        }
+    }
+
+    /**
+     * 动态获取zipkin地址
+     *
+     * @param profile 环境变量
+     * @return addr
+     */
+    static String zipkinAddr(String profile) {
+        switch (profile) {
+            case (AppConstant.PROD_CODE):
+                return ZIPKIN_PROD_ADDR;
+            case (AppConstant.TEST_CODE):
+                return ZIPKIN_TEST_ADDR;
+            default:
+                return ZIPKIN_DEV_ADDR;
+        }
+    }
+
+    /**
+     * 动态获取elk地址
+     *
+     * @param profile 环境变量
+     * @return addr
+     */
+    static String elkAddr(String profile) {
+        switch (profile) {
+            case (AppConstant.PROD_CODE):
+                return ELK_PROD_ADDR;
+            case (AppConstant.TEST_CODE):
+                return ELK_TEST_ADDR;
+            default:
+                return ELK_DEV_ADDR;
+        }
+    }
 
 }

hx-common/hx-tool/pom.xml

@@ -31,9 +31,13 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.3</version>
         </dependency>
 
         <dependency>

hx-common/pom.xml

@@ -23,6 +23,7 @@
 
         <bladex.version>2.8.2.RELEASE</bladex.version>
         <hx.version>3.2.0</hx.version>
+        <hutool.version>5.8.3</hutool.version>
     </properties>
 
     <dependencyManagement>
@@ -55,6 +56,18 @@
                 <version>${bladex.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-common</artifactId>
+                <version>${bladex.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

hx-serve/iot-management/src/main/java/com/fjhx/ManagementApplication.java

@@ -2,19 +2,13 @@ package com.fjhx;
 
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
  * 针筒物联网管理模块启动器
  */
-@EnableAsync
 @EnableBladeFeign
-@EnableDiscoveryClient
-@EnableCircuitBreaker
-@SpringBootApplication
+@SpringCloudApplication
 public class ManagementApplication {
 
     private static final String APP_NAME = "iot-management";

hx-serve/storage/src/main/java/com/fjhx/StorageApplication.java

@@ -2,19 +2,13 @@ package com.fjhx;
 
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
  * 杰生模块启动器
  */
-@EnableAsync
 @EnableBladeFeign
-@EnableDiscoveryClient
-@EnableCircuitBreaker
-@SpringBootApplication
+@SpringCloudApplication
 public class StorageApplication {
 
     private static final String APP_NAME = "storage";