Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config (f3b5d941) | Commits | 杜凯玲 / huike-eaas-config

Commit f3b5d941f6f30f462d810aca620535cdd452843f

Authored by 刘岱鹏 2019-05-06 13:49:55 +0800

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

* 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config: (26 commits)
  test
  test
  test
  fix:测试
  配置训练营
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  fix: 修改测试
  feat: sharing测试用
  feat: 分布式事务测试
  feat: account 测试
  no message
  增加job配置
  修改job地址
  修改job地址
  ...

# Conflicts:
#	.idea/workspace.xml

Inline Side-by-side

Showing 4 changed files with 905 additions and 0 deletions

account-service.yml 0 → 100644

View file @f3b5d94

	1	+server:
	2	+ port: 17100
	3	+
	4	+spring:
	5	+ profiles: development
	6	+ cloud:
	7	+ config:
	8	+ discovery:
	9	+ enabled: true
	10	+ aop:
	11	+ proxy-target-class: true
	12	+
	13	+
	14	+
	15	+ coreDatasource:
	16	+ write:
	17	+ name: huikeyun
	18	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	19	+ username: test
	20	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	21	+ driver-class-name: com.mysql.jdbc.Driver
	22	+ max-idle: 10
	23	+ max-active: 30
	24	+ max-wait: 60000
	25	+ min-idle: 10
	26	+ initial-size: 10
	27	+ validation-query: SELECT 1
	28	+ test-on-borrow: true
	29	+ test-while-idle: true
	30	+ read1:
	31	+ name: huikeyun
	32	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	33	+ username: test
	34	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	35	+ driver-class-name: com.mysql.jdbc.Driver
	36	+ max-idle: 10
	37	+ max-active: 30
	38	+ max-wait: 60000
	39	+ min-idle: 10
	40	+ initial-size: 10
	41	+ validation-query: SELECT 1
	42	+ test-on-borrow: true
	43	+ test-while-idle: true
	44	+
	45	+
	46	+ redis:
	47	+ database: 0
	48	+ host: redis-server
	49	+ port: 6379
	50	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	51	+ pool:
	52	+ max-idle: 100
	53	+ min-idle: 10
	54	+ max-active: 1000
	55	+ max-wait: 100000
	56	+ #sentinel:
	57	+ #master: mymaster1
	58	+ #nodes: redis-server:16379,redis-server:16379
	59	+
	60	+mybatis:
	61	+ mapperLocations: classpath:/mybatis/*.xml
	62	+ typeAliasesPackage: com.huike.cloud.account
	63	+ config: classpath:mybatis-config.xml
	64	+
	65	+sharding.jdbc:
	66	+ dataSources:
	67	+ ds_master:
	68	+ driverClassName: com.mysql.jdbc.Driver
	69	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	70	+ username: test
	71	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	72	+ ds_slave0:
	73	+ driverClassName: com.mysql.jdbc.Driver
	74	+ url: jdbc:mysql://testdb-slave1:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	75	+ username: test
	76	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	77	+ masterSlaveRule:
	78	+ name: ms_ds
	79	+ masterDataSourceName: ds_master
	80	+ slaveDataSourceNames: ds_slave0
	81	+ props:
	82	+ sql.show: true
	83	+ shardingRule:
	84	+ tables:
	85	+ Account:
	86	+ actualDataNodes: ms_ds.Account${0..1}
	87	+ tableStrategy:
	88	+ inline:
	89	+ shardingColumn: UUID
	90	+ algorithmExpression: Account${UUID.hashCode() % 2}
	91	+
	92	+
	93	+
	94	+#mybatis:
	95	+ #configLocation: classpath:mybatis-config.xml
	96	+
	97	+endpoints:
	98	+ restart:
	99	+ enabled: true
	100	+ shutdown:
	101	+ enabled: true
	102	+ health:
	103	+ sensitive: false
	104	+
	105	+eureka:
	106	+ instance:
	107	+ hostname: account-service
	108	+ perferIpAddress: true
	109	+ instance-id: ${spring.cloud.client.ipAddress}:${server.port}
	110	+ leaseRenewalIntervalInSeconds: 5
	111	+ leaseExpirationDurationInSeconds: 15
	112	+ client:
	113	+ registerWithEureka: true
	114	+ fetchRegistry: true
	115	+ serviceUrl:
	116	+ defaultZone: http://discovery:15200/eureka/
	117	+ healthcheck:
	118	+ enabled: true
	119	+
	120	+hystrix:
	121	+ command:
	122	+ default:
	123	+ execution:
	124	+ timeout:
	125	+ enabled: true
	126	+ isolation:
	127	+ thread:
	128	+ timeoutInMilliseconds: 60000
	129	+
	130	+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
	131	+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
	132	+ribbon:
	133	+ eureka:
	134	+ enabled: true
	135	+ UseIPAddrForServer: true
	136	+ ReadTimeout: 5000
	137	+ ConnectTimeout: 10000
	138	+
	139	+
	140	+---
	141	+server:
	142	+ port: 17100
	143	+
	144	+spring:
	145	+ profiles: test
	146	+ cloud:
	147	+ config:
	148	+ discovery:
	149	+ enabled: true
	150	+
	151	+ coreDatasource:
	152	+ write:
	153	+ name: huikeyun
	154	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	155	+ username: test
	156	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	157	+ driver-class-name: com.mysql.jdbc.Driver
	158	+ max-idle: 10
	159	+ max-active: 30
	160	+ max-wait: 60000
	161	+ min-idle: 10
	162	+ initial-size: 10
	163	+ validation-query: SELECT 1
	164	+ test-on-borrow: true
	165	+ test-while-idle: true
	166	+ read1:
	167	+ name: huikeyun
	168	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	169	+ username: test
	170	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	171	+ driver-class-name: com.mysql.jdbc.Driver
	172	+ max-idle: 10
	173	+ max-active: 30
	174	+ max-wait: 60000
	175	+ min-idle: 10
	176	+ initial-size: 10
	177	+ validation-query: SELECT 1
	178	+ test-on-borrow: true
	179	+ test-while-idle: true
	180	+
	181	+
	182	+ redis:
	183	+ database: 0
	184	+ host: redis-server
	185	+ port: 6379
	186	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	187	+ pool:
	188	+ max-idle: 100
	189	+ min-idle: 10
	190	+ max-active: 1000
	191	+ max-wait: 100000
	192	+ #sentinel:
	193	+ #master: mymaster1
	194	+ #nodes: redis-server:16379,redis-server:16379
	195	+
	196	+mybatis:
	197	+ mapperLocations: classpath:/mybatis/*.xml
	198	+ typeAliasesPackage: com.huike.cloud.account
	199	+ config: classpath:mybatis-config.xml
	200	+
	201	+
	202	+#mybatis:
	203	+ #configLocation: classpath:mybatis-config.xml
	204	+
	205	+endpoints:
	206	+ restart:
	207	+ enabled: true
	208	+ shutdown:
	209	+ enabled: true
	210	+ health:
	211	+ sensitive: false
	212	+
	213	+eureka:
	214	+ instance:
	215	+ hostname: account-service
	216	+ perferIpAddress: true
	217	+ client:
	218	+ registerWithEureka: true
	219	+ fetchRegistry: true
	220	+ serviceUrl:
	221	+ defaultZone: http://discovery:15200/eureka/
	222	+
	223	+hystrix:
	224	+ command:
	225	+ default:
	226	+ execution:
	227	+ timeout:
	228	+ enabled: true
	229	+ isolation:
	230	+ thread:
	231	+ timeoutInMilliseconds: 60000
	232	+
	233	+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
	234	+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
	235	+ribbon:
	236	+ eureka:
	237	+ enabled: true
	238	+ UseIPAddrForServer: true
	239	+ ReadTimeout: 5000
	240	+ ConnectTimeout: 10000
	241	+
	242	+
	243	+---
	244	+server:
	245	+ port: 17100
	246	+
	247	+spring:
	248	+ profiles: production
	249	+ cloud:
	250	+ config:
	251	+ discovery:
	252	+ enabled: true
	253	+ coreDatasource:
	254	+ write:
	255	+ name: huikeyun
	256	+ url: jdbc:mysql://db-master.gxb-base:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	257	+ username: postgres
	258	+ password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
	259	+ driver-class-name: com.mysql.jdbc.Driver
	260	+ max-idle: 10
	261	+ max-active: 30
	262	+ max-wait: 60000
	263	+ min-idle: 10
	264	+ initial-size: 10
	265	+ validation-query: SELECT 1
	266	+ test-on-borrow: true
	267	+ test-while-idle: true
	268	+ read1:
	269	+ name: huikeyun
	270	+ url: jdbc:mysql://db-slave.gxb-base:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	271	+ username: postgres
	272	+ password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
	273	+ driver-class-name: com.mysql.jdbc.Driver
	274	+ max-idle: 10
	275	+ max-active: 30
	276	+ max-wait: 60000
	277	+ min-idle: 10
	278	+ initial-size: 10
	279	+ validation-query: SELECT 1
	280	+ test-on-borrow: true
	281	+ test-while-idle: true
	282	+
	283	+
	284	+ redis:
	285	+ database: 0
	286	+ host: gxb-app-20180706.redis.rds.aliyuncs.com
	287	+ port: 6379
	288	+ password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
	289	+ pool:
	290	+ max-idle: 100
	291	+ min-idle: 10
	292	+ max-active: 1000
	293	+ max-wait: 100000
	294	+ #sentinel:
	295	+ #master: mymaster1
	296	+ #nodes: redis1:16379,redis2:16379
	297	+
	298	+mybatis:
	299	+ mapperLocations: classpath:/mybatis/*.xml
	300	+ typeAliasesPackage: com.huike.cloud.account
	301	+ config: classpath:mybatis-config.xml
	302	+
	303	+endpoints:
	304	+ restart:
	305	+ enabled: true
	306	+ shutdown:
	307	+ enabled: true
	308	+ health:
	309	+ sensitive: false
	310	+
	311	+eureka:
	312	+ instance:
	313	+ perferIpAddress: true
	314	+ client:
	315	+ registerWithEureka: true
	316	+ fetchRegistry: true
	317	+ serviceUrl:
	318	+ defaultZone: http://discovery:15200/eureka/
	319	+
	320	+hystrix:
	321	+ command:
	322	+ default:
	323	+ execution:
	324	+ timeout:
	325	+ enabled: true
	326	+ isolation:
	327	+ thread:
	328	+ timeoutInMilliseconds: 60000
	329	+
	330	+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
	331	+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
	332	+ribbon:
	333	+ eureka:
	334	+ enabled: true
	335	+ UseIPAddrForServer: true
	336	+ ReadTimeout: 5000
	337	+ ConnectTimeout: 10000
	338	+
	339	+
	340	+
	341	+
0	342	\ No newline at end of file
...	...

cloud-product-service.yml 0 → 100644

View file @f3b5d94

	1	+server:
	2	+ port: 17200
	3	+
	4	+spring:
	5	+ profiles: development
	6	+ cloud:
	7	+ config:
	8	+ discovery:
	9	+ enabled: true
	10	+ sentinel:
	11	+ transport:
	12	+ port: 8730
	13	+ dashboard: localhost:8080
	14	+ aop:
	15	+ proxy-target-class: true
	16	+
	17	+ coreDatasource:
	18	+ write:
	19	+ name: gxb_core
	20	+ url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	21	+ username: test
	22	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	23	+ driver-class-name: com.mysql.jdbc.Driver
	24	+ max-idle: 10
	25	+ max-active: 30
	26	+ max-wait: 60000
	27	+ min-idle: 10
	28	+ initial-size: 10
	29	+ validation-query: SELECT 1
	30	+ test-on-borrow: true
	31	+ test-while-idle: true
	32	+ read1:
	33	+ name: gxb_core
	34	+ url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	35	+ username: test
	36	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	37	+ driver-class-name: com.mysql.jdbc.Driver
	38	+ max-idle: 10
	39	+ max-active: 30
	40	+ max-wait: 60000
	41	+ min-idle: 10
	42	+ initial-size: 10
	43	+ validation-query: SELECT 1
	44	+ test-on-borrow: true
	45	+ test-while-idle: true
	46	+
	47	+
	48	+ redis:
	49	+ database: 0
	50	+ host: redis-server
	51	+ port: 6379
	52	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	53	+ pool:
	54	+ max-idle: 100
	55	+ min-idle: 10
	56	+ max-active: 1000
	57	+ max-wait: 100000
	58	+ #sentinel:
	59	+ #master: mymaster1
	60	+ #nodes: redis-server:16379,redis-server:16379
	61	+
	62	+mybatis:
	63	+ mapperLocations: classpath:/mybatis/*.xml
	64	+ typeAliasesPackage: com.huike.cloud.account
	65	+ config: classpath:mybatis-config.xml
	66	+
	67	+sharding.jdbc:
	68	+ dataSources:
	69	+ ds_master:
	70	+ driverClassName: com.mysql.jdbc.Driver
	71	+ url: jdbc:mysql://testdb-master:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	72	+ username: test
	73	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	74	+ ds_slave0:
	75	+ driverClassName: com.mysql.jdbc.Driver
	76	+ url: jdbc:mysql://testdb-slave1:3306/huikeyun?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	77	+ username: test
	78	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	79	+ masterSlaveRule:
	80	+ name: ms_ds
	81	+ masterDataSourceName: ds_master
	82	+ slaveDataSourceNames: ds_slave0
	83	+ props:
	84	+ sql.show: true
	85	+ shardingRule:
	86	+ tables:
	87	+ Account:
	88	+ actualDataNodes: ms_ds.Account${0..1}
	89	+ tableStrategy:
	90	+ inline:
	91	+ shardingColumn: UUID
	92	+ algorithmExpression: Account${UUID.hashCode() % 2}
	93	+
	94	+#mybatis:
	95	+ #configLocation: classpath:mybatis-config.xml
	96	+
	97	+endpoints:
	98	+ restart:
	99	+ enabled: true
	100	+ shutdown:
	101	+ enabled: true
	102	+ health:
	103	+ sensitive: false
	104	+
	105	+eureka:
	106	+ instance:
	107	+ hostname: cloud-product-service
	108	+ perferIpAddress: true
	109	+ instance-id: ${spring.cloud.client.ipAddress}:${server.port}
	110	+ leaseRenewalIntervalInSeconds: 5
	111	+ leaseExpirationDurationInSeconds: 15
	112	+ client:
	113	+ registerWithEureka: true
	114	+ fetchRegistry: true
	115	+ serviceUrl:
	116	+ defaultZone: http://discovery:15200/eureka/
	117	+ healthcheck:
	118	+ enabled: true
	119	+
	120	+hystrix:
	121	+ command:
	122	+ default:
	123	+ execution:
	124	+ timeout:
	125	+ enabled: true
	126	+ isolation:
	127	+ thread:
	128	+ timeoutInMilliseconds: 60000
	129	+
	130	+#这个配置为true则取发现服务的注册地址（服务地址存储在DomainExtractingServerList,由EurekaRibbonClientConfiguration.ribbonServerList()创建）
	131	+#为false取本地配置文件的配置地址（服务地址存储在ConfigurationBasedServerList中,由RibbonClientConfiguration.ribbonServerList()创建）
	132	+ribbon:
	133	+ eureka:
	134	+ enabled: true
	135	+ UseIPAddrForServer: true
	136	+ ReadTimeout: 5000
	137	+ ConnectTimeout: 10000
	138	+
	139	+
	140	+
	141	+
	142	+
	143	+
0	144	\ No newline at end of file
...	...

job-service.yml 0 → 100644

View file @f3b5d94

	1	+server:
	2	+ port: 16300
	3	+ context-path: /xxl-job-admin
	4	+
	5	+spring:
	6	+ profiles: development
	7	+ cloud:
	8	+ config:
	9	+ discovery:
	10	+ enabled: true
	11	+ mvc:
	12	+ static-path-pattern: /static/**
	13	+ ### resources
	14	+ resources:
	15	+ static-locations: classpath:/static/
	16	+ ### freemarker
	17	+ freemarker:
	18	+ templateLoaderPath: classpath:/templates/
	19	+ suffix: .ftl
	20	+ charset: UTF-8
	21	+ request-context-attribute: request
	22	+ settings:
	23	+ number_format: 0.##########
	24	+ ### xxl-job, datasource
	25	+ datasource:
	26	+ name: xxl-job
	27	+ url: jdbc:mysql://192.168.30.154:3306/xxl-job?Unicode=true&characterEncoding=UTF-8
	28	+ username: test
	29	+ password: 123456
	30	+ driver-class-name: com.mysql.jdbc.Driver
	31	+ type: org.apache.tomcat.jdbc.pool.DataSource
	32	+ tomcat:
	33	+ max-wait: 10000
	34	+ max-active: 30
	35	+ test-on-borrow: true
	36	+ validation-query: SELECT 1
	37	+ validation-interval: 30000
	38	+ ### xxl-job email
	39	+ mail:
	40	+ host: smtp.exmail.qq.com
	41	+ port: 995
	42	+ username: gmduo@huikedu.com
	43	+ password: Dgm=0418
	44	+ properties:
	45	+ mail:
	46	+ smtp:
	47	+ auth: true
	48	+ starttls:
	49	+ enable: true
	50	+ required: true
	51	+ velocity:
	52	+ enabled: false
	53	+
	54	+### mybatis
	55	+mybatis:
	56	+ mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
	57	+
	58	+### xxl-job login
	59	+xxl:
	60	+ job:
	61	+ i18n:
	62	+ login:
	63	+ username: admin
	64	+ password: 123456
	65	+ accessToken:
	66	+
	67	+
	68	+---
	69	+server:
	70	+ port: 16300
	71	+ context-path: /xxl-job-admin
	72	+
	73	+spring:
	74	+ profiles: test
	75	+ cloud:
	76	+ config:
	77	+ discovery:
	78	+ enabled: true
	79	+ mvc:
	80	+ static-path-pattern: /static/**
	81	+ ### resources
	82	+ resources:
	83	+ static-locations: classpath:/static/
	84	+ ### freemarker
	85	+ freemarker:
	86	+ templateLoaderPath: classpath:/templates/
	87	+ suffix: .ftl
	88	+ charset: UTF-8
	89	+ request-context-attribute: request
	90	+ settings:
	91	+ number_format: 0.##########
	92	+ ### xxl-job, datasource
	93	+ datasource:
	94	+ name: xxl-job
	95	+ url: jdbc:mysql://192.168.30.154:3306/xxl-job?Unicode=true&characterEncoding=UTF-8
	96	+ username: test
	97	+ password: 123456
	98	+ driver-class-name: com.mysql.jdbc.Driver
	99	+ type: org.apache.tomcat.jdbc.pool.DataSource
	100	+ tomcat:
	101	+ max-wait: 10000
	102	+ max-active: 30
	103	+ test-on-borrow: true
	104	+ validation-query: SELECT 1
	105	+ validation-interval: 30000
	106	+ ### xxl-job email
	107	+ mail:
	108	+ host: smtp.exmail.qq.com
	109	+ port: 995
	110	+ username: gmduo@huikedu.com
	111	+ password: Dgm=0418
	112	+ properties:
	113	+ mail:
	114	+ smtp:
	115	+ auth: true
	116	+ starttls:
	117	+ enable: true
	118	+ required: true
	119	+ velocity:
	120	+ enabled: false
	121	+
	122	+### mybatis
	123	+mybatis:
	124	+ mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
	125	+
	126	+### xxl-job login
	127	+xxl:
	128	+ job:
	129	+ i18n:
	130	+ login:
	131	+ username: admin
	132	+ password: 123456
	133	+ accessToken:
	134	+
	135	+
	136	+---
	137	+server:
	138	+ port: 16300
	139	+ context-path: /xxl-job-admin
	140	+
	141	+spring:
	142	+ profiles: production
	143	+ cloud:
	144	+ config:
	145	+ discovery:
	146	+ enabled: true
	147	+ mvc:
	148	+ static-path-pattern: /static/**
	149	+ ### resources
	150	+ resources:
	151	+ static-locations: classpath:/static/
	152	+ ### freemarker
	153	+ freemarker:
	154	+ templateLoaderPath: classpath:/templates/
	155	+ suffix: .ftl
	156	+ charset: UTF-8
	157	+ request-context-attribute: request
	158	+ settings:
	159	+ number_format: 0.##########
	160	+ ### xxl-job, datasource
	161	+ datasource:
	162	+ name: xxl-job
	163	+ url: jdbc:mysql://db-master.gxb-base:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
	164	+ username: postgres
	165	+ password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
	166	+ driver-class-name: com.mysql.jdbc.Driver
	167	+ max-idle: 10
	168	+ max-active: 30
	169	+ max-wait: 60000
	170	+ min-idle: 10
	171	+ initial-size: 10
	172	+ validation-query: SELECT 1
	173	+ test-on-borrow: true
	174	+ test-while-idle: true
	175	+ ### xxl-job email
	176	+ mail:
	177	+ host: smtp.exmail.qq.com
	178	+ port: 995
	179	+ username: gmduo@huikedu.com
	180	+ password: Dgm=0418
	181	+ properties:
	182	+ mail:
	183	+ smtp:
	184	+ auth: true
	185	+ starttls:
	186	+ enable: true
	187	+ required: true
	188	+ velocity:
	189	+ enabled: false
	190	+
	191	+### mybatis
	192	+mybatis:
	193	+ mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
	194	+
	195	+### xxl-job login
	196	+xxl:
	197	+ job:
	198	+ i18n:
	199	+ login:
	200	+ username: admin
	201	+ password: 123456
	202	+ accessToken:
	203	+
	204	+
	205	+
	206	+
	207	+
...	...

training-service.yml 0 → 100644

View file @f3b5d94

	1	+server:
	2	+ port: 16400
	3	+
	4	+spring:
	5	+ profiles: development
	6	+ cloud:
	7	+ config:
	8	+ discovery:
	9	+ enabled: true
	10	+ datasource:
	11	+ name: gxb_core
	12	+ url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
	13	+ username: test
	14	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	15	+ driver-class-name: com.mysql.jdbc.Driver
	16	+ max-idle: 10
	17	+ max-active: 30
	18	+ max-wait: 60000
	19	+ min-idle: 10
	20	+ initial-size: 10
	21	+ validation-query: SELECT 1
	22	+ test-on-borrow: true
	23	+ test-while-idle: true
	24	+ redis:
	25	+ database: 0
	26	+ host: redis-server
	27	+ port: 6379
	28	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	29	+ pool:
	30	+ max-idle: 100
	31	+ min-idle: 10
	32	+ max-active: 1000
	33	+ max-wait: 100000
	34	+ #sentinel:
	35	+ #master: mymaster1
	36	+ #nodes: redis-server:16379,redis-server:16379
	37	+
	38	+ activemq:
	39	+ 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
	40	+ inMemory: true
	41	+ pool:
	42	+ enabled: true
	43	+ max-connections: 5
	44	+ idle-timeout: 30000
	45	+ expiry-timeout: 0
	46	+ jackson:
	47	+ time-zone: GMT+8
	48	+ date-format: yyyy-MM-dd HH:mm:ss
	49	+ deserialization.accept_empty_string_as_null_object: true
	50	+
	51	+
	52	+mybatis:
	53	+ mapperLocations: classpath:/mybatis/*.xml
	54	+ typeAliasesPackage: com.huike.eaas.microservice.training.domain
	55	+ config: classpath:mybatis-config.xml
	56	+
	57	+endpoints:
	58	+ restart:
	59	+ enabled: true
	60	+ shutdown:
	61	+ enabled: true
	62	+ health:
	63	+ sensitive: false
	64	+
	65	+eureka:
	66	+ instance:
	67	+ hostname: training-service
	68	+ perferIpAddress: true
	69	+ instance-id: ${spring.cloud.client.ipAddress}:${server.port}
	70	+ leaseRenewalIntervalInSeconds: 5
	71	+ leaseExpirationDurationInSeconds: 15
	72	+ client:
	73	+ registerWithEureka: true
	74	+ fetchRegistry: true
	75	+ serviceUrl:
	76	+ defaultZone: http://discovery:15200/eureka/
	77	+ healthcheck:
	78	+ enabled: true
	79	+
	80	+---
	81	+server:
	82	+ port: 16400
	83	+
	84	+spring:
	85	+ profiles: test
	86	+ cloud:
	87	+ config:
	88	+ discovery:
	89	+ enabled: true
	90	+ datasource:
	91	+ name: gxb_core
	92	+ url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
	93	+ username: test
	94	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	95	+ driver-class-name: com.mysql.jdbc.Driver
	96	+ max-idle: 10
	97	+ max-active: 30
	98	+ max-wait: 60000
	99	+ min-idle: 10
	100	+ initial-size: 10
	101	+ validation-query: SELECT 1
	102	+ test-on-borrow: true
	103	+ test-while-idle: true
	104	+ redis:
	105	+ database: 0
	106	+ host: redis-server
	107	+ port: 6379
	108	+ password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
	109	+ pool:
	110	+ max-idle: 100
	111	+ min-idle: 10
	112	+ max-active: 1000
	113	+ max-wait: 100000
	114	+ #sentinel:
	115	+ #master: mymaster1
	116	+ #nodes: redis-server:16379,redis-server:16379
	117	+
	118	+mybatis:
	119	+ mapperLocations: classpath:/mybatis/*.xml
	120	+ typeAliasesPackage: com.huike.eaas.microservice.training.domain
	121	+ config: classpath:mybatis-config.xml
	122	+
	123	+endpoints:
	124	+ restart:
	125	+ enabled: true
	126	+ shutdown:
	127	+ enabled: true
	128	+ health:
	129	+ sensitive: false
	130	+
	131	+eureka:
	132	+ instance:
	133	+ hostname: training-service
	134	+ perferIpAddress: true
	135	+ client:
	136	+ registerWithEureka: true
	137	+ fetchRegistry: true
	138	+ serviceUrl:
	139	+ defaultZone: http://discovery:15200/eureka/
	140	+
	141	+---
	142	+server:
	143	+ port: 16400
	144	+
	145	+spring:
	146	+ profiles: production
	147	+ cloud:
	148	+ config:
	149	+ discovery:
	150	+ enabled: true
	151	+ datasource:
	152	+ name: gxb_core
	153	+ url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
	154	+ username: postgres
	155	+ password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
	156	+ driver-class-name: com.mysql.jdbc.Driver
	157	+ max-idle: 10
	158	+ max-active: 30
	159	+ max-wait: 60000
	160	+ min-idle: 10
	161	+ initial-size: 10
	162	+ validation-query: SELECT 1
	163	+ test-on-borrow: true
	164	+ test-while-idle: true
	165	+ redis:
	166	+ database: 0
	167	+ host: gxb-app-20180706.redis.rds.aliyuncs.com
	168	+ port: 6379
	169	+ password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
	170	+ pool:
	171	+ max-idle: 100
	172	+ min-idle: 10
	173	+ max-active: 1000
	174	+ max-wait: 100000
	175	+ #sentinel:
	176	+ #master: mymaster1
	177	+ #nodes: redis1:16379,redis2:16379
	178	+
	179	+ activemq:
	180	+ broker-url: failover:(tcp://mq-server.gxb-base:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
	181	+ inMemory: true
	182	+ pool:
	183	+ enabled: true
	184	+ max-connections: 5
	185	+ idle-timeout: 30000
	186	+ expiry-timeout: 0
	187	+
	188	+ jackson:
	189	+ time-zone: GMT+8
	190	+ date-format: yyyy-MM-dd HH:mm:ss
	191	+ deserialization.accept_empty_string_as_null_object: true
	192	+
	193	+
	194	+mybatis:
	195	+ mapperLocations: classpath:/mybatis/*.xml
	196	+ typeAliasesPackage: com.huike.eaas.microservice.training.domain
	197	+ config: classpath:mybatis-config.xml
	198	+
	199	+endpoints:
	200	+ restart:
	201	+ enabled: true
	202	+ shutdown:
	203	+ enabled: true
	204	+ health:
	205	+ sensitive: false
	206	+
	207	+eureka:
	208	+ instance:
	209	+ perferIpAddress: true
	210	+ client:
	211	+ registerWithEureka: true
	212	+ fetchRegistry: true
	213	+ serviceUrl:
	214	+ defaultZone: http://discovery:15200/eureka/
0	215	\ No newline at end of file
...	...

杜凯玲 / huike-eaas-config · Commits

GitLab

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