Merge branch 'master' into service_standard

sunninghai
2 parents b7166913 ac622120
Showing 3 changed files with 378 additions and 3 deletions
class-service.yml
gateway.yml
order-service.yml
@@ -127,6 +127,11 @@ apiConfig:
   gxbApiUrl: http://gxb-api:8080/gxb-api
   gxbBiApiUrl: http://bi-api:8080/bi-api
   testDecry: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+  
+sendCloud:
+  user: postmaster@kkb.sendcloud.org
+  key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
+  from: postmaster@kkb.sendcloud.org
 ---
 server:
@@ -364,4 +369,9 @@ apiConfig:
   resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
   usrLocalTomcatTempLocation: /usr/local/tomcat/temp
   gxbApiUrl: http://api/gxb-api
-  gxbBiApiUrl: http://bi-api/bi-api
 \ No newline at end of file
+  gxbBiApiUrl: http://bi-api/bi-api
+  
+sendCloud:
+  user: postmaster@kkb.sendcloud.org
+  key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
+  from: postmaster@kkb.sendcloud.org
 \ No newline at end of file
@@ -57,6 +57,10 @@ zuul:
       path: /dingding-service/**
       #url: http://user-service:16100
       serviceId: user-service
+    order:
+      path: /order/**
+      #url: http://cxcy-service:16300
+      serviceId: order-service
 hystrix:
   command:
@@ -107,6 +111,7 @@ tenant:
 apiConfig:
   gxbApiUrl: http://gxb-api:8080/gxb-api
+  jwtSecret: ENC(c35cdc68f5da4f7557c4551964af915da79cda2e6854d992121061a28d8d85766ac65a4ad753af36d770b7b9a6ebd2b3e59ecaaf2ed5eb3a4b4101fcf299419a)
 ---
 server:
@@ -159,7 +164,10 @@ zuul:
       path: /app/cxcy/**
       #url: http://cxcy-service:16300
       serviceId: cxcy-service
-
+    order:
+      path: /order/**
+      #url: http://cxcy-service:16300
+      serviceId: order-service
 hystrix:
   command:
     default:
@@ -202,6 +210,7 @@ tenant:
 apiConfig:
   gxbApiUrl: http://gxb-api:8080/gxb-api
+  jwtSecret: ENC(c35cdc68f5da4f7557c4551964af915da79cda2e6854d992121061a28d8d85766ac65a4ad753af36d770b7b9a6ebd2b3e59ecaaf2ed5eb3a4b4101fcf299419a)
 ---
 server:
@@ -258,6 +267,10 @@ zuul:
       path: /dingding-service/**
       #url: http://user-service:16100
       serviceId: user-service
+    order:
+      path: /order/**
+      #url: http://cxcy-service:16300
+      serviceId: order-service
 hystrix:
   command:
@@ -300,4 +313,5 @@ tenant:
   tenantId: 991
 apiConfig:
-  gxbApiUrl: http://api/gxb-api
 \ No newline at end of file
+  gxbApiUrl: http://api/gxb-api
+  jwtSecret: ENC(c35cdc68f5da4f7557c4551964af915da79cda2e6854d992121061a28d8d85766ac65a4ad753af36d770b7b9a6ebd2b3e59ecaaf2ed5eb3a4b4101fcf299419a)
+server:
+  port: 16400
+
+spring:
+  profiles: development
+  cloud:
+    config:
+      discovery:
+        enabled: true
+  aop:
+    proxy-target-class: true
+
+  coreDatasource:
+    write:
+      name: gxb_core
+      url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: test
+      password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+    read1:
+      name: gxb_core
+      url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: test
+      password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+      
+  secondDatasource:
+    name: gxb_core
+    url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
+    username: test
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: redis-server
+    port: 6379
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    sentinel:
+      master: mymaster1
+      nodes: redis-server:16379,redis-server:16379
+
+mybatis:
+  mapperLocations: classpath:/mybatis/*.xml
+  typeAliasesPackage: com.huike.eaas.microservice.order.domains
+  config: classpath:mybatis-config.xml
+  
+
+#mybatis:
+  #configLocation: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    hostname: order-service
+    perferIpAddress: true
+    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
+    leaseRenewalIntervalInSeconds: 5
+    leaseExpirationDurationInSeconds: 15
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
+    healthcheck:
+      enabled: true
+      
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+
+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
+ribbon:
+  eureka:
+    enabled: true
+  UseIPAddrForServer: true
+  ReadTimeout: 5000
+  ConnectTimeout: 10000
+
+
+---
+server:
+  port: 16300
+
+spring:
+  profiles: test
+  cloud:
+    config:
+      discovery:
+        enabled: true
+
+  coreDatasource:
+    write:
+      name: gxb_core
+      url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: test
+      password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+    read1:
+      name: gxb_core
+      url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: test
+      password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+      
+  secondDatasource:
+    name: gxb_core
+    url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
+    username: rd
+    password: ENC(5860760736a5c5fbbcbeab1cf6c72b38)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: redis-server
+    port: 6379
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    sentinel:
+      master: mymaster1
+      nodes: redis-server:16379,redis-server:16379
+
+
+  
+
+#mybatis:
+  #configLocation: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    hostname: order-service
+    perferIpAddress: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
+      
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+
+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
+ribbon:
+  eureka:
+    enabled: true
+  UseIPAddrForServer: true
+  ReadTimeout: 5000
+  ConnectTimeout: 10000
+
+# 一些公共的常量配置
+apiConfig:
+  resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
+  usrLocalTomcatTempLocation: /usr/local/tomcat/temp
+  gxbApiUrl: http://gxb-api:8080/gxb-api
+---
+server:
+  port: 16300
+
+spring:
+  profiles: production
+  cloud:
+    config:
+      discovery:
+        enabled: true
+  coreDatasource:
+    write:
+      name: gxb_core
+      url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: postgres
+      password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+    read1:
+      name: gxb_core
+      url: jdbc:mysql://db3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      username: postgres
+      password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
+      driver-class-name: com.mysql.jdbc.Driver
+      max-idle: 10
+      max-active: 30
+      max-wait: 60000
+      min-idle: 10
+      initial-size: 10
+      validation-query: SELECT 1
+      test-on-borrow: true
+      test-while-idle: true
+      
+  secondDatasource:
+    name: gxb_core
+    url: jdbc:mysql://emysql3:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
+    username: postgres
+    password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: redis1
+    port: 6379
+    password: ENC(c2bcc076c4c1dc27436226f3af749fb5b444d4973bb049848ff3c98517dec050)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    sentinel:
+      master: mymaster1
+      nodes: redis1:16379,redis2:16379
+
+mybatis:
+  mapperLocations: classpath:/mybatis/*.xml
+  typeAliasesPackage: com.huike.eaas.microservice.order.domains
+  config: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    perferIpAddress: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
+      
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+
+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
+ribbon:
+  eureka:
+    enabled: true
+  UseIPAddrForServer: true
+  ReadTimeout: 5000
+  ConnectTimeout: 10000
+
+
+
+  
 \ No newline at end of file