Commit 003f6f3c authored by suhuiguang's avatar suhuiguang

Merge branch 'develop_tzs' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_tzs

parents e2306daa f3c38022
...@@ -2,11 +2,11 @@ spring.application.name=AMOS-API-ACCESSAPI ...@@ -2,11 +2,11 @@ spring.application.name=AMOS-API-ACCESSAPI
server.servlet.context-path=/accessapi server.servlet.context-path=/accessapi
server.port=11005 server.port=11005
# jdbc_config # jdbc_config
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.url=jdbc:mysql://172.16.10.220:3306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8\ spring.datasource.url=jdbc:postgresql://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_data_accessapi&allowMultiQueries=true
&characterEncoding=utf8 #spring.datasource.url=jdbc:vastbase://36.46.151.113:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz
spring.datasource.username=root spring.datasource.username=admin
spring.datasource.password=Yeejoin@2020 spring.datasource.password=Yeejoin@2023
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5 spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15 spring.datasource.hikari.maximum-pool-size=15
...@@ -19,17 +19,16 @@ spring.datasource.hikari.connection-test-query=SELECT 1 ...@@ -19,17 +19,16 @@ spring.datasource.hikari.connection-test-query=SELECT 1
# REDIS (RedisProperties) # REDIS (RedisProperties)
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.10.220 spring.redis.host=172.16.10.230
spring.redis.port=6379 spring.redis.port=16379
spring.redis.password=yeejoin@2020 spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1 spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0 spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
#注册中心地址 #注册中心地址
eureka.client.service-url.defaultZone =http://172.16.10.220:10001/eureka/ eureka.client.service-url.defaultZone =http://172.16.10.230:10001/eureka/
eureka.instance.prefer-ip-address=true eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=* management.endpoints.web.exposure.include=*
...@@ -43,9 +42,9 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port} ...@@ -43,9 +42,9 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
##emqx ##emqx
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.220:1883 emqx.broker=tcp://172.16.10.230:2883
emqx.client-user-name=admin emqx.client-user-name=super
emqx.client-password=public emqx.client-password=123456
##biz custem properties ##biz custem properties
biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
...@@ -59,4 +58,13 @@ spring.influx.database=station_platform ...@@ -59,4 +58,13 @@ spring.influx.database=station_platform
spring.influx.retention_policy=default spring.influx.retention_policy=default
spring.influx.retention_policy_time=30d spring.influx.retention_policy_time=30d
spring.influx.actions=10000 spring.influx.actions=10000
spring.influx.bufferLimit=20000 spring.influx.bufferLimit=20000
\ No newline at end of file
spring.redis.mode=cluster
spring.redis.cluster.scan-interval=1000
spring.redis.cluster.read-mode=SLAVE
spring.redis.cluster.retry-attempts=3
spring.redis.cluster.failed-attempts=3
spring.redis.cluster.slave-connection-pool-size=64
spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
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