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

侯瑞军

2020-04-10 2ba1e026deb6772ddf6bf28093fc3b6d194b32eb

 kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml

@@ -14,7 +14,7 @@
  application:
    name: uaa-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver
@@ -56,7 +56,7 @@
  security:
    code:
      # 忽略验证码的应用编号
      ignoreClientCode: app
      ignoreClientCode: app,hospital,webApp

encrypt:
  key-store: