Merge remote-tracking branch 'origin/jwdev' into jwdev

# Conflicts:
#	svr-base.yml

svr-base.yml

@@ -78,7 +78,7 @@ spring:
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.19.103.77/jw2?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  elasticsearch: