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

houruijun

2020-08-20 e4ac82fd428335020eb6522fc642b4fd91eb86f0

 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml

@@ -217,7 +217,7 @@
      - /*/oauth/**
      - /actuator/health
      - /actuator/info
      - /api-sms/smsChangLan/send
      - /api-file/smsChangLan/send
      - /api-user/users/doctorUserReg
      - /api-user/users/isRegUser
      - /api-user/users/passwordByPhone
@@ -249,7 +249,7 @@
        /api-user/users-anon/**,
        /login.html,
        /user/login,
        /api-sms/smsChangLan/send,
        /api-file/smsChangLan/send,
        /api-user/users/doctorUserReg,
        /api-file/files-upload,
        /api-user/users/isRegUser,