修改配置

amos-boot-data/amos-boot-data-alarm/pom.xml

@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.typroject</groupId>
 			<artifactId>tyboot-component-emq</artifactId>
-			<version>${tyboot-version}</version>
+            <version>1.1.20</version>
 		</dependency>
 		<dependency>
 			<groupId>org.typroject</groupId>

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

@@ -2,47 +2,57 @@ spring.application.name=AMOS-ALARM
 server.servlet.context-path=/alarm
 server.port=11007
 # jdbc_config
-spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8\
-  &characterEncoding=utf8
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.10.220:3306/equipment?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.maximum-pool-size=15
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=30000
 spring.datasource.hikari.pool-name=DatebookHikariCP
-spring.datasource.hikari.max-lifetime=1800000
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 500000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 60000
+spring.datasource.hikari.connection-test-query= SELECT 1
 
 
 # REDIS (RedisProperties)
 spring.redis.database=1
-spring.redis.host=172.16.10.90
+spring.redis.host=172.16.10.220
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
-spring.redis.expire.time=300
+spring.redis.expire.time=30000
+
 
 #注册中心地址
-eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
-eureka.instance.prefer-ip-address=true
+
+eureka.client.registry-fetch-interval-seconds=5
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
+eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.hostname= 172.16.10.220
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.220:10001/eureka/
 
-##emqx
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.90:1883
-emqx.user-name=super
-emqx.password=123456
-
+emqx.broker=tcp://172.16.10.220:1883
+emqx.user-name=admin
+emqx.password=public
+mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.client.product.id=mqtt
+mqtt.topic=topic_mqtt
+spring.mqtt.completionTimeout=3000

amos-boot-data/pom.xml

@@ -17,8 +17,9 @@
 
 
   <modules>
-  	<module>amos-boot-data-common</module>
-  	<module>amos-boot-data-openapi</module>
-  	<module>amos-boot-data-accessapi</module>
+    <module>amos-boot-data-common</module>
+    <module>amos-boot-data-openapi</module>
+    <module>amos-boot-data-accessapi</module>
+    <module>amos-boot-data-alarm</module>
   </modules>
 </project>