Commit bec5a0d0 by jones

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	proudkids-gateway-prd.yml
parents 984ac12e 7979ef37
...@@ -37,6 +37,7 @@ urls: ...@@ -37,6 +37,7 @@ urls:
- /signin - /signin
- /signup - /signup
- /mobile/token - /mobile/token
- /mobile/pc/token
- /wechat/token - /wechat/token
- /ruser/mobile/token - /ruser/mobile/token
- /admin/user/upload - /admin/user/upload
......
server: server:
port: 9999 port: 9999
spring: spring:
rabbitmq: rabbitmq:
host: 172.17.229.83 host: 172.17.229.83
port: 5675 port: 5675
username: zzq223 username: zzq223
password: 222222 password: 222222
zipkin: zipkin:
rabbitmq: rabbitmq:
queue: zipkin queue: zipkin
sleuth: sleuth:
sampler: sampler:
percentage: 0.5 percentage: 0.5
http: http:
multipart: multipart:
enabled: true enabled: true
file-size-threshold: 100MB file-size-threshold: 100MB
max-file-size: 1000MB max-file-size: 1000MB
max-request-size: 1000MB max-request-size: 1000MB
encoding: encoding:
charset: UTF-8 charset: UTF-8
enabled: true enabled: true
force: true force: true
zuul: zuul:
servlet-path: /zuul servlet-path: /zuul
ignoredServices: '*' ignoredServices: '*'
#ignoredPatterns: /, /**/swagger-ui.html/** #ignoredPatterns: /, /**/swagger-ui.html/**
host: host:
connect-timeout-millis: 1800000 connect-timeout-millis: 1800000
socket-timeout-millis: 1800000 socket-timeout-millis: 1800000
maxTotalConnections: 10000 maxTotalConnections: 10000
maxPerRouteConnections: 10000 maxPerRouteConnections: 10000
semaphore: semaphore:
max-semaphores: 200 max-semaphores: 200
routes: routes:
proudkids-auth: proudkids-auth:
path: /auth/** path: /auth/**
serviceId: proudkids-auth serviceId: proudkids-auth
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-upms-service: proudkids-upms-service:
path: /admin/** path: /admin/**
serviceId: proudkids-upms-service serviceId: proudkids-upms-service
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-sales: proudkids-sales:
path: /sales/** path: /sales/**
serviceId: proudkids-sales serviceId: proudkids-sales
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-ruser: proudkids-ruser:
path: /ruser/** path: /ruser/**
serviceId: proudkids-ruser serviceId: proudkids-ruser
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-aom: proudkids-aom:
path: /aom/** path: /aom/**
serviceId: proudkids-aom serviceId: proudkids-aom
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-workflow: proudkids-workflow:
path: /bills/** path: /bills/**
serviceId: proudkids-workflow serviceId: proudkids-workflow
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-pay: proudkids-pay:
path: /pay/** path: /pay/**
serviceId: proudkids-pay serviceId: proudkids-pay
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-mms: proudkids-mms:
path: /mms/** path: /mms/**
serviceId: proudkids-mms serviceId: proudkids-mms
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-website01: proudkids-website01:
path: /website01/** path: /website01/**
serviceId: proudkids-website01 serviceId: proudkids-website01
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-apps: proudkids-apps:
path: /apps/** path: /apps/**
serviceId: proudkids-apps serviceId: proudkids-apps
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
ratelimit: ratelimit:
key-prefix: proudkids-ratelimite key-prefix: proudkids-ratelimite
enabled: true enabled: true
repository: REDIS repository: REDIS
behind-proxy: true behind-proxy: true
policies: policies:
proudkids-upms-service: proudkids-upms-service:
limit: 100 limit: 100
quota: 100 quota: 100
refresh-interval: 3 refresh-interval: 3
security: security:
validate: validate:
code: true code: true
sessions: stateless sessions: stateless
oauth2: oauth2:
resource: resource:
loadBalanced: true loadBalanced: true
user-info-uri: http://proudkids-auth/user user-info-uri: http://proudkids-auth/user
prefer-token-info: false prefer-token-info: false
service-id: proudkids-gateway service-id: proudkids-gateway
urls: urls:
anon: anon:
- /mobile/** - /mobile/**
- /wechat/token/* - /wechat/token/*
- /admin/user/upload - /admin/user/upload
- /admin/user/editInfo - /admin/user/editInfo
- /auth/** - /auth/**
- /admin/code/* - /admin/code/*
- /admin/smsCode/* - /admin/smsCode/*
- /admin/user/info - /admin/user/info
- /admin/menu/userTree - /admin/menu/userTree
- /admin/generate/** - /admin/generate/**
- /swagger-resources/** - /swagger-resources/**
- /swagger-ui.html - /swagger-ui.html
- /*/v2/api-docs - /*/v2/api-docs
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/tools/repaireRuser
- /aom/tutorUptime/classAssign/statistics/exportExcel* - /aom/lesson/downloadZip/*
- /aom/classLessonDetail/subscription - /aom/tutorUptime/classAssign/statistics/exportExcel*
- /aom/lessonReview/query/lessonReviews/** - /aom/classLessonDetail/subscription
- /aom/lessonReview/download/review/files/** - /aom/lessonReview/query/lessonReviews/**
- /pay/v1/payOrders* - /aom/lessonReview/download/review/files/**
- /pay/wechatPay/** - /pay/v1/payOrders*
- /pay/payCenter/** - /pay/wechatPay/**
- /pay/v1/payGoods/** - /pay/payCenter/**
- /pay/payNotify/** - /pay/v1/payGoods/**
- /pay/wechatAuth/** - /pay/payNotify/**
- /pay/v1/payOrders/query/order/exportExcel - /pay/wechatAuth/**
- /aom/course/queryCourseList/Ruser/** - /pay/v1/payOrders/query/order/exportExcel
- /aom/classRuserDetail/lessons/** - /aom/course/queryCourseList/Ruser/**
- /aom/classRuserDetail/query/RuserCourseLists - /aom/classRuserDetail/lessons/**
- /aom/feedback/callback/userInfo - /aom/classRuserDetail/query/RuserCourseLists
- /aom/classes/periodAppend - /aom/feedback/callback/userInfo
- /ruser/ruser/v1/wechatUser/** - /aom/classes/periodAppend
- /ruser/ruser/v1/perviews/** - /ruser/ruser/v1/wechatUser/**
- /ruser/ruser/v1/check/image/location/** - /ruser/ruser/v1/perviews/**
- /ruser/ruser/v1/getback/password* - /ruser/ruser/v1/check/image/location/**
- /ruser/ruser/v1/ruserChannel/installRuser/** - /ruser/ruser/v1/getback/password*
- /ruser/ruser/v1/ruser/haveInsatll/** - /ruser/ruser/v1/ruserChannel/installRuser/**
- /ruser/v1/ruser/xmla/** - /ruser/ruser/v1/ruser/haveInsatll/**
- /ruser/ruser/v1/set/password - /ruser/v1/ruser/xmla/**
- /ruser/ruser/v1/checkCode/** - /ruser/ruser/v1/set/password
- /ruser/ruser/v1/miniPro/bind/openId/** - /ruser/ruser/v1/checkCode/**
- /ruser/ruser/v1/is/bind/** - /ruser/ruser/v1/miniPro/bind/openId/**
- /ruser/ruser/v1/cancle/push/message/** - /ruser/ruser/v1/is/bind/**
- /ruser/v1/ruser/load/share/image* - /ruser/ruser/v1/cancle/push/message/**
- /ruser/v1/ruser/isHaveInstallWinter* - /ruser/v1/ruser/load/share/image*
- /ruser/en/website/** - /ruser/v1/ruser/isHaveInstallWinter*
- /mms/email/v1/send/** - /ruser/en/website/**
- /mms/sms/v1/send - /mms/email/v1/send/**
- /mms/log/send - /mms/sms/v1/send
- /apps/wechat/** - /mms/log/send
- /apps/ph/material/uploadMaterial - /apps/wechat/**
- /apps/mp/phRuserLessonAnswer/liked/** - /apps/ph/material/uploadMaterial
- /apps/mp/phRuserLessonAnswer/share/page/query/** - /apps/mp/phRuserLessonAnswer/liked/**
- /apps/mp/phRuserLesson/content/** - /apps/mp/phRuserLessonAnswer/share/page/query/**
- /apps/mp/phRuserLesson/new/content/** - /apps/mp/phRuserLesson/content/**
- /apps/mp/phRuserLesson/query/evaluate/** - /apps/mp/phRuserLesson/new/content/**
- /apps/mp/phRuserLesson/repordcard/** - /apps/mp/phRuserLesson/query/evaluate/**
- /apps/mp/phRuserLesson/getMiniProInfo/** - /apps/mp/phRuserLesson/repordcard/**
- /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/** - /apps/mp/phRuserLesson/getMiniProInfo/**
- /apps/mp/lessonSectionContent/query/** - /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/**
- /apps/mp/phRuserLessonQa/qa/information/** - /apps/mp/lessonSectionContent/query/**
- /apps/mp/phRuserLessonQa/qa/information/**
logging:
config: classpath:logback.xml logging:
config: classpath:logback.xml
server.port: 8443
server.ssl.key-store: classpath:ce.proudkids.cn.jks server.port: 8443
server.ssl.key-store-password: proudkids server.ssl.key-store: classpath:ce.proudkids.cn.jks
server.ssl.key-store-password: proudkids
server.ssl.keyStoreType: JKS server.ssl.keyStoreType: JKS
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment