Browse Source

版本更新

lihui001 3 years ago
parent
commit
be00404bd0

+ 2 - 1
sms_water/src/main/resources/application-dev.properties

@@ -172,6 +172,7 @@ aysnc.queue-capacity=100000
 aysnc.thread-name-prefix=aysnc-thread-
 #Ö¸ÁîÏ·¢µ÷ÓýӿڵØÖ·
 send.setsetup.url=http://114.135.61.188:48322/center/command/send
-
+get_map_info_url=http://39.108.175.9:8090/api/platform/getTheMapInformationOfTheDevice
+get_device_url=http://39.108.175.9:8090/api/platform/getDeviceListInformation
 
 

+ 1 - 1
sms_water/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境:dev  测试环境:sit  线上环境:prd
-spring.profiles.active=sit
+spring.profiles.active=dev

+ 9 - 11
zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-dev.properties

@@ -7,9 +7,9 @@ rmcp.url=http://localhost:8325
 
 
 # mysql
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.63:3306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
-spring.datasource.password=100Zone@123
+spring.datasource.password=100zone
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
 
@@ -43,9 +43,8 @@ spring.jackson.time-zone=GMT+8
 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
 
 # redis
-spring.redis.host=114.135.61.188
-spring.redis.port=26379
-spring.redis.password=zoniot
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
 spring.redis.database=2
 spring.redis.timeout=36000
 
@@ -65,7 +64,7 @@ spring.redis.lettuce.shutdown-timeout=100
 security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://10.0.0.135:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.62:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -94,9 +93,9 @@ rmcp.sys_config_path=/UMIS_USER_IMAGES/
 rmcp.sys_excel_path=/UMIS_USER_EXCEL/
 
 #utils
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
+spring.rabbitmq.addresses=10.0.0.63:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=100zone
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated
@@ -104,8 +103,7 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 
 #mongodb url
-#spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
-spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
+spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
 receive.exchange.name=messageExchangeTest

+ 8 - 9
zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -3,9 +3,9 @@ spring.application.name=user-center
 logging.level.root=info
 logging.path=./logs/user-center
 #\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.63:3306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
-spring.datasource.password=100Zone@123
+spring.datasource.password=100zone
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
 mybatis-plus.mapper-locations=classpath:mapper/*.xml
@@ -18,9 +18,8 @@ spring.jackson.time-zone=GMT+8
 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
 
 # utils
-spring.redis.host=114.135.61.188
-spring.redis.port=26379
-spring.redis.password=zoniot
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
 spring.redis.database=2
 spring.redis.timeout=36000
 
@@ -64,13 +63,13 @@ spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.seria
 spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 #utils
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
+spring.rabbitmq.addresses=10.0.0.63:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=100zone
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated