1.本地如果没有kafka环境，将kafka.use设置为false

王通
1 parent f4dcb57c
Showing 5 changed files with 33 additions and 66 deletions
src/main/java/com/bsth/message/handler/MessageHandler.java
src/main/resources/application-cloud.properties
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
@@ -6,6 +6,7 @@ import com.bsth.message.entity.CarErrorStop;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.messaging.Message;
 import org.springframework.stereotype.Component;
@@ -17,6 +18,7 @@ import java.util.List;
  * @author Hill
  */
 @Component
+@ConditionalOnProperty("kafka.use")
 public class MessageHandler {
     @Autowired
@@ -13,7 +13,7 @@ spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.170.100.132/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.241/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= root2jsp
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
@@ -30,7 +30,8 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
 spring.datasource.hikari.register-mbeans=true
-spring.kafka.consumer.bootstrap-servers= localhost:9092
+kafka.use= true
+spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
 spring.kafka.consumer.group-id= schedule-system
 spring.kafka.consumer.auto-offset-reset= latest
 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
@@ -37,6 +37,13 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
 spring.datasource.hikari.register-mbeans=true
+kafka.use= false
+spring.kafka.consumer.bootstrap-servers= localhost:9092
+spring.kafka.consumer.group-id= schedule-system
+spring.kafka.consumer.auto-offset-reset= latest
+spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
@@ -57,4 +64,10 @@ cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confi
 ## admin mail
 admin.mail= 3090342880@qq.com
 ## enabled
-enabled.whiteip= true
 \ No newline at end of file
+enabled.whiteip= true
+
+sso.enabled= false
+sso.systemcode = SYS0019
+sso.http.url.login= http://180.169.154.251:28090/portal/index.html#/login
+sso.http.url.logout= http://180.169.154.251:18080/information/api/v1/logout
+sso.http.url.auth= http://180.169.154.251:18080/information/authenticate/authorityAuthentication
 \ No newline at end of file
-server.port=9088
-
-# dubbo����ʹ�ÿ���flag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= false
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-spring.datasource.username= root
-spring.datasource.password= root2jsp
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
-## gateway send directive
-http.send.directive= http://10.10.200.79:8080/transport_server/message/
-## rfid data
-http.rfid.url= http://10.10.200.82:9000/rfid
-## wxsb
-#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-## http ticketing interface
-http.ticketing.interface= http://112.64.187.3:1080/gjService/request
-http.mtplan.interface= https://112.64.45.51/wxk-prod-api/service-api/pdgj/schedule/byinfo
-## first last generate
-ms.fl.generate=true
-## dsm ack interface
-dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
-## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
-## admin mail
-admin.mail= 3090342880@qq.com
-## enabled
-enabled.whiteip= true
 \ No newline at end of file
@@ -30,6 +30,13 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 spring.datasource.hikari.validation-timeout= 3000
 spring.datasource.hikari.register-mbeans=true
+kafka.use= true
+spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
+spring.kafka.consumer.group-id= schedule-system
+spring.kafka.consumer.auto-offset-reset= latest
+spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
@@ -55,4 +62,10 @@ cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confi
 ## admin mail
 admin.mail= 3090342880@qq.com
 ## enabled
-enabled.whiteip= false
 \ No newline at end of file
+enabled.whiteip= false
+
+sso.enabled= false
+sso.systemcode = SYS0019
+sso.http.url.login= http://180.169.154.251:28090/portal/index.html#/login
+sso.http.url.logout= http://180.169.154.251:18080/information/api/v1/logout
+sso.http.url.auth= http://180.169.154.251:18080/information/authenticate/authorityAuthentication
 \ No newline at end of file