remove 第三方接口

4c0985cc · 刘志敏 · e242b1ef · e242b1ef · e242b1ef · e242b1ef
Commit 4c0985cc authored Mar 27, 2018 by 刘志敏
11 changed files
--- a/application-test.yml
+++ b/application-test.yml
-#加密配置
-jasypt:
-  encryptor:
-    password: proudkids
-spring:
-  redis:
-    database: 1
-    remote: true        #cachecloud 获取
-    host: 192.168.1.82
-    port: 6379
-    password:
-  http:
-    multipart:
-      max-file-size: 1000MB
-      max-request-size: 1000MB
-cache:
-  redis:
-    expiration: 3601
-ribbon:
-  Httpclient:
-    enable: false
-  OkHttp:
-    enable: true
-  ReadTimeout: 10000
-  ConnectTimeout: 10000
-feign:
-  hystrix:
-    enabled: true
-  okhttp:
-    enable: true
-  httpclient:
-    enable: 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
\ No newline at end of file
--- a/proudkids-aom-test.yml
+++ b/proudkids-aom-test.yml
-server:
-  port: 4004
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    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://192.168.1.82: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://192.168.1.82: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.aom.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-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://192.168.1.82: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-channels-test.yml
+++ b/proudkids-channels-test.yml
-server:
-  port: 4002
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    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://192.168.1.82: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://192.168.1.82: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.channels.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-gateway-test.yml
+++ b/proudkids-gateway-test.yml
-server:
-  port: 9999
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    port: 5672
-    username: zzq223
-    password: 222222
-  zipkin:
-    rabbitmq:
-      queue: zipkin
-  sleuth:
-    sampler:
-      percentage: 1.0
-zuul:
-  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-channels:
-      path: /channels/**
-      serviceId: proudkids-channels
-      stripPrefix: true
-      sensitiveHeaders:
-    proudkids-thirdparty:
-      path: /thirdparty/**
-      serviceId: proudkids-thirdparty
-      stripPrefix: true
-      sensitiveHeaders:
-    proudkids-ruser:
-      path: /ruser/**
-      serviceId: proudkids-ruser
-      stripPrefix: true
-      sensitiveHeaders:
-    proudkids-aom:
-      path: /aom/**
-      serviceId: proudkids-aom
-      stripPrefix: true
-      sensitiveHeaders:
-  ratelimit:
-    key-prefix: proudkids-ratelimite 
-    enabled: true 
-    repository: REDIS 
-    behind-proxy: true
-    policies:
-      proudkids-upms-service:
-        limit: 1000
-        quota: 1000
-        refresh-interval: 30
-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/**
-logging:
-  config: classpath:logback.xml
--- a/proudkids-ruser-test.yml
+++ b/proudkids-ruser-test.yml
-server:
-  port: 6003
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    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://192.168.1.82: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://192.168.1.82: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.ruser.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-sales-dev.yml
+++ b/proudkids-sales-dev.yml
@@ -78,3 +78,10 @@ fdfs:
 logging:
  config: classpath:logback.xml
+---
+proudkids:
+  thirdparty:
+    card:
+      viewcard: http://192.168.1.83:8080/app/card-record
+      viewinvited: http://192.168.1.83:8080/app/invited-ref
\ No newline at end of file
--- a/proudkids-sales-test.yml
+++ b/proudkids-sales-test.yml
-server:
-  port: 4003
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    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://192.168.1.82: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://192.168.1.82: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.sales.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-thirdparty-dev.yml
+++ b/proudkids-thirdparty-dev.yml
-server:
-  port: 4008
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    port: 5672
-    username: zzq223
-    password: 222222
-  zipkin:
-    rabbitmq:
-      queue: zipkin
-  sleuth:
-    sampler:
-      percentage: 1.0
-logging:
-  config: classpath:logback.xml
---
-proudkids:
-  thirdparty:
-    card:
-      viewcard: http://192.168.1.83:8080/app/card-record
-      viewinvited: http://192.168.1.83:8080/app/invited-ref
\ No newline at end of file
--- a/proudkids-thirdparty-test.yml
+++ b/proudkids-thirdparty-test.yml
-server:
-  port: 4008
-#Redis cache 过期时间设置
-redis:
-  cache:
-    expiration: 3600
-# datasoure默认使用JDBC
-spring:
-  rabbitmq:
-    host: 192.168.1.83
-    port: 5672
-    username: zzq223
-    password: 222222
-  zipkin:
-    rabbitmq:
-      queue: zipkin
-  sleuth:
-    sampler:
-      percentage: 1.0
-logging:
-  config: classpath:logback.xml
---
-proudkids:
-  thirdparty:
-    card:
-      viewcard: http://192.168.1.83:8080/app/card-record
-      viewinvited: http://192.168.1.83:8080/app/invited-ref
\ No newline at end of file
--- 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: 192.168.1.83
-    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://192.168.1.82: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://192.168.1.82: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