Skip to content

A
amos-boot-biz
Commit 17ef5bdc authored by chenzhao's avatar chenzhao
Browse files
Options

修改代码

parent 7ac2806a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 17ef5bdc
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.11.201/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.10.211/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
...@@ -14,10 +14,10 @@ spring.datasource.hikari.connection-test-query= SELECT 1 ...@@ -14,10 +14,10 @@ spring.datasource.hikari.connection-test-query= SELECT 1
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740 # \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
fileserver_domain=http://172.16.11.201:9000/ fileserver_domain=http://172.16.10.211:9000/
#eureka.instance.ip-address= 172.16.3.135 #eureka.instance.ip-address= 172.16.3.135
eureka.instance.hostname= 172.16.11.201 eureka.instance.hostname= 172.16.10.211
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/ eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
...@@ -33,9 +33,9 @@ security.appKeyApp=studio_normalapp_3056965 ...@@ -33,9 +33,9 @@ security.appKeyApp=studio_normalapp_3056965
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.11.201 spring.redis.host=172.16.10.211
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234560 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
...@@ -45,10 +45,10 @@ spring.redis.expire.time=30000 ...@@ -45,10 +45,10 @@ spring.redis.expire.time=30000
## 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.11.201:1883 emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=admin emqx.user-name=admin
emqx.password=public emqx.password=public
mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt mqtt.scene.host=mqtt://172.16.10.211:8083/mqtt
mqtt.client.product.id=mqtt mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000 spring.mqtt.completionTimeout=3000
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ 17ef5bdc
spring.application.name=AMOS-EQUIPMANAGE-WJ spring.application.name=AMOS-EQUIPMANAGE
server.servlet.context-path=/equip server.servlet.context-path=/equip
server.port=8100 server.port=8100
#server.servlet.context-path=/case #server.servlet.context-path=/case
spring.profiles.active=dev2 spring.profiles.active=dev
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#mybatis mapper file #mybatis mapper file
mybatis.mapper-locations=classpath:mapper/*.xml mybatis.mapper-locations=classpath:mapper/*.xml
......
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