杜凯玲 / huike-eaas-config · Commits

Commit e28aa9482e2efbced1946edc2a2aed3711255c60

Authored by 刘岱鹏
1 parent efd5b853

恢复class配置

Inline Side-by-side
Showing 1 changed file with 60 additions and 24 deletions
class-service.yml
  View file @e28aa94
@@ -73,24 +73,12 @@ spring: @@ -73,24 +73,12 @@ spring:
73 #date-format: yyyy-MM-dd HH:mm:ss 73 #date-format: yyyy-MM-dd HH:mm:ss
74 #deserialization.accept_empty_string_as_null_object: true 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 mybatis: 77 mybatis:
90 mapperLocations: classpath:/mybatis/*.xml 78 mapperLocations: classpath:/mybatis/*.xml
91 typeAliasesPackage: com.huike.eaas.microservice.classes.domains 79 typeAliasesPackage: com.huike.eaas.microservice.classes.domains
92 config: classpath:mybatis-config.xml 80 config: classpath:mybatis-config.xml
93 - 81 +
94 82
95 #mybatis: 83 #mybatis:
96 #configLocation: classpath:mybatis-config.xml 84 #configLocation: classpath:mybatis-config.xml
@@ -127,7 +115,7 @@ hystrix: @@ -127,7 +115,7 @@ hystrix:
127 isolation: 115 isolation:
128 thread: 116 thread:
129 timeoutInMilliseconds: 60000 117 timeoutInMilliseconds: 60000
130 - 118 +
131 119
132 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建） 120 #这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
133 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建） 121 #为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
@@ -145,12 +133,28 @@ apiConfig: @@ -145,12 +133,28 @@ apiConfig:
145 gxbApiUrl: http://gxb-api:8080/gxb-api 133 gxbApiUrl: http://gxb-api:8080/gxb-api
146 gxbBiApiUrl: http://bi-api:8080/bi-api 134 gxbBiApiUrl: http://bi-api:8080/bi-api
147 testDecry: ENC(8aea42e66b0928c44cd8f861a9d558e6) 135 testDecry: ENC(8aea42e66b0928c44cd8f861a9d558e6)
148 - 136 +
149 sendCloud: 137 sendCloud:
150 user: postmaster@kkb.sendcloud.org 138 user: postmaster@kkb.sendcloud.org
151 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a) 139 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
152 from: postmaster@kkb.sendcloud.org 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 server: 159 server:
156 port: 16200 160 port: 16200
@@ -191,7 +195,7 @@ spring: @@ -191,7 +195,7 @@ spring:
191 validation-query: SELECT 1 195 validation-query: SELECT 1
192 test-on-borrow: true 196 test-on-borrow: true
193 test-while-idle: true 197 test-while-idle: true
194 - 198 +
195 secondDatasource: 199 secondDatasource:
196 name: gxb_core 200 name: gxb_core
197 url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 201 url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
@@ -224,7 +228,7 @@ mybatis: @@ -224,7 +228,7 @@ mybatis:
224 mapperLocations: classpath:/mybatis/*.xml 228 mapperLocations: classpath:/mybatis/*.xml
225 typeAliasesPackage: com.huike.eaas.microservice.classes.domains 229 typeAliasesPackage: com.huike.eaas.microservice.classes.domains
226 config: classpath:mybatis-config.xml 230 config: classpath:mybatis-config.xml
227 - 231 +
228 232
229 #mybatis: 233 #mybatis:
230 #configLocation: classpath:mybatis-config.xml 234 #configLocation: classpath:mybatis-config.xml
@@ -246,7 +250,7 @@ eureka: @@ -246,7 +250,7 @@ eureka:
246 fetchRegistry: true 250 fetchRegistry: true
247 serviceUrl: 251 serviceUrl:
248 defaultZone: http://discovery:15200/eureka/ 252 defaultZone: http://discovery:15200/eureka/
249 - 253 +
250 hystrix: 254 hystrix:
251 command: 255 command:
252 default: 256 default:
@@ -273,6 +277,22 @@ apiConfig: @@ -273,6 +277,22 @@ apiConfig:
273 gxbApiUrl: http://gxb-api:8080/gxb-api 277 gxbApiUrl: http://gxb-api:8080/gxb-api
274 gxbBiApiUrl: http://bi-api:8080/bi-api 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 server: 297 server:
278 port: 16200 298 port: 16200
@@ -312,7 +332,7 @@ spring: @@ -312,7 +332,7 @@ spring:
312 validation-query: SELECT 1 332 validation-query: SELECT 1
313 test-on-borrow: true 333 test-on-borrow: true
314 test-while-idle: true 334 test-while-idle: true
315 - 335 +
316 secondDatasource: 336 secondDatasource:
317 name: gxb_core 337 name: gxb_core
318 url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8 338 url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8
@@ -340,12 +360,12 @@ spring: @@ -340,12 +360,12 @@ spring:
340 #sentinel: 360 #sentinel:
341 #master: mymaster1 361 #master: mymaster1
342 #nodes: redis1:16379,redis2:16379 362 #nodes: redis1:16379,redis2:16379
343 - 363 +
344 #jackson: 364 #jackson:
345 #time-zone: GMT+8 365 #time-zone: GMT+8
346 #date-format: yyyy-MM-dd HH:mm:ss 366 #date-format: yyyy-MM-dd HH:mm:ss
347 #deserialization.accept_empty_string_as_null_object: true 367 #deserialization.accept_empty_string_as_null_object: true
348 - 368 +
349 369
350 mybatis: 370 mybatis:
351 mapperLocations: classpath:/mybatis/*.xml 371 mapperLocations: classpath:/mybatis/*.xml
@@ -368,7 +388,7 @@ eureka: @@ -368,7 +388,7 @@ eureka:
368 fetchRegistry: true 388 fetchRegistry: true
369 serviceUrl: 389 serviceUrl:
370 defaultZone: http://discovery:15200/eureka/ 390 defaultZone: http://discovery:15200/eureka/
371 - 391 +
372 hystrix: 392 hystrix:
373 command: 393 command:
374 default: 394 default:
@@ -395,8 +415,24 @@ apiConfig: @@ -395,8 +415,24 @@ apiConfig:
395 gxbApiUrl: http://api/gxb-api 415 gxbApiUrl: http://api/gxb-api
396 gxbBiApiUrl: http://bi-api/bi-api 416 gxbBiApiUrl: http://bi-api/bi-api
397 parentProjectId: 118 417 parentProjectId: 118
398 - 418 +
399 sendCloud: 419 sendCloud:
400 user: postmaster@kkb.sendcloud.org 420 user: postmaster@kkb.sendcloud.org
401 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a) 421 key: ENC(ad810a86e7a4c5910c4e6a72789cf775e59ecaaf2ed5eb3a4b4101fcf299419a)
402 - from: postmaster@kkb.sendcloud.org  
403 \ No newline at end of file 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 \ No newline at end of file 440 \ No newline at end of file