Merge branch 'master' of http://60.205.210.36/proudkids-pub/kiss-config-server

kiss-gateway-dev.yml

@@ -96,6 +96,7 @@ urls:
     - /business/api/**
     - /business/authWxCallback/success
     - /business/file/download*
+    - /business/albumPhoto/downloadZip/**
 
 logging:
   config: classpath:logback.xml

kiss-gateway-prd.yml

 server:
-  port: 4006
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
+  port: 9999
 
-# datasoure默认使用JDBC
 spring:
   rabbitmq:
     host: 172.17.229.83
@@ -17,54 +12,91 @@ spring:
       queue: zipkin
   sleuth:
     sampler:
-      percentage: 1.0
+      percentage: 0.5
+  http:
+    multipart:
+      enabled: true
+      file-size-threshold: 100MB
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+      
+zuul:
+  servlet-path: /zuul
+  ignoredServices: '*'
+  host:
+    connect-timeout-millis: 1800000
+    socket-timeout-millis: 1800000
+  routes:
+    kiss-auth:
+      path: /auth/**
+      serviceId: kiss-auth
+      stripPrefix: true
+      sensitiveHeaders:
+    kiss-upms-service:
+      path: /admin/**
+      serviceId: kiss-upms-service
+      stripPrefix: true
+      sensitiveHeaders:
+    kiss-business:
+      path: /business/**
+      serviceId: kiss-business
+      stripPrefix: true
+      sensitiveHeaders:
+    kiss-apps:
+      path: /apps/**
+      serviceId: kiss-apps
+      stripPrefix: true
+      sensitiveHeaders:
+  ratelimit:
+    key-prefix: kiss-ratelimite 
+    enabled: true 
+    repository: REDIS 
+    behind-proxy: true
+    policies:
+      kiss-upms-service:
+        limit: 100
+        quota: 100
+        refresh-interval: 3
+security:
+  validate:
+    code: true
+  sessions: stateless
+  oauth2:
+    resource:
+      loadBalanced: true
+      user-info-uri: http://kiss-auth/user
+      prefer-token-info: false
+      service-id: kiss-gateway
+urls:
+  anon:
+    - /admin/user/upload
+    - /admin/user/editInfo
+    - /auth/**
+    - /admin/code/*
+    - /admin/user/info
+    - /admin/menu/userTree
+    - /admin/generate/**
+    - /swagger-resources/**
+    - /apps/h5/**
+    - /apps/share/card/**
+    - /apps/h5/wechat/userinfo
+    - /apps/h5/sms/send/**
+    - /apps/h5/album/detail/student/**
+    - /apps/h5/org/get/password
+    - /apps/h5/upload/file
+    - /swagger-ui.html
+    - /*/v2/api-docs
+    - /swagger/api-docs
+    - /webjars/**
+    - /business/notify/**
+    - /business/api/**
+    - /business/authWxCallback/success
+    - /business/file/download*
+    - /business/albumPhoto/downloadZip/**
 
-
-# 分库分表支持
-sharding:
-  jdbc:
-    defaultDataSourceName:
-      type: com.zaxxer.hikari.HikariDataSource
-      driver-class-name: com.mysql.jdbc.Driver
-      username: kiss
-      password: kiss123!@#
-      jdbc-url: jdbc:mysql://172.17.229.85:3306/proudkids_kiss?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    datasource:
-      names: ds
-      ds:
-        type: com.zaxxer.hikari.HikariDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-        username: kiss
-        password: kiss123!@#
-        jdbc-url: jdbc:mysql://172.17.229.85:3306/proudkids_kiss?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-#mybaits-plus配置，修改主键类型，mapper.xml、type 别名等
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  typeAliasesPackage: com.proudkids.admin.model.entity
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 0
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 1
-    #驼峰下划线转换
-    db-column-underline: true
-    #刷新mapper 调试神器
-    refresh-mapper: true
-    #数据库大写下划线转换
-    #capital-mode: true
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: true
-wechat:
-  open:
-    componentAppId: "wx0a693ececf7775d7"
-    componentSecret: "591faf379dd974942cc79c9093c43c68"
-    componentToken: "Proudkids"
-    componentAesKey: "DJvsl2MBMqqGRVYaAHAMQTDJvsl2MBMqqGRVYaAHAMQ"
-  api:
-    authCallbackUrl: "http://www.xiaoxiangce.proudkids.com/#/business/authWxCallback/success"
-  menu:
-    name: "小象册"
-    url: "http://www.xiaoxiangce.proudkids.com"
 logging:
   config: classpath:logback.xml
\ No newline at end of file

kiss-gateway-test.yml

@@ -95,6 +95,7 @@ urls:
     - /business/api/**
     - /business/authWxCallback/success
     - /business/file/download*
+    - /business/albumPhoto/downloadZip/**
 
 logging:
   config: classpath:logback.xml
\ No newline at end of file