Merge branch 'master' into registry-nacos

# Conflicts:
#	sop-gateway/src/main/resources/application-dev.properties
pull/1/head
tanghc 5 years ago
commit ef28db6a1d
  1. 1
      sop-admin/sop-admin-server/src/main/resources/application-dev.properties
  2. 1
      sop-website/website-server/src/main/resources/application-dev.properties

@ -26,6 +26,7 @@ spring.cloud.zookeeper.connect-string=${zookeeper.url}
spring.cloud.zookeeper.baseSleepTimeMs=3000
spring.cloud.zookeeper.maxRetries=3
# 数据库配置
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.username=${mysql.username}

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

Loading…
Cancel
Save