| 
															
																@@ -7,9 +7,9 @@ rmcp.url=http://localhost:8325 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																 # mysql 
															 | 
															
															 | 
															
																 # 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.username=root 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-spring.datasource.password=100Zone@123 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+spring.datasource.password=100zone 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 
															 | 
															
															 | 
															
																 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.datasource.hikari.max-lifetime=30000 
															 | 
															
															 | 
															
																 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 
															 | 
															
															 | 
															
																 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																 # redis 
															 | 
															
															 | 
															
																 # 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.database=2 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.redis.timeout=36000 
															 | 
															
															 | 
															
																 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-id=smart-city-v2 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 security.oauth2.client.client-secret=smart-city-v2-123 
															 | 
															
															 | 
															
																 security.oauth2.client.client-secret=smart-city-v2-123 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 security.oauth2.resource.id=smartcity-deivice-service 
															 | 
															
															 | 
															
																 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 
															 | 
															
															 | 
															
																 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/ 
															 | 
															
															 | 
															
																 rmcp.sys_excel_path=/UMIS_USER_EXCEL/ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																 #utils 
															 | 
															
															 | 
															
																 #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.virtual-host=/ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.rabbitmq.connection-timeout=15000 
															 | 
															
															 | 
															
																 spring.rabbitmq.connection-timeout=15000 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.rabbitmq.publisher-confirm-type=correlated 
															 | 
															
															 | 
															
																 spring.rabbitmq.publisher-confirm-type=correlated 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -104,8 +103,7 @@ spring.rabbitmq.publisher-returns=true 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 spring.rabbitmq.template.mandatory=true 
															 | 
															
															 | 
															
																 spring.rabbitmq.template.mandatory=true 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																 #mongodb url 
															 | 
															
															 | 
															
																 #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 
															 | 
															
															 | 
															
																 logging.level.org.springframework.data.mongodb.core=DEBUG 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																 receive.exchange.name=messageExchangeTest 
															 | 
															
															 | 
															
																 receive.exchange.name=messageExchangeTest 
															 |