Merge branch 'master' of

git@60.205.210.36:proudkids-pub/config-center.git Conflicts: application-test.yml proudkids-auth-test.yml proudkids-gateway-test.yml proudkids-upms-service-test.yml proudkids-workflow-test.yml

Merge branch 'master' of
git@60.205.210.36:proudkids-pub/config-center.git Conflicts: application-test.yml proudkids-auth-test.yml proudkids-gateway-test.yml proudkids-upms-service-test.yml proudkids-workflow-test.yml
56a48c9b · 张宗强 · 6f7336a9 · 13df74a5 · 56a48c9b · 56a48c9b
Commit 56a48c9b authored May 29, 2018 by 张宗强
10 changed files
--- a/application-dev.yml
+++ b/application-dev.yml
--- a/application-test.yml
+++ b/application-test.yml
+#加密配置
+jasypt:
+  encryptor:
+    password: proudkids
+spring:
+  redis:
+    remote: true        #cachecloud 获取
+    host: 172.31.157.231
+    port: 6379
+    password:
+  http:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+cache:
+  redis:
+    expiration: 3601
+ribbon:
+  Httpclient:
+    enabled: false
+  OkHttp:
+    enabled: true
+  ReadTimeout: 30000
+  ConnectTimeout: 30000
+feign:
+  hystrix:
+    enabled: true
+  okhttp:
+    enabled: true
+  httpclient:
+    enabled: false
+  client:
+    config:
+      feignName:
+        connectTimeout: 30000
+        readTimeout: 30000  
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+#监控短点配置
+management:
+  security:
+    enabled: false
+endpoints:
+  actuator:
+    enabled: true
+  shutdown:
+    enabled: false
+proudkids:
+  oss-domain: http://files.proudkids.cn
+eeo:
+  sid: 2740354
+  secret: lTQ3Cp5S
+  folderId: 1674421
\ No newline at end of file
--- a/proudkids-auth-dev.yml
+++ b/proudkids-auth-dev.yml
--- a/proudkids-auth-test.yml
+++ b/proudkids-auth-test.yml
+server:
+  port: 3000
+# datasoure默认使用JDBC
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    username: proudkids
+    password: pds123!@#
+    url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+proudkids:
+  auth:
+    clientId: ENC(rbxhyTerjSi2LATpOlQN0g==)
+    clientSecret: ENC(rbxhyTerjSi2LATpOlQN0g==)
+    scope: server
+urls:
+  anon:
+    - /social
+    - /signin
+    - /signup
+    - /mobile/token
+logging:
+  config: classpath:logback.xml
--- a/proudkids-gateway-dev.yml
+++ b/proudkids-gateway-dev.yml
@@ -102,7 +102,7 @@ urls:
    - /swagger/api-docs
    - /webjars/**
    - /aom/lesson/downloadZip/*
-    #- /zuul/aom/lesson/courseware/upload
+    - /aom/tutorUptime/classAssign/statistics/exportExcel/*
    - /ruser/**
    - /ruser/v1/ruserChannel/installRuser/**

--- a/proudkids-gateway-test.yml
+++ b/proudkids-gateway-test.yml
+server:
+  port: 9999
+spring:
+  rabbitmq:
+    host: 172.31.157.231
+    port: 5672
+    username: zzq223
+    password: 222222
+  zipkin:
+    rabbitmq:
+      queue: zipkin
+  sleuth:
+    sampler:
+      percentage: 0.5
+zuul:
+  servlet-path: /
+  ignoredServices: '*'
+  host:
+    connect-timeout-millis: 30000
+    socket-timeout-millis: 30000
+  routes:
+    proudkids-auth:
+      path: /auth/**
+      serviceId: proudkids-auth
+      stripPrefix: true
+      sensitiveHeaders:
+    proudkids-upms-service:
+      path: /admin/**
+      serviceId: proudkids-upms-service
+      stripPrefix: true
+      sensitiveHeaders:
+    proudkids-sales:
+      path: /sales/**
+      serviceId: proudkids-sales
+      stripPrefix: true
+      sensitiveHeaders:
+    proudkids-ruser:
+      path: /ruser/**
+      serviceId: proudkids-ruser
+      stripPrefix: true
+      sensitiveHeaders:
+    proudkids-aom:
+      path: /aom/**
+      serviceId: proudkids-aom
+      stripPrefix: true
+      sensitiveHeaders:
+    proudkids-workflow:
+      path: /bills/**
+      serviceId: proudkids-workflow
+      stripPrefix: true
+      sensitiveHeaders:
+  ratelimit:
+    key-prefix: proudkids-ratelimite 
+    enabled: true 
+    repository: REDIS 
+    behind-proxy: true
+    policies:
+      proudkids-upms-service:
+        limit: 100
+        quota: 100
+        refresh-interval: 3
+security:
+  validate:
+    code: false
+  sessions: stateless
+  oauth2:
+    resource:
+      loadBalanced: true
+      user-info-uri: http://proudkids-auth/user
+      prefer-token-info: false
+      service-id: proudkids-gateway
+urls:
+  anon:
+    - /mobile/**
+    - /auth/**
+    - /admin/code/*
+    - /admin/smsCode/*
+    - /admin/user/info
+    - /admin/menu/userTree
+    - /swagger-resources/**
+    - /swagger-ui.html
+    - /*/v2/api-docs
+    - /swagger/api-docs
+    - /webjars/**
+    - /aom/lesson/downloadZip/*
+    - /aom/tutorUptime/classAssign/statistics/exportExcel/*
+    - /ruser/v1/ruserChannel/installRuser/**
+logging:
+  config: classpath:logback.xml
--- a/proudkids-upms-service-dev.yml
+++ b/proudkids-upms-service-dev.yml
--- a/proudkids-upms-service-test.yml
+++ b/proudkids-upms-service-test.yml
+server:
+  port: 4000
+#Redis cache 过期时间设置
+redis:
+  cache:
+    expiration: 3600
+# datasoure默认使用JDBC
+spring:
+  rabbitmq:
+    host: 172.31.157.231
+    port: 5672
+    username: zzq223
+    password: 222222
+  zipkin:
+    rabbitmq:
+      queue: zipkin
+  sleuth:
+    sampler:
+      percentage: 1.0
+# 分库分表支持
+sharding:
+  jdbc:
+    defaultDataSourceName:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.jdbc.Driver
+      username: proudkids
+      password: pds123!@#
+      jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    datasource:
+      names: ds
+      ds:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.jdbc.Driver
+        username: proudkids
+        password: pds123!@#
+        jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    config:
+      sharding:
+        tables:
+          sys_log:
+            actual-data-nodes: ds.sys_log_${0..1}
+            table-strategy:
+              inline:
+                sharding-column: id
+                algorithm-expression: sys_log_${id % 2}
+            key-generator-column-name: id
+#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
+fdfs:
+  file-host: http://123.206.94.20:9999/
+  tracker-list:
+    - 123.206.94.20:22122
+qiniu:
+  accessKey: hM2cBDEM0FTYzpXbigRW90kV12NhhzhFM3jCzurJ
+  secretKey: ENC(xUadBts805WTXkGtxsgPEybtR3D14GFQHAPUBDEnIoYmStJftu63fldDFUhUA2W2OU3NdRR0+3A=)
+  bucket: proudkidscloud
+  qiniuHost: http://p0hpm86wj.bkt.clouddn.com/
+logging:
+  config: classpath:logback.xml
\ No newline at end of file
--- a/proudkids-workflow-dev.yml
+++ b/proudkids-workflow-dev.yml
--- a/proudkids-workflow-test.yml
+++ b/proudkids-workflow-test.yml
+server:
+  port: 7313
+redis:
+  cache:
+    expiration: 3600
+spring:
+  datasource:
+    url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    username: proudkids
+    password: pds123!@#
+  rabbitmq:
+    host: 172.31.157.231
+    port: 5672
+    username: zzq223
+    password: 222222
+  zipkin:
+    rabbitmq:
+      queue: zipkin
+  sleuth:
+    sampler:
+      percentage: 1.0
+  activiti:
+    database-schema-update: true
+    check-process-definitions: true
+    process-definition-location-prefix: classpath:/processes/
+    history-level: full
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*Mapper.xml
+  typeAliasesPackage: com.proudkids.workflow.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
+logging:
+  config: classpath:logback.xml
\ No newline at end of file