7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-12 07:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into registry-nacos

Browse Source 
# Conflicts:
#	sop-gateway/src/main/resources/application-dev.properties
This commit is contained in:
tanghc
2019-07-19 10:14:32 +08:00
parent 7c90239ef3 bea7348dc8
commit ef28db6a1d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sop-admin/sop-admin-server/src/main/resources/application-dev.properties
View File

@@ -26,6 +26,7 @@ spring.cloud.zookeeper.connect-string=${zookeeper.url}
spring.cloud.zookeeper.baseSleepTimeMs=3000 spring.cloud.zookeeper.baseSleepTimeMs=3000
spring.cloud.zookeeper.maxRetries=3 spring.cloud.zookeeper.maxRetries=3
# 数据库配置
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=${mysql.username} spring.datasource.username=${mysql.username}

1
sop-website/website-server/src/main/resources/application-dev.properties
View File

@@ -19,6 +19,7 @@ registry.nacos-server-addr=${nacos.url}
# 使用eureka，填：eureka，使用nacos填：nacos # 使用eureka，填：eureka，使用nacos填：nacos
registry.name=nacos registry.name=nacos
# zookeeper配置
spring.cloud.zookeeper.connect-string=${zookeeper.url} spring.cloud.zookeeper.connect-string=${zookeeper.url}
# 测试环境 # 测试环境