Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zxh

2020-08-21 db2412261a825653ca9eccc1fca0569f6745f1d7

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

@@ -36,7 +36,9 @@
  ignored-headers: Access-Control-Allow-Credentials,Access-Control-Allow-Origin,Access-Control-Allow-Methods
  add-host-header: true
  host:
    connectTimeoutMillis: 10000
#    connectTimeoutMillis: 10000
    socket-timeout-millis: 60000
    connect-timeout-millis: 60000
  routes:
    auth:
      path: /api-uaa/**
@@ -217,7 +219,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 +251,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,
@@ -278,6 +280,8 @@
          /api-user/menus/current,
          /api-user/users/current,
          /api-log/requestStat
          /wechatserver/Wechat/GetScreenCount
          /wechatserver/news/LastestNews
        #白名单，需要URL认证的应用ID
        includeClientIds:
          - webApp
@@ -300,4 +304,5 @@
  butler:
    auto-generate-from-zuul-routes: true
    generate-routes: user,file,log,codegenerator,auth
    apiDocsPath: v2/api-docs
    apiDocsPath: v2/api-docs