Commit a5722aee authored by wangjinjing's avatar wangjinjing

数据配置文件修改

parent 4b4847d9
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
</dependency> </dependency>
<!-- oracle --> <!-- oracle -->
<!-- 数据库相关, 驱动、mybatis、分页插件 --> <!-- 数据库相关, 驱动、mybatis、分页插件 -->
<dependency> <!--<dependency>-->
<groupId>com.oracle</groupId> <!--<groupId>com.oracle</groupId>-->
<artifactId>ojdbc6</artifactId> <!--<artifactId>ojdbc6</artifactId>-->
<version>11.2.0</version> <!--<version>11.2.0.3</version>-->
</dependency> <!--</dependency>-->
<!-- 连接池druid --> <!-- 连接池druid -->
<dependency> <dependency>
...@@ -202,6 +202,11 @@ ...@@ -202,6 +202,11 @@
<!-- </dependency>--> <!-- </dependency>-->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.3</version>
</dependency>
</dependencies> </dependencies>
......
...@@ -351,7 +351,7 @@ public class TraffController { ...@@ -351,7 +351,7 @@ public class TraffController {
if ("TRAFFIC_STATISTICS_VEHICLES".equalsIgnoreCase(vehicles.getType())) { if ("TRAFFIC_STATISTICS_VEHICLES".equalsIgnoreCase(vehicles.getType())) {
String sbbh=""; String sbbh="";
int tdbh=0; int tdbh=0;
if(vehicles.getVideo_id().contains("_")) { if(vehicles.getVideo_id().contains("_") && vehicles.getVideo_id().split("_").length == 2) {
String[] sbAndTd = vehicles.getVideo_id().split("_"); String[] sbAndTd = vehicles.getVideo_id().split("_");
sbbh = sbAndTd[0]; sbbh = sbAndTd[0];
tdbh = Integer.valueOf(sbAndTd[1]) + 1; tdbh = Integer.valueOf(sbAndTd[1]) + 1;
......
...@@ -34,7 +34,7 @@ mybatis.configuration.default-statement-timeout=3000 ...@@ -34,7 +34,7 @@ mybatis.configuration.default-statement-timeout=3000
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin #spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523: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.219.103:1521:orcl spring.datasource.url=jdbc:oracle:thin:@33.65.250.179: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
...@@ -62,7 +62,7 @@ spring.datasource.useGlobalDataSourceStat=true ...@@ -62,7 +62,7 @@ spring.datasource.useGlobalDataSourceStat=true
#redis #redis
# Redis��������ַ # Redis��������ַ
spring.redis.host=33.65.219.103 spring.redis.host=33.65.250.179
# Redis���������Ӷ˿� # Redis���������Ӷ˿�
spring.redis.port=6379 spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ� # Redis�������������루Ĭ��Ϊ�գ�
...@@ -81,12 +81,12 @@ spring.redis.pool.min-idle=0 ...@@ -81,12 +81,12 @@ spring.redis.pool.min-idle=0
spring.redis.timeout=2000 spring.redis.timeout=2000
#spring-session ʹ�� #spring-session ʹ��
spring.session.store-type=none spring.session.store-type=none
ip.host=33.65.219.103 ip.host=33.65.250.179
port=21 port=21
message.dept=33030 message.dept=33030
message.rate=10 message.rate=10
ftp.host=33.65.219.103:21:hzjt:1qaz2wsx ftp.host=33.65.250.179:21:hzjt:1qaz2wsx
alarm.subscribe.data.key=gs:traff:alarmlist alarm.subscribe.data.key=gs:traff:alarmlist
...@@ -106,7 +106,7 @@ mybatis.mapper-locations=classpath:mapper/*.xml ...@@ -106,7 +106,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://reader:reader@33.50.1.22:21/gstraff/ gs.traff.cloud.web.fileagent.url=ftp://reader:reader@33.65.250.179: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
......
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