修改配置文件

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -23,21 +23,6 @@
             <version>1.6.3-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.typroject</groupId>
-            <artifactId>tyboot-component-emq</artifactId>
-            <version>1.1.20</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.typroject</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
         </dependency>

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttProduceConfig.java

@@ -26,10 +26,10 @@ import org.springframework.messaging.MessageHandler;
 public class EquipmentIotMqttProduceConfig {
 
 
-    @Value("${emqx.user-name}")
+    @Value("${emqx.client-user-name}")
     private String userName;
 
-    @Value("${emqx.password}")
+    @Value("${emqx.client-password}")
     private String password;
 
     @Value("${emqx.broker}")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttReceiveConfig.java

@@ -42,10 +42,10 @@ import java.util.List;
 public class EquipmentIotMqttReceiveConfig {
 
 
-    @Value("${emqx.user-name}")
+    @Value("${emqx.client-user-name}")
     private String userName;
 
-    @Value("${emqx.password}")
+    @Value("${emqx.client-password}")
     private String password;
 
     @Value("${emqx.broker}")

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/action/mq/WebMqttSubscribe.java

@@ -30,11 +30,10 @@ import org.springframework.messaging.MessageHandler;
 @Configuration
 @IntegrationComponentScan
 public class WebMqttSubscribe {
-
-    @Value("${emqx.user-name}")
+    @Value("${emqx.client-user-name}")
     private String userName;
 
-    @Value("${emqx.password}")
+    @Value("${emqx.client-password}")
     private String password;
 
     @Value("${emqx.broker}")

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

@@ -82,11 +82,12 @@ spring.redis.redissonUrl=172.16.11.20:6379
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 
+
 mqtt.scene.host=mqtt://172.16.3.35:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt

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

@@ -28,19 +28,6 @@ amos.system.user.password=a1234560
 amos.system.user.app-key=studio_normalapp_2681691
 amos.system.user.product=AMOS_STUDIO_WEB
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
@@ -77,8 +64,8 @@ params.isPush=false
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -51,8 +51,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -52,8 +52,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -48,8 +48,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -92,8 +92,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -51,8 +51,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -80,8 +80,8 @@ elasticsearch.password= 123456
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -125,8 +125,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -53,7 +53,7 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 
 #巡检计划定时任务
-jobs.cron = 0 0/1 22-23 * * ?
+jobs.cron = 0 0/5 * * * ?
 
 #邮件配置
 #params.mailPush = false
@@ -90,8 +90,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -115,8 +115,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -82,8 +82,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -54,8 +54,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -73,8 +73,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -114,8 +114,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -119,8 +119,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -96,8 +96,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -55,8 +55,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10
 

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

@@ -81,8 +81,8 @@ linux.img.path = /
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://172.16.10.211:2883
-emqx.clean-user-name=super
-emqx.clean-password=a123456
+emqx.client-user-name=super
+emqx.client-password=a123456
 emqx.max-inflight=1000
 emqx.keep-alive-interval=10