杜凯玲 / huike-eaas-config · Commits

Commit 53c17c86a494a1443f6e888d93edb8c8d353e7a7

Authored by 多国蒙
2 parents d281e8c9 e28aa948

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

Inline Side-by-side
Showing 3 changed files with 84 additions and 31 deletions
class-service.yml
  View file @53c17c8
... ... @@ -73,24 +73,12 @@ spring:
73 73 #date-format: yyyy-MM-dd HH:mm:ss
74 74 #deserialization.accept_empty_string_as_null_object: true
75 75  
76   - activemq:
77   - 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
78   - inMemory: true
79   - pool:
80   - enabled: true
81   - max-connections: 5
82   - idle-timeout: 30000
83   - expiry-timeout: 0
84   - jackson:
85   - time-zone: GMT+8
86   - date-format: yyyy-MM-dd HH:mm:ss
87   - deserialization.accept_empty_string_as_null_object: true
88 76  
89 77 mybatis:
90 78 mapperLocations: classpath:/mybatis/*.xml
91 79 typeAliasesPackage: com.huike.eaas.microservice.classes.domains
92 80 config: classpath:mybatis-config.xml
93   -
  81 +
94 82  
95 83 #mybatis:
96 84 #configLocation: classpath:mybatis-config.xml
... ... @@ -127,7 +115,7 @@ hystrix:
127 115 isolation:
128 116 thread:
129 117 timeoutInMilliseconds: 60000
130   -
  118 +
131 119  
132 120 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
133 121 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
... ... @@ -145,12 +133,28 @@ apiConfig:
145 133 gxbApiUrl: http://gxb-api:8080/gxb-api
146 134 gxbBiApiUrl: http://bi-api:8080/bi-api
147 135 testDecry: ENC(8aea42e66b0928c44cd8f861a9d558e6)
148   -
  136 +
149 137 sendCloud:
150 138 user: postmaster@kkb.sendcloud.org
151 139 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
152 140 from: postmaster@kkb.sendcloud.org
153 141  
  142 +index:
  143 + indexDir: /app/index/
  144 +
  145 +#xxl-job
  146 +xxl:
  147 + job:
  148 + admin:
  149 + addresses: http://192.168.30.61:30140/xxl-job-admin
  150 + executor:
  151 + appname: classes-server
  152 + ip:
  153 + port: 8888
  154 + logpath: /app/logs
  155 + logretentiondays: -1
  156 + accessToken:
  157 +
154 158 ---
155 159 server:
156 160 port: 16200
... ... @@ -191,7 +195,7 @@ spring:
191 195 validation-query: SELECT 1
192 196 test-on-borrow: true
193 197 test-while-idle: true
194   -
  198 +
195 199 secondDatasource:
196 200 name: gxb_core
197 201 url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
... ... @@ -224,7 +228,7 @@ mybatis:
224 228 mapperLocations: classpath:/mybatis/*.xml
225 229 typeAliasesPackage: com.huike.eaas.microservice.classes.domains
226 230 config: classpath:mybatis-config.xml
227   -
  231 +
228 232  
229 233 #mybatis:
230 234 #configLocation: classpath:mybatis-config.xml
... ... @@ -246,7 +250,7 @@ eureka:
246 250 fetchRegistry: true
247 251 serviceUrl:
248 252 defaultZone: http://discovery:15200/eureka/
249   -
  253 +
250 254 hystrix:
251 255 command:
252 256 default:
... ... @@ -273,6 +277,22 @@ apiConfig:
273 277 gxbApiUrl: http://gxb-api:8080/gxb-api
274 278 gxbBiApiUrl: http://bi-api:8080/bi-api
275 279  
  280 +index:
  281 + indexDir: /app/index/
  282 +
  283 +#xxl-job
  284 +xxl:
  285 + job:
  286 + admin:
  287 + addresses: http://192.168.30.61:30140/xxl-job-admin
  288 + executor:
  289 + appname: classes-server
  290 + ip:
  291 + port: 8888
  292 + logpath: /app/logs
  293 + logretentiondays: -1
  294 + accessToken:
  295 +
276 296 ---
277 297 server:
278 298 port: 16200
... ... @@ -312,7 +332,7 @@ spring:
312 332 validation-query: SELECT 1
313 333 test-on-borrow: true
314 334 test-while-idle: true
315   -
  335 +
316 336 secondDatasource:
317 337 name: gxb_core
318 338 url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
... ... @@ -340,12 +360,12 @@ spring:
340 360 #sentinel:
341 361 #master: mymaster1
342 362 #nodes: redis1:16379,redis2:16379
343   -
  363 +
344 364 #jackson:
345 365 #time-zone: GMT+8
346 366 #date-format: yyyy-MM-dd HH:mm:ss
347 367 #deserialization.accept_empty_string_as_null_object: true
348   -
  368 +
349 369  
350 370 mybatis:
351 371 mapperLocations: classpath:/mybatis/*.xml
... ... @@ -368,7 +388,7 @@ eureka:
368 388 fetchRegistry: true
369 389 serviceUrl:
370 390 defaultZone: http://discovery:15200/eureka/
371   -
  391 +
372 392 hystrix:
373 393 command:
374 394 default:
... ... @@ -395,8 +415,24 @@ apiConfig:
395 415 gxbApiUrl: http://api/gxb-api
396 416 gxbBiApiUrl: http://bi-api/bi-api
397 417 parentProjectId: 118
398   -
  418 +
399 419 sendCloud:
400 420 user: postmaster@kkb.sendcloud.org
401 421 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
402   - from: postmaster@kkb.sendcloud.org
403 422 \ No newline at end of file
  423 + from: postmaster@kkb.sendcloud.org
  424 +
  425 +index:
  426 + indexDir: /app/users/index/
  427 +
  428 +#xxl-job
  429 +xxl:
  430 + job:
  431 + admin:
  432 + addresses: http://job-service.gaoxiaobang.com/xxl-job-admin
  433 + executor:
  434 + appname: classes-server
  435 + ip:
  436 + port: 8888
  437 + logpath: /app/logs
  438 + logretentiondays: -1
  439 + accessToken:
404 440 \ No newline at end of file
... ...
gateway.yml
  View file @53c17c8
... ... @@ -73,6 +73,9 @@ zuul:
73 73 training:
74 74 path: /training-service/**
75 75 serviceId: training-service
  76 + cloudProduct:
  77 + path: /cloud-product/**
  78 + serviceId: cloud-product-service
76 79  
77 80 hystrix:
78 81 command:
... ... @@ -116,7 +119,7 @@ cas:
116 119 casServerUrlPrefix: http://cas/
117 120 casServerLoginUrl: https://cas.gaoxiaobang.com/login
118 121 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
119   - ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)|(/cloud-servic)
  122 + ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)|(/cloud-servic)
120 123  
121 124 tenant:
122 125 tenantId: 991
... ... @@ -184,6 +187,9 @@ zuul:
184 187 training:
185 188 path: /training-service/**
186 189 serviceId: training-service
  190 + cloudProduct:
  191 + path: /cloud-product/**
  192 + serviceId: cloud-product-service
187 193 hystrix:
188 194 command:
189 195 default:
... ... @@ -219,7 +225,7 @@ cas:
219 225 casServerUrlPrefix: https://cas.gaoxiaobang.com/
220 226 casServerLoginUrl: https://cas.gaoxiaobang.com/login
221 227 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
222   - ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
  228 + ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
223 229  
224 230 tenant:
225 231 tenantId: 991
... ... @@ -296,6 +302,9 @@ zuul:
296 302 training:
297 303 path: /training-service/**
298 304 serviceId: training-service
  305 + cloudProduct:
  306 + path: /cloud-product/**
  307 + serviceId: cloud-product-service
299 308  
300 309 hystrix:
301 310 command:
... ... @@ -332,7 +341,7 @@ cas:
332 341 casServerUrlPrefix: http://cas/
333 342 casServerLoginUrl: https://cas.gaoxiaobang.com/login
334 343 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
335   - ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
  344 + ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(/cloud-product)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
336 345  
337 346 tenant:
338 347 tenantId: 991
... ...
training-service.yml
  View file @53c17c8
... ... @@ -24,15 +24,23 @@ spring:
24 24 test-on-borrow: true
25 25 test-while-idle: true
26 26 redis:
27   - database: 0
28   - host: redis-server
29   - port: 6379
30   - password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
31 27 pool:
32 28 max-idle: 100
33 29 min-idle: 10
34 30 max-active: 1000
35 31 max-wait: 100000
  32 +
  33 + redis1:
  34 + database: 0
  35 + host: 192.168.30.100
  36 + port: 6379
  37 + password: 123456
  38 +
  39 + redis2:
  40 + database: 0
  41 + host: 192.168.30.100
  42 + port: 6380
  43 + password: 123456
36 44 #sentinel:
37 45 #master: mymaster1
38 46 #nodes: redis-server:16379,redis-server:16379
... ...