亳州位置汇聚
parent
79146e77c4
commit
83fac17fe1
6
pom.xml
6
pom.xml
|
|
@ -89,12 +89,12 @@
|
||||||
<id>prod</id>
|
<id>prod</id>
|
||||||
<properties>
|
<properties>
|
||||||
<profiles.active>prod</profiles.active>
|
<profiles.active>prod</profiles.active>
|
||||||
<nacos.server>53.176.146.99:8848</nacos.server>
|
<nacos.server>10.129.221.10:8848</nacos.server>
|
||||||
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
|
||||||
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
|
||||||
<nacos.username>nacos</nacos.username>
|
<nacos.username>nacos</nacos.username>
|
||||||
<nacos.password>nacos</nacos.password>
|
<nacos.password>Ycgis!2509</nacos.password>
|
||||||
<logstash.address>53.176.146.99:4560</logstash.address>
|
<logstash.address>10.129.221.10:4560</logstash.address>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ dubbo:
|
||||||
username: dubbo
|
username: dubbo
|
||||||
password: ruoyi123
|
password: ruoyi123
|
||||||
# 集群开关
|
# 集群开关
|
||||||
sentinel: true
|
sentinel: false
|
||||||
parameters:
|
parameters:
|
||||||
namespace: ${spring.profiles.active}
|
namespace: ${spring.profiles.active}
|
||||||
database: ${spring.data.redis.database}
|
database: ${spring.data.redis.database}
|
||||||
|
|
|
||||||
|
|
@ -252,7 +252,7 @@ public class LocationController {
|
||||||
if (null != params.get("deviceType")){
|
if (null != params.get("deviceType")){
|
||||||
device.setDeviceType(params.get("deviceType").toString());
|
device.setDeviceType(params.get("deviceType").toString());
|
||||||
}
|
}
|
||||||
if (null != params.get("zzjgdm") && !"341800000000".equals(params.get("zzjgdm").toString())){
|
if (null != params.get("zzjgdm") && !"341600000000".equals(params.get("zzjgdm").toString())){
|
||||||
String[] zzjgdms = params.get("zzjgdm").toString().split(",");
|
String[] zzjgdms = params.get("zzjgdm").toString().split(",");
|
||||||
device.setZzjgdms(zzjgdms);
|
device.setZzjgdms(zzjgdms);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,8 @@ public class DeviceSchedule {
|
||||||
Timestamp updateTime = originDevice.getUpdateTime();
|
Timestamp updateTime = originDevice.getUpdateTime();
|
||||||
// DateTime dateTime = DateUtil.offsetHour(updateTime, 13);
|
// DateTime dateTime = DateUtil.offsetHour(updateTime, 13);
|
||||||
newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) );
|
newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) );
|
||||||
newDevice.setZzjgdm("341300000000");
|
newDevice.setZzjgdm("341600000000");
|
||||||
newDevice.setZzjgmc("宿州市公安局");
|
newDevice.setZzjgmc("亳州市公安局");
|
||||||
// setZzjgdm(newDevice,originDevice);
|
// setZzjgdm(newDevice,originDevice);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ db.num=1
|
||||||
|
|
||||||
### Connect URL of DB:
|
### Connect URL of DB:
|
||||||
#db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
|
#db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
|
||||||
db.url.0=jdbc:mysql://53.176.146.102:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
|
db.url.0=jdbc:mysql://10.129.221.10:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
|
||||||
db.user.0=root
|
db.user.0=root
|
||||||
db.password.0=Ycgis!2509
|
db.password.0=Ycgis!2509
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue