提交代码

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/PointSystem.java

@@ -63,6 +63,6 @@ public class PointSystem extends BaseEntity {
 	@TableField("topic")
 	private String topic;
 	
-	@TableField("group")
+	@TableField("`group`")
 	private String group;
 }

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

 # jdbc_config
 spring.datasource.driver-class-name=com.kingbase8.Driver
-spring.datasource.url=jdbc:kingbase8://10.20.1.176:54321/equipment?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINTspring.datasource.username=root
+spring.datasource.url=jdbc:kingbase8://192.168.0.68:54321/equipment?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.pool-name=DatebookHikariCP
-spring.datasource.hikari.minimum-idle= 3
-spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.minimum-idle= 10
+spring.datasource.hikari.maximum-pool-size= 200
 spring.datasource.hikari.auto-commit= true
 spring.datasource.hikari.idle-timeout= 500000
 spring.datasource.hikari.max-lifetime= 1800000
@@ -14,29 +14,30 @@ spring.datasource.hikari.connection-timeout= 60000
 spring.datasource.hikari.connection-test-query= SELECT 1
 
 
+
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root&binaryTransferDisable=TINYINTspring.datasource.username=root
+spring.db2.datasource.url=jdbc:kingbase8://192.168.0.68:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
-spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
-
-
+spring.db2.datasource.driver-class-name=com.kingbase8.Driver
 
 
 # REDIS (RedisProperties)
+
 spring.redis.database=1
-spring.redis.host=47.92.234.253
+spring.redis.host=192.168.0.70
 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.lettuce.pool.max-idle=30
+spring.redis.lettuce.pool.min-idle=5
 spring.redis.expire.time=30000
+spring.redis.lettuce.shutdown-timeout=10000
 
 
-#注册中心地址
+#ע     ĵ ַ
 
 eureka.client.registry-fetch-interval-seconds=5
 management.endpoint.health.show-details=always
@@ -47,19 +48,23 @@ 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-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}@47.92.234.253:10001/eureka/
 
+eureka.instance.hostname= eureka
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.46:10001/eureka/
 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://47.92.234.253:1883
+emqx.broker=tcp://192.168.0.70:2883
 emqx.user-name=admin
-emqx.password=public
-mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
+emqx.password=Yeejoin@2020
+mqtt.scene.host=mqtt://192.168.0.70:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
-spring.mqtt.completionTimeout=3000
+spring.mqtt.completionTimeout=30000

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-ALARM-WJ
 server.servlet.context-path=/alarm
 server.port=11007
 
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 
@@ -17,7 +17,7 @@ mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
 
 #消费者所在组的名称
 #消费者 的broker地址
-spring.kafka.consumer.bootstrap-servers=10.20.0.223:9092,10.20.0.133:9092
+spring.kafka.consumer.bootstrap-servers=192.168.0.52:9092,192.168.0.53:9092
 # 是否自动提交
 spring.kafka.consumer.enable-auto-commit=false
 #offset的消费位置