Commit 8e42ad9e authored by yzm's avatar yzm

mqtt西复线服务

parent 26e5f214
<component name="libraryTable">
<library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
...@@ -76,8 +76,12 @@ public class MQTTSubsribe { ...@@ -76,8 +76,12 @@ public class MQTTSubsribe {
public MqttConnectOptions getMqttConnectOptions() { public MqttConnectOptions getMqttConnectOptions() {
this.mqttConnectOptions = new MqttConnectOptions(); this.mqttConnectOptions = new MqttConnectOptions();
this.mqttConnectOptions.setCleanSession(true); this.mqttConnectOptions.setCleanSession(true);
// this.mqttConnectOptions.setUserName(username); if(!"".equals(username) ) {
// this.mqttConnectOptions.setPassword(password.toCharArray()); this.mqttConnectOptions.setUserName(username);
}
if(!"".equals(password) ) {
this.mqttConnectOptions.setPassword(password.toCharArray());
}
this.mqttConnectOptions.setServerURIs(new String[]{url}); this.mqttConnectOptions.setServerURIs(new String[]{url});
this.mqttConnectOptions.setConnectionTimeout(completionTimeout); this.mqttConnectOptions.setConnectionTimeout(completionTimeout);
this.mqttConnectOptions.setKeepAliveInterval(2000); this.mqttConnectOptions.setKeepAliveInterval(2000);
......
...@@ -223,9 +223,6 @@ public class TraffController { ...@@ -223,9 +223,6 @@ public class TraffController {
traffAlarmRecord.setFdid(trffClientMessage.getVideo_id()); traffAlarmRecord.setFdid(trffClientMessage.getVideo_id());
channelid=0; channelid=0;
traffAlarmRecord.setChannelid(channelid); traffAlarmRecord.setChannelid(channelid);
traffAlarmRecord.setVideourlfrom(trffClientMessage.getVideo_record_url()); traffAlarmRecord.setVideourlfrom(trffClientMessage.getVideo_record_url());
traffAlarmRecord.setCreatetime(DateUtils.getDateString(new Date())); traffAlarmRecord.setCreatetime(DateUtils.getDateString(new Date()));
traffAlarmRecord.setObjlable(trffClientMessage.getObjLabel()); traffAlarmRecord.setObjlable(trffClientMessage.getObjLabel());
...@@ -681,7 +678,7 @@ public class TraffController { ...@@ -681,7 +678,7 @@ public class TraffController {
protected void fielagent(@RequestParam("location") String location, HttpServletRequest request, HttpServletResponse response) { protected void fielagent(@RequestParam("location") String location, HttpServletRequest request, HttpServletResponse response) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
//ftp://reader:reader@33.50.1.22:21/ //ftp://reader:reader@33.50.1.22:21/
//ftp.host=33.65.250.179:21:hzjt:1qaz2wsx //ftp.host=33.65.219.103:21:hzjt:1qaz2wsx
String ftpPath="ftp://"+ftppath+"/"+location; String ftpPath="ftp://"+ftppath+"/"+location;
FileInputStream hFile = null; FileInputStream hFile = null;
OutputStream toClient = null; OutputStream toClient = null;
......
...@@ -3,7 +3,7 @@ server.port=8089 ...@@ -3,7 +3,7 @@ server.port=8089
spring.thymeleaf.prefix=classpath:/templates/ spring.thymeleaf.prefix=classpath:/templates/
spring.thymeleaf.suffix=.html spring.thymeleaf.suffix=.html
spring.thymeleaf.cache=false spring.thymeleaf.cache=false
spring.thymeleaf.content-type=text/html spring.thymeleaf.content-type=text/html
spring.thymeleaf.enabled=true spring.thymeleaf.enabled=true
spring.thymeleaf.encoding=UTF-8 spring.thymeleaf.encoding=UTF-8
spring.thymeleaf.mode=HTML5 spring.thymeleaf.mode=HTML5
...@@ -21,7 +21,7 @@ logging.level.com.hzjt=debug ...@@ -21,7 +21,7 @@ logging.level.com.hzjt=debug
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1521:helowin #spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1521:helowin
spring.datasource.username=hzjt spring.datasource.username=hzjt
spring.datasource.password=hzjt spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin spring.datasource.url=jdbc:oracle:thin:@33.65.219.103:1521:helowin
spring.datasource.driverClassName=oracle.jdbc.OracleDriver spring.datasource.driverClassName=oracle.jdbc.OracleDriver
# druid # druid
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
...@@ -42,7 +42,7 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS ...@@ -42,7 +42,7 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS
spring.datasource.useGlobalDataSourceStat=true spring.datasource.useGlobalDataSourceStat=true
#redis #redis
spring.redis.host=33.65.250.179 spring.redis.host=33.65.219.103
#spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=123456 #spring.redis.password=123456
...@@ -53,14 +53,14 @@ spring.redis.pool.max-idle=8 ...@@ -53,14 +53,14 @@ spring.redis.pool.max-idle=8
spring.redis.pool.min-idle=0 spring.redis.pool.min-idle=0
spring.redis.timeout=2000 spring.redis.timeout=2000
spring.session.store-type=none spring.session.store-type=none
ip.host=33.65.250.179 ip.host=33.65.219.103
port=21 port=21
message.dept=33030 message.dept=33030
message.rate=10 message.rate=10
ftp.host=33.65.219.40:21:hzjt:1qaz2wsx ftp.host=33.65.219.40:21:hzjt:1qaz2wsx
ftppath=hzjt:1qaz2wsx@33.65.219.40:21 ftppath=hzjt:1qaz2wsx@33.65.219.40:21
ftpServiceUrl=http://33.65.250.179:8089/api/alg/files ftpServiceUrl=http://33.65.219.103:8089/api/alg/files
alarm.subscribe.data.key=gs:traff:alarmlist alarm.subscribe.data.key=gs:traff:alarmlist
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
...@@ -81,7 +81,7 @@ mybatis.mapper-locations=classpath:mapper/*.xml ...@@ -81,7 +81,7 @@ mybatis.mapper-locations=classpath:mapper/*.xml
spring.mvc.throw-exception-if-no-handler-found=true spring.mvc.throw-exception-if-no-handler-found=true
spring.resources.add-mappings=true spring.resources.add-mappings=true
gs.traff.cloud.web.fileagent.url=ftp://hzjt:1qaz2wsx@33.65.250.179:21/gstraff/ gs.traff.cloud.web.fileagent.url=ftp://hzjt:1qaz2wsx@33.65.219.103:21/gstraff/
jms.queueName=demo_queue jms.queueName=demo_queue
alarmrecord.check.push.enable=1 alarmrecord.check.push.enable=1
alarmrecord.check.push.recordtype=1 alarmrecord.check.push.recordtype=1
...@@ -95,11 +95,11 @@ qingzhi.login.keepaliveurl=http://33.50.1.213:38080/api/auth/token/keepalive ...@@ -95,11 +95,11 @@ qingzhi.login.keepaliveurl=http://33.50.1.213:38080/api/auth/token/keepalive
#mqtt配置 - start #mqtt配置 - start
#用户名 #用户名
spring.mqtt.username = spring.mqtt.username =cico
#密码 #密码
spring.mqtt.password = spring.mqtt.password =cico@123
#服务器连接地址 #服务器连接地址
spring.mqtt.url = tcp://12.1.97.11:1883 spring.mqtt.url = tcp://33.65.219.23:1883
#连接超时 #连接超时
spring.mqtt.completionTimeout=3000 spring.mqtt.completionTimeout=3000
spring.mqtt.qos=2 spring.mqtt.qos=2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment