Merge remote-tracking branch 'origin/master'

gateway/src/main/resources/application-prd.properties

@@ -0,0 +1,50 @@
+server.port=8320
+
+logging.level.root=info
+logging.path=/opt/sit/smartcity-gateway/logs
+logging.level.com.alibaba.nacos.client.naming=error
+#指定服务名
+spring.application.name=smart-city-v2-gateway
+
+
+#nacos
+spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
+
+
+spring.cloud.gateway.discovery.locator.enabled=true
+spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
+
+spring.cloud.gateway.routes[0].id=user
+spring.cloud.gateway.routes[0].uri=lb://smart-city-v2-user
+spring.cloud.gateway.routes[0].predicates[0]=Path=/user/**
+spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[1].id=admin
+spring.cloud.gateway.routes[1].uri=lb://smart-city-v2-admin
+spring.cloud.gateway.routes[1].predicates[0]=Path=/admin/**
+spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[2].id=device
+spring.cloud.gateway.routes[2].uri=lb://smart-city-v2-device
+spring.cloud.gateway.routes[2].predicates[0]=Path=/device/**
+spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[3].id=workflow
+spring.cloud.gateway.routes[3].uri=lb://smart-city-v2-workflow
+spring.cloud.gateway.routes[3].predicates[0]=Path=/workflow/**
+spring.cloud.gateway.routes[3].filters[0]=StripPrefix=1
+
+
+spring.cloud.gateway.routes[4].id=access
+spring.cloud.gateway.routes[4].uri=lb://smart-city-v2-iothub-access
+spring.cloud.gateway.routes[4].predicates[0]=Path=/access/**
+spring.cloud.gateway.routes[4].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[5].id=log
+spring.cloud.gateway.routes[5].uri=lb://smart-city-v2-log
+spring.cloud.gateway.routes[5].predicates[0]=Path=/log/**
+spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
+
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+

message/src/main/resources/application-prd.properties

@@ -0,0 +1,65 @@
+server.port=8323
+spring.application.name=uims-message
+logging.level.root=info
+logging.path=./logs/uims_message
+#\u6570\u636E\u5E93\u914D\u7F6E
+spring.datasource.url=jdbc:mysql://10.0.0.137:3306/uims_message?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.hikari.max-lifetime=30000
+mybatis-plus.mapper-locations=classpath:mapper/*.xml
+mybatis-plus.type-aliases-package=com.huaxu.entity
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+spring.jackson.time-zone=GMT+8
+#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+#spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
+
+# redis
+spring.redis.host=10.0.0.136
+spring.redis.port=6379
+spring.redis.password=zoniot
+spring.redis.database=2
+spring.redis.timeout=36000
+
+# Lettuce
+# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.lettuce.pool.max-active=8
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.lettuce.pool.max-wait=100
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.lettuce.pool.max-idle=8
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.lettuce.pool.min-idle=0
+# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
+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.136:8321/user/principal
+security.oauth2.resource.prefer-token-info=false
+
+
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.servlet.multipart.location=${logging.path}/data
+######################################################RabbitMq\u914D\u7F6E#####################################################
+spring.rabbitmq.addresses=114.135.61.188:55672
+spring.rabbitmq.username=zoniot
+spring.rabbitmq.password=zcxk100
+spring.rabbitmq.virtual-host=/
+spring.rabbitmq.connection-timeout=15000
+spring.rabbitmq.publisher-confirm-type=correlated
+spring.rabbitmq.publisher-returns=true
+spring.rabbitmq.template.mandatory=true
+user.connections=userConnection
+dispath.queue=dispathTest
+receive.queue.name=receiveTest
+receive.exchange.name=messageExchangeTest
+dispath.routing.key=dipathKeyTest
+receive.routing.key=receiveKeyTest
+
+spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848

sms_water/src/main/resources/application-prd.properties

@@ -3,7 +3,7 @@ spring.application.name=sms-water
 logging.level.root=info
 logging.path=./logs/sms-water
 #\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/sms?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.137:3306/sms_water?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
@@ -19,12 +19,13 @@ spring.jackson.time-zone=GMT+8
 
 
 #mongodb
-spring.data.mongodb.uri=mongodb://114.135.61.188:17017/sms
+spring.data.mongodb.uri=mongodb://10.0.0.137:27017/sms
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
+
 # redis
-spring.redis.host=114.135.61.188
-spring.redis.port=26379
+spring.redis.host=10.0.0.136
+spring.redis.port=6379
 spring.redis.password=zoniot
 spring.redis.database=2
 spring.redis.timeout=36000
@@ -45,7 +46,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://localhost:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.136:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -69,9 +70,10 @@ 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.136:8848
 SMS.sys_config_path=/UMIS_SMS_IMAGES/
 SMS.sys_excel_path=/UMIS_SMS_EXCEL/
+
 ##rabbitmq
 #spring.rabbitmq.host=114.135.61.188
 #spring.rabbitmq.port=55672
@@ -93,6 +95,7 @@ http_pool.validate_after_inactivity=2000
 http_pool.requesturl=http://114.135.61.188:48322/unit/profiles/list
 
 
+
 # quartz
 spring.quartz.job-store-type=jdbc
 spring.quartz.properties.org.quartz.scheduler.instanceName=smsScheduler
@@ -112,5 +115,5 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 spring.quartz.properties.org.quartz.threadPool.threadPriority=5
 spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-receive.exchange.name=messageExchange
-dispath.routing.key=dipathKey
+receive.exchange.name=messageExchangeTest
+dispath.routing.key=dipathKeyTest

user_auth/src/main/resources/application-prd.properties

@@ -0,0 +1,72 @@
+server.port=8321
+spring.application.name=user-auth
+logging.level.root=info
+logging.path=./logs/user-auth
+#\u6570\u636E\u5E93\u914D\u7F6E
+spring.datasource.url=jdbc:mysql://10.0.0.137:3306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+mybatis-plus.mapper-locations=classpath:mapper/*.xml
+mybatis-plus.type-aliases-package=com.huaxu.entity
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+spring.jackson.time-zone=GMT+8
+#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+#spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
+
+# redis
+spring.redis.host=10.0.0.136
+spring.redis.port=6379
+spring.redis.password=zoniot
+spring.redis.database=2
+spring.redis.timeout=36000
+
+# Lettuce
+# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.lettuce.pool.max-active=8
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.lettuce.pool.max-wait=100
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.lettuce.pool.max-idle=8
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.lettuce.pool.min-idle=0
+# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
+spring.redis.lettuce.shutdown-timeout=100
+
+
+security.oauth2.client.client-id=smart-city-v2
+security.oauth2.client.client-secret=smart-city-v2-123
+
+
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.servlet.multipart.location=${logging.path}/data
+
+#kafka server
+spring.kafka.bootstrap-servers=114.135.61.188:36377
+#kafka consumer config
+spring.kafka.consumer.group-id=user-group-dev
+spring.kafka.consumer.auto-offset-reset=latest
+spring.kafka.consumer.enable-auto-commit=true
+#kafka producer config
+spring.kafka.producer.retries=0
+spring.kafka.producer.batch-size=4096
+spring.kafka.producer.buffer-memory=40960
+
+spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
+spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
+spring.kafka.consumer.properties.spring.json.trusted.packages=*
+
+#nacos
+spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
+maxSendCodeNum=3
+getSendCodeMax=2
+receive.exchange.name=messageExchangeTest
+dispath.routing.key=dipathKeyTest
+dispath.queue=dispathTest
+
+
+
+

user_center/src/main/resources/application-prd.properties

@@ -3,7 +3,7 @@ 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.137:3306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
@@ -18,8 +18,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.host=10.0.0.136
+spring.redis.port=6379
 spring.redis.password=zoniot
 spring.redis.database=2
 spring.redis.timeout=36000
@@ -40,7 +40,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://localhost:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.136:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -64,6 +64,18 @@ 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.136:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
+#rabbit
+spring.rabbitmq.addresses=114.135.61.188:55672
+spring.rabbitmq.username=zoniot
+spring.rabbitmq.password=zcxk100
+spring.rabbitmq.virtual-host=/
+spring.rabbitmq.connection-timeout=15000
+spring.rabbitmq.publisher-confirm-type=correlated
+spring.rabbitmq.publisher-returns=true
+spring.rabbitmq.template.mandatory=true
+dispath.queue=dispath
+receive.exchange.name=messageExchange
+dispath.routing.key=dipathKey