漏洞文件漏洞修改 - emq随机数问题

amos-boot-data/amos-boot-data-accessapi/src/main/resource/application-dev.properties

@@ -42,7 +42,7 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-accessapi/src/main/resource/application-qa.properties

@@ -40,7 +40,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-alarm/src/main/resources/application-dev.properties

@@ -58,7 +58,7 @@ spring.security.user.name=admin
 spring.security.user.password=a1234560
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.220:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-equip/src/main/resources/application-dev.properties

@@ -39,7 +39,7 @@ spring.security.user.password=a1234560
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-cyl.properties

@@ -41,7 +41,7 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://113.134.211.174:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-dev.properties

@@ -40,7 +40,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=super
 emqx.password=123456

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-jd.properties

@@ -39,7 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://192.168.1.10:${server.po
 ##emqx
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://192.168.1.10:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-lift.properties

@@ -39,7 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://113.134.211.174:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-qa.properties

@@ -39,7 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://113.134.211.174:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-spe.properties

@@ -39,7 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://113.134.211.174:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-tzs.properties

@@ -39,7 +39,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://113.134.211.174:1883
 emqx.user-name=admin
 emqx.password=public

amos-boot-system-cas/amos-boot-module-cas-biz/src/main/resources/application.properties

@@ -44,7 +44,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=super
 emqx.password=ENC(cOsjObSVn0vn4se0yiQSt1EpAQtKC6kpZGRsZGPKnvaQZCcbbJohIQXyPuOY+qcD)

amos-boot-system-ccs/src/main/java/com/yeejoin/amos/AmoCCSApplication.java

@@ -11,13 +11,18 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -38,6 +43,12 @@ public class AmoCCSApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmoCCSApplication.class);
 
     public static void main(String[] args) throws UnknownHostException {
+        SpringApplication application = new SpringApplication(AmoCCSApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(AmoCCSApplication.class, args);
         Environment env = context.getEnvironment();
         String appName = env.getProperty("spring.application.name");

amos-boot-system-ccs/src/main/resources/application-dev.properties

@@ -12,7 +12,7 @@ spring.redis.port=6379
 spring.redis.password=ENC(2FDlTJDGXAfqBqn7QMeZ3cXPAdzjQBs9Yde/Ajc8TAVXxymomLieBPZxSF0R7wK9)
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(Lz+MNIZ0XP5lVzyswe7b1RyFAEImtD/qmYpkWilkGrj1myMjSnyf9ZS0l/hMD/Er)

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -19,7 +19,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -29,6 +32,8 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 @SpringBootApplication
 @EnableTransactionManagement
@@ -59,6 +64,12 @@ public class AmostEquipApplication {
 	private CarIotNewListener carIotNewListener;
 
     public static void main(String[] args) throws UnknownHostException {
+		SpringApplication application = new SpringApplication(AmostEquipApplication.class);
+		ConfigurableEnvironment environment = new StandardEnvironment();
+		int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+				Collections.singletonMap("security-random-int", randomClientId)));
+		application.setEnvironment(environment);
 		ConfigurableApplicationContext context = SpringApplication.run(AmostEquipApplication.class, args);
 		GlobalExceptionHandler.setAlwaysOk(true);
 		Environment env = context.getEnvironment();

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=30000
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(GGQmxuyl6uOxAsDhjRo+USgUybWC8Ns4Q7mlnyq3JqJE9LsFgYBNK8gzJ7H/Znw+)

amos-boot-system-equip/src/main/resources/application-docker.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=30000
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(X2ZEAhE0U0KJqtQHU+TjL8WR6is04xBIji30FpnJCbat9k6dBMCJfm/Vf/b0hCPl)

amos-boot-system-equip/src/main/resources/application-jcs.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=30000
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(srgCLv3AyU0NTJXS4iNxkf4zjx+mjxHf8Jdv4jqsDgluFO2oUgPHMnRQYTtt/Ivg)

amos-boot-system-equip/src/main/resources/application-qa.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=30000
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(DuaVOeFwh3f7oH9rroTwg5M/Prx/US38savsyTmQ1pSVVXZNNdbj/Lcfjip20VXm)

amos-boot-system-equip/src/main/resources/application-test.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=30000
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(dRiUEDTcM21M9w1wK0Dom1CAANdG81rFb45KEm6kZ0/fPhYRhkGGgQk7uw3q0NAg)

amos-boot-system-fas/src/main/java/com/yeejoin/amos/FireAutoSysApplication.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
@@ -21,7 +23,10 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -67,6 +72,12 @@ public class FireAutoSysApplication implements ApplicationContextAware {
 	 * @throws URISyntaxException
 	 */
 	public static void main(String[] args)  throws UnknownHostException{
+		SpringApplication application = new SpringApplication(FireAutoSysApplication.class);
+		ConfigurableEnvironment environment = new StandardEnvironment();
+		int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+				Collections.singletonMap("security-random-int", randomClientId)));
+		application.setEnvironment(environment);
 		    logger.info("start Service..........");
 			ConfigurableApplicationContext context = SpringApplication.run(FireAutoSysApplication.class, args);
 	        GlobalExceptionHandler.setAlwaysOk(true);

amos-boot-system-fas/src/main/resources/application-dev.properties

@@ -50,7 +50,7 @@ file.readUrl=http://172.16.11.33:8085/file/getFile?in=
 params.isPush=false
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(e0puQgHcLshj+SaycIrhSnuLNdDLUHQtfcqaHqjVmnDRAoyJWmkvMNjt1pdCPOnr)

amos-boot-system-fas/src/main/resources/application-docker.properties

@@ -45,7 +45,7 @@ file.readUrl=http://172.16.11.33:8085/file/getFile?in=
 params.isPush=false
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.33:1883
 emqx.user-name=admin
 emqx.password=ENC(ZCkHjJtiLg1aguo4I/OXOwAoJ/EzcxnrTL0gxUgktsyIFqeLkKpPMY6jn/MChpjv)

amos-boot-system-fas/src/main/resources/application-jcs.properties

@@ -50,7 +50,7 @@ file.readUrl=http://11.11.16.1:8085/file/getFile?in=
 params.isPush=false
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://11.11.16.1:2883
 emqx.user-name=super
 emqx.password=ENC(z5FeZv8ZpthHXLvFMthDvSvtve/suOu7oiGsIJNX/yWNeJSHNuj0qCZcyKHSuldK)

amos-boot-system-fas/src/main/resources/application-qa.properties

@@ -50,7 +50,7 @@ file.readUrl=http://172.16.11.33:8085/file/getFile?in=
 params.isPush=false
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.33:1883
 emqx.user-name=admin
 emqx.password=ENC(WDylw19tt1zmwfkfHhS2AgugfTlGzS5MNElC5LqrUWXnIRyPPCA2mZbantTWFkhj)

amos-boot-system-fas/src/main/resources/application-test.properties

@@ -45,7 +45,7 @@ file.readUrl=http://172.16.11.33:8085/file/getFile?in=
 params.isPush=false
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.33:1883
 emqx.user-name=admin
 emqx.password=ENC(YPyOgMYvSm1s20HN03RewespKNyomI+NdungqiYFv+uXGwRkH0RL8+061DxEj++M)

amos-boot-system-jcs/src/main/java/com/yeejoin/amos/AmosJcsApplication.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
@@ -15,7 +17,10 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -47,6 +52,12 @@ public class AmosJcsApplication {
 	private static final Logger logger = LoggerFactory.getLogger(AmosJcsApplication.class);
 
 	public static void main(String[] args) throws UnknownHostException {
+		SpringApplication application = new SpringApplication(AmosJcsApplication.class);
+		ConfigurableEnvironment environment = new StandardEnvironment();
+		int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+				Collections.singletonMap("security-random-int", randomClientId)));
+		application.setEnvironment(environment);
 		ConfigurableApplicationContext context = SpringApplication.run(AmosJcsApplication.class, args);
 		Environment env = context.getEnvironment();
 		delKey(env, context);// 添加全部清空redis缓存的方法 2021-09-09

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -27,7 +27,7 @@ elasticsearch.password=ENC(tPXldVBJjiRAQ0rk11qOVCSJFWtkGGvlTqcWtmkxrNA/W9PJ7TibZ
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(yVcJLlSl9/CXSEMT/SjcyzaLAvGU4o8OhU0AVnaF40Olfvo9kT+VxykM6bunDzcb)

amos-boot-system-jcs/src/main/resources/application-jcs.properties

@@ -20,7 +20,7 @@ spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://11.11.16.1:2883
 emqx.user-name=super
 emqx.password=ENC(lsUzcQULDnEaqXtDJYGztWUa1hUKpz714my0EzynE86xAD5nmYUEhFOiv0bJzjch)

amos-boot-system-jcs/src/main/resources/application-qa.properties

@@ -20,7 +20,7 @@ spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://39.98.45.134:1883
 emqx.user-name=super
 emqx.password=ENC(6jzGMkPiiUXER1UhMjiBTVAwzCn3K3tAwrUpEICoXYwAcwcqndNQuEnGrEI+53jJ)

amos-boot-system-kgd/src/main/resources/application-dev.properties

@@ -42,7 +42,7 @@ lettuce.timeout=10000
 
 
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.3.18:2883
 emqx.user-name=super
 emqx.password=ENC(hqcljkebJzk/mWPZCj6/Gj6a3nkOrUj/1Yzde1pmm/J4fpMJ8juIgeSFwi16v3cJ)

amos-boot-system-knowledgebase/src/main/java/com/yeejoin/amos/KnowledgebaseApplication.java

@@ -2,10 +2,13 @@ package com.yeejoin.amos;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -13,7 +16,10 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
@@ -36,6 +42,12 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 public class KnowledgebaseApplication {
 	private static final Logger logger = LoggerFactory.getLogger(KnowledgebaseApplication.class);
     public static void main(String[] args)  throws UnknownHostException{
+        SpringApplication application = new SpringApplication(KnowledgebaseApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
     	ConfigurableApplicationContext context = new SpringApplicationBuilder(KnowledgebaseApplication.class).web(WebApplicationType.SERVLET).run(args);
         GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();

amos-boot-system-knowledgebase/src/main/resources/application-dev.properties

@@ -45,7 +45,7 @@ spring.elasticsearch.rest.uris=http://39.100.239.237:9200
 
 #emqx v4.0
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.3.18:2883
 emqx.user-name=super
 emqx.password=ENC(BRNhmVnl0ioUEI/GazSkeYtogsl1y7lRrXopoZ5Kig9YL9TrHyqfTDudI34lrLuy)

amos-boot-system-knowledgebase/src/main/resources/application-jcs.properties

@@ -44,7 +44,7 @@ spring.elasticsearch.rest.uris=http://11.11.16.1:9200
 
 #emqx v4.0
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://11.11.16.1:2883
 emqx.user-name=knowledge
 emqx.password=ENC(tgbYZ8KgZN01mGJCmgYhJwMhVvJESOlB01NXzcSAND04iV9RqtdhEB0d8gBX6St8)

amos-boot-system-knowledgebase/src/main/resources/application-qa.properties

@@ -44,7 +44,7 @@ spring.elasticsearch.rest.uris=http://172.16.10.66:9200
 
 #emqx v4.0
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(eN2mhzWo59KZmjw5cuujBMHno77e2k1jmXhSEH4CcpAEiecIW7vdSRhgo/7+UzeF)

amos-boot-system-knowledgebase/src/main/resources/application-test.properties

@@ -44,7 +44,7 @@ spring.elasticsearch.rest.uris=http://127.0.0.1:9200
 
 #emqx v4.0
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(eVGQ8GcDlYMAo4PuzTfT4SEkBdhDmnAFrE0/g1fayeTLgEwVKVRVe6pxgvrpYcwv)

amos-boot-system-latentdanger/src/main/java/com/yeejoin/amos/LatentDangerApplication.java

@@ -15,7 +15,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -27,6 +30,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -68,6 +73,12 @@ public class LatentDangerApplication {
      */
     public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
+        SpringApplication application = new SpringApplication(LatentDangerApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(LatentDangerApplication.class, args);
         Environment env = context.getEnvironment();
         String appName = env.getProperty("spring.application.name");

amos-boot-system-latentdanger/src/main/resources/application-dev.properties

@@ -80,7 +80,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.211:2883
 emqx.user-name=super
 emqx.password=ENC(qV5LV4xIsXBnd+Q1P+dDUqx1zwVqAR5YcZSss/hZidit4XG+TgXBUtQh8n+BVakG)

amos-boot-system-latentdanger/src/main/resources/application-docker.properties

@@ -75,7 +75,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(k+rmkOo3F50CUtKAN92MZgGS5eAvLEl+ezfsRoSP89wYw7oV0SSj+B7iTw+Bk5/h)

amos-boot-system-latentdanger/src/main/resources/application-test.properties

@@ -75,7 +75,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(Xm0idEy22WFaWaIHxmShsk/sfjrIZXZBdD/PlGgUNpwb6rnzuWoQlLIJS2khM8aH)

amos-boot-system-maintenance/src/main/java/com/yeejoin/amos/MaintenanceApplication.java

@@ -14,7 +14,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -26,6 +29,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -66,6 +71,12 @@ public class MaintenanceApplication {
      */
     public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
+        SpringApplication application = new SpringApplication(MaintenanceApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();

amos-boot-system-maintenance/src/main/resources/application-dev.properties

@@ -41,7 +41,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.211:2883
 emqx.user-name=admin
 emqx.password=ENC(plHHeaMcUrvvF/jAG6zZsbYVW63oqE9szljel6qsAh0y/R1ZP2K97jTukGshWDxW)

amos-boot-system-maintenance/src/main/resources/application-jcs.properties

@@ -38,7 +38,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://11.11.16.1:2883
 emqx.user-name=admin
 emqx.password=ENC(u6uzXt+v9awsBoBq2R/Y39dgBtYOuM7wssNhlofJHttg9ed9M8dw4wN2r/o0vN57)

amos-boot-system-patrol/src/main/java/com/yeejoin/amos/PatrolApplication.java

@@ -19,7 +19,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -32,6 +35,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -82,6 +87,12 @@ public class PatrolApplication {
      */
     public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
+        SpringApplication application = new SpringApplication(PatrolApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(PatrolApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -86,7 +86,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=ENC(5+PwujB0t52PNInudV/Qa0WPNrkRcJRTeXRlZ/WG1JLrhGHgpNm1IQW2UJC8Hx1w)

amos-boot-system-patrol/src/main/resources/application-docker.properties

@@ -76,7 +76,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(hZ3P601LVYc16F8pJyils9C0xUbtQn/NijVbXiQaUnSmEY+N+R+F2+cHsRO2mZjQ)

amos-boot-system-patrol/src/main/resources/application-jcs.properties

@@ -80,7 +80,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://11.11.16.1:2883
 emqx.user-name=super
 emqx.password=ENC(EuPZLjEccNFCYrINWXWg4LvC8BCpY6GstwrtV/visuMmjXXE+jtyjeLGPjPHn5pb)

amos-boot-system-patrol/src/main/resources/application-test.properties

@@ -76,7 +76,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(3XTg2UtPdtN9aGpMIsV0w+YIM7sJJDXOsMjzgM3jEmEk8Ovbd6L7Ji2Mf3hNoaCm)

amos-boot-system-precontrol/src/main/java/com/yeejoin/amos/StartPrecontrolService.java

 package com.yeejoin.amos;
 
+import java.security.SecureRandom;
 import java.text.ParseException;
+import java.util.Collections;
 
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.mybatis.spring.annotation.MapperScan;
@@ -12,6 +14,9 @@ import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -66,6 +71,12 @@ public class StartPrecontrolService {
 	private StartRiskService startRiskService;
 
 	public static void main(String[] args) {
+		SpringApplication application = new SpringApplication(StartPrecontrolService.class);
+		ConfigurableEnvironment environment = new StandardEnvironment();
+		int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+				Collections.singletonMap("security-random-int", randomClientId)));
+		application.setEnvironment(environment);
 		SpringApplication.run(StartPrecontrolService.class, args).getEnvironment();
 		log.info("swagger:--->http://localhost:8060/precontrol/swagger-ui.html");
 	}

amos-boot-system-precontrol/src/main/resource/application-dev.properties

@@ -69,7 +69,7 @@ spring.liquibase.password=ENC(Vfge4mGDNB4aqT4K/qM2DT1x7elpG4EBx7aUimCfXaVpSWLMX4
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://39.100.239.237:1883
 emqx.user-name=admin
 emqx.password=ENC(OSA64iMVlqZkH0frCyNCX+Mk1oLnp5AHRLBsL6GjrV+r6LIoNp8n8Zhhm2k6TD/T)

amos-boot-system-precontrol/src/main/resource/application-dev2.properties

@@ -69,7 +69,7 @@ spring.liquibase.password=ENC(yrlvuaaLuIuHDUxzzhik2ugEGTukH8y+e8VWdomirI74jl4Lul
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
 emqx.password=ENC(A+dlQa1l1oQx9rLboFUK0RgtSMJNVdezIMnAkq659CTHvmAWIqFiVRILmBSOVJoo)

amos-boot-system-precontrol/src/main/resource/application-docker.properties

@@ -26,7 +26,7 @@ spring.redis.pool.min-idle=0
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(yTU4Z2TMe2O3iqkeCAVav7uvCIG1J8qgCky2VXy94k4sgtj8r/EET7+xNgl8EUxv)

amos-boot-system-precontrol/src/main/resource/application-public.properties

@@ -60,7 +60,7 @@ spring.liquibase.password=ENC(oNxwEeDiI6UDbkhItiD0gK0fwFOnSGaRawkcf8N1KcUZ4SfN1r
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.85:1883
 emqx.user-name=super
 emqx.password=ENC(eQAzGB9pywIbkKtZbiJNQEbwHSM4X7xUA1JN4im6IJcAMFOpdndLBhjDDAUuYR+K)

amos-boot-system-precontrol/src/main/resource/application-qa.properties

@@ -68,7 +68,7 @@ spring.liquibase.password=ENC(To3o7waoSJrrNe94UjDo5mo2vHklcFvE4Hca9vl7lOW4sbdAM1
 
 ##emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://39.100.239.237:1883
 emqx.user-name=admin
 emqx.password=ENC(Z8Cf5vBqGB+qYSJhu2DKjgpGctqcvf1dysR/a9FymAWBKJ/G4CYyAl9ZgvFEJMfk)

amos-boot-system-supervision/src/main/java/com/yeejoin/amos/SupervisionApplication.java

@@ -17,7 +17,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -29,6 +32,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -72,6 +77,12 @@ public class SupervisionApplication {
      */
     public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
+        SpringApplication application = new SpringApplication(SupervisionApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(SupervisionApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();

amos-boot-system-supervision/src/main/resources/application-dev.properties

@@ -46,7 +46,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.211:2883
 emqx.user-name=super
 emqx.password=ENC(H5ou9RR/Qj8EPGnwCoXh7tpCUB2dHpfkUSlBLKmIs+HOLqK0/C8IPVN6Cd6fPAkE)

amos-boot-system-supervision/src/main/resources/application-jcs.properties

@@ -44,7 +44,7 @@ linux.img.path = /
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.33:1883
 emqx.user-name=admin
 emqx.password=ENC(OtiAFcvYKHhEnjYxScPgdWbAXxDDBT4qgFWgvGc+90wxmdgN1a3CJnFZFXQc1lnv)

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application-dev.properties

@@ -18,7 +18,7 @@ spring.redis.port=6379
 spring.redis.password=ENC(DL3Z9hoL084UizE7RO6heJboTMyWGzcMkNtxXTZTWuUw8zzp06MYUC2FKADBuB4c)
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.215:1883
 emqx.user-name=admin
 emqx.password=ENC(Gvv5Gg9Y5V+L7fG5DvCfkbyG91V0QG0/AUiHVaiYxvBP7VE7RMQvRNxZbN5wanwH)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

@@ -41,7 +41,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=admin
 emqx.password=ENC(ozAs7gHZMAFb1ihZ2Z26IH/MEqhvTrBbUYCa4jzZdvKBaziSnGTPR3AFvZDp1SIH)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties

@@ -41,7 +41,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=admin
 emqx.password=ENC(/dB1fGCjMhkr6rH2dr4DnjG8mTxsuJ6ouophTI+YJgyquIJBpQ49cDAyCKv6V+4X)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-jd.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.3.28:1883
 emqx.user-name=admin
 emqx.password=ENC(ct0pDXxkV3zVcxhOGdUzTjmMqokFmrKN4wuXxmYNf6YVNBPyttucTF7a6RePsoei)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-qa.properties

@@ -38,7 +38,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://36.46.151.113:1883
 emqx.user-name=admin
 emqx.password=ENC(in1DRHeNHbqkD7wb2Yn/SmKdyJ4bskd+/dJcuPs/ZZrU4fcFYGfO6/Aq0FDfqabZ)

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -44,7 +44,7 @@ spring.redis.expire.time=300
 
 ## emqx properties:
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.10.90:1883
 emqx.user-name=super
 emqx.password=ENC(23pJcuCki2sX99sRZJgDjhDNXDvY6/EnTZIdMx2EwjyGgJmYf0Q0MjWYfu7HZDf6)

amos-boot-utils/amos-boot-utils-message/src/main/java/com/yeejoin/amos/AmosBootUtilsMessageApplication.java

@@ -11,11 +11,16 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.SecureRandom;
+import java.util.Collections;
 
 /**
  * <pre>
@@ -38,6 +43,12 @@ public class AmosBootUtilsMessageApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmosBootUtilsMessageApplication.class);
 
     public static void main(String[] args) throws UnknownHostException {
+        SpringApplication application = new SpringApplication(AmosBootUtilsMessageApplication.class);
+        ConfigurableEnvironment environment = new StandardEnvironment();
+        int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
+        environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
+                Collections.singletonMap("security-random-int", randomClientId)));
+        application.setEnvironment(environment);
         ConfigurableApplicationContext context = SpringApplication.run(AmosBootUtilsMessageApplication.class, args);
 
         Environment env = context.getEnvironment();

amos-boot-utils/amos-boot-utils-message/src/main/resources/application-dev.properties

@@ -75,7 +75,7 @@ management.health.redis.enabled=false
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.client-user-name=admin
 emqx.client-password=ENC(6pRD7dM5Hp6rjy+DcS8Il2TCdN/IYz8IXeZXkSlAZT/NV/vTe51acJDDu7lzF9Dx)

amos-boot-utils/amos-boot-utils-message/src/main/resources/application-roma.properties

@@ -91,7 +91,7 @@ management.health.redis.enabled=false
 
 ## emqx
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}
+emqx.client-id=${spring.application.name}-${security-random-int}
 emqx.broker=tcp://172.16.11.201:1883
 emqx.client-user-name=admin
 emqx.client-password=ENC(e7sU0wBHIqXiGS4097G/ywpFFkIf8lks2zm9mWcqE4Cn8Xsh5mUSXVr+oqGwcyip)