Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config

多国蒙
2 parents d281e8c9 e28aa948
Showing 3 changed files with 84 additions and 31 deletions
class-service.yml
gateway.yml
training-service.yml
@@ -73,24 +73,12 @@ spring:
     #date-format: yyyy-MM-dd HH:mm:ss
     #deserialization.accept_empty_string_as_null_object: true
-  activemq:
-    broker-url: failover:(tcp://mqserver:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
-    inMemory: true
-    pool:
-      enabled: true
-      max-connections: 5
-      idle-timeout: 30000
-      expiry-timeout: 0
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-    deserialization.accept_empty_string_as_null_object: true      
 mybatis:
   mapperLocations: classpath:/mybatis/*.xml
   typeAliasesPackage: com.huike.eaas.microservice.classes.domains
   config: classpath:mybatis-config.xml
-  
+
 #mybatis:
   #configLocation: classpath:mybatis-config.xml
@@ -127,7 +115,7 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000
-            
+
 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
@@ -145,12 +133,28 @@ 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
+index:
+  indexDir: /app/index/
+
+#xxl-job
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.30.61:30140/xxl-job-admin
+    executor:
+      appname: classes-server
+      ip:
+      port: 8888
+      logpath: /app/logs
+      logretentiondays: -1
+    accessToken:
+
 ---
 server:
   port: 16200
@@ -191,7 +195,7 @@ spring:
       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
@@ -224,7 +228,7 @@ mybatis:
   mapperLocations: classpath:/mybatis/*.xml
   typeAliasesPackage: com.huike.eaas.microservice.classes.domains
   config: classpath:mybatis-config.xml
-  
+
 #mybatis:
   #configLocation: classpath:mybatis-config.xml
@@ -246,7 +250,7 @@ eureka:
     fetchRegistry: true
     serviceUrl:
       defaultZone: http://discovery:15200/eureka/
-      
+
 hystrix:
   command:
     default:
@@ -273,6 +277,22 @@ apiConfig:
   gxbApiUrl: http://gxb-api:8080/gxb-api
   gxbBiApiUrl: http://bi-api:8080/bi-api
+index:
+  indexDir: /app/index/
+
+#xxl-job
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.30.61:30140/xxl-job-admin
+    executor:
+      appname: classes-server
+      ip:
+      port: 8888
+      logpath: /app/logs
+      logretentiondays: -1
+    accessToken:
+
 ---
 server:
   port: 16200
@@ -312,7 +332,7 @@ spring:
       validation-query: SELECT 1
       test-on-borrow: true
       test-while-idle: true
-      
+
   secondDatasource:
     name: gxb_core
     url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
@@ -340,12 +360,12 @@ spring:
     #sentinel:
       #master: mymaster1
       #nodes: redis1:16379,redis2:16379
-      
+
   #jackson:
     #time-zone: GMT+8
     #date-format: yyyy-MM-dd HH:mm:ss
     #deserialization.accept_empty_string_as_null_object: true
-         
+
 mybatis:
   mapperLocations: classpath:/mybatis/*.xml
@@ -368,7 +388,7 @@ eureka:
     fetchRegistry: true
     serviceUrl:
       defaultZone: http://discovery:15200/eureka/
-      
+
 hystrix:
   command:
     default:
@@ -395,8 +415,24 @@ apiConfig:
   gxbApiUrl: http://api/gxb-api
   gxbBiApiUrl: http://bi-api/bi-api
   parentProjectId: 118
-  
+
 sendCloud:
   user: postmaster@kkb.sendcloud.org
   key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
-  from: postmaster@kkb.sendcloud.org
 \ No newline at end of file
+  from: postmaster@kkb.sendcloud.org
+
+index:
+  indexDir: /app/users/index/
+
+#xxl-job
+xxl:
+  job:
+    admin:
+      addresses: http://job-service.gaoxiaobang.com/xxl-job-admin
+    executor:
+      appname: classes-server
+      ip:
+      port: 8888
+      logpath: /app/logs
+      logretentiondays: -1
+    accessToken:
 \ No newline at end of file
@@ -73,6 +73,9 @@ zuul:
     training:
       path: /training-service/**
       serviceId: training-service
+    cloudProduct:
+      path: /cloud-product/**
+      serviceId: cloud-product-service
 hystrix:
   command:
@@ -116,7 +119,7 @@ cas:
   casServerUrlPrefix: http://cas/
   casServerLoginUrl: https://cas.gaoxiaobang.com/login
   casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
-  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)|(/cloud-servic)
+  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)|(/cloud-servic)
 tenant:
   tenantId: 991
@@ -184,6 +187,9 @@ zuul:
     training:
       path: /training-service/**
       serviceId: training-service
+    cloudProduct:
+      path: /cloud-product/**
+      serviceId: cloud-product-service
 hystrix:
   command:
     default:
@@ -219,7 +225,7 @@ cas:
   casServerUrlPrefix: https://cas.gaoxiaobang.com/
   casServerLoginUrl: https://cas.gaoxiaobang.com/login
   casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
-  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
+  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
 tenant:
   tenantId: 991
@@ -296,6 +302,9 @@ zuul:
     training:
       path: /training-service/**
       serviceId: training-service
+    cloudProduct:
+      path: /cloud-product/**
+      serviceId: cloud-product-service
 hystrix:
   command:
@@ -332,7 +341,7 @@ cas:
   casServerUrlPrefix: http://cas/
   casServerLoginUrl: https://cas.gaoxiaobang.com/login
   casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
-  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
+  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
 tenant:
   tenantId: 991
@@ -24,15 +24,23 @@ spring:
     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
+
+  redis1:
+    database: 0
+    host: 192.168.30.100
+    port: 6379
+    password: 123456
+
+  redis2:
+    database: 0
+    host: 192.168.30.100
+    port: 6380
+    password: 123456
     #sentinel:
       #master: mymaster1
       #nodes: redis-server:16379,redis-server:16379