d75a5d70 by 肖初晴

Merge remote-tracking branch 'origin/develop' into develop

2 parents 2461fd66 9372021d
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
92 <exclude>release/*</exclude> 92 <exclude>release/*</exclude>
93 <exclude>develop/*</exclude> 93 <exclude>develop/*</exclude>
94 <exclude>release-test/*</exclude> 94 <exclude>release-test/*</exclude>
95 <exclude>zq-release/*</exclude>
95 </excludes> 96 </excludes>
96 <!--开启过滤器,此处不能忽略!--> 97 <!--开启过滤器,此处不能忽略!-->
97 <filtering>true</filtering> 98 <filtering>true</filtering>
...@@ -207,6 +208,41 @@ ...@@ -207,6 +208,41 @@
207 <subPath>project</subPath> 208 <subPath>project</subPath>
208 </properties> 209 </properties>
209 </profile> 210 </profile>
211 <profile>
212 <id>zq-production-daop-master</id>
213 <properties>
214 <profileActive>zq-release</profileActive>
215 <subPath></subPath>
216 </properties>
217 </profile>
218 <profile>
219 <id>zq-production-daop-lt</id>
220 <properties>
221 <profileActive>zq-release</profileActive>
222 <subPath>lt</subPath>
223 </properties>
224 </profile>
225 <profile>
226 <id>zq-production-daop-zcgl</id>
227 <properties>
228 <profileActive>zq-release</profileActive>
229 <subPath>zcgl</subPath>
230 </properties>
231 </profile>
232 <profile>
233 <id>zq-production-daop-jgjf</id>
234 <properties>
235 <profileActive>zq-release</profileActive>
236 <subPath>jgjf</subPath>
237 </properties>
238 </profile>
239 <profile>
240 <id>zq-production-daop-project</id>
241 <properties>
242 <profileActive>zq-release</profileActive>
243 <subPath>project</subPath>
244 </properties>
245 </profile>
210 </profiles> 246 </profiles>
211 247
212 </project> 248 </project>
......
1 server:
2 port: 19210
3 monitor:
4 log-white:
5 #服务全局名称
6 spring:
7 application:
8 name: ms-data-circulation-portal-service
9 jackson:
10 time-zone: Asia/Shanghai
11 cloud:
12 inetutils:
13 ignored-interfaces: docker0 # 让应用忽略docker0网卡
14 compatibility-verifier:
15 enabled: false
16 gateway:
17 gatewayServiceName: gateway-server
18 host: 114.115.131.96
19 kafka:
20 bootstrap-servers: kafka-cs-develop.daop:9092
21 producer:
22 retries: 3
23 main:
24 allow-bean-definition-overriding: true
25 datasource:
26 sql-script-encoding: utf-8
27 #type: org.apache.commons.dbcp2.BasicDataSource
28 #如果使用TCC事务这个type必须指定,否则会抛出: org.springframework.jdbc.CannotGetJdbcConnectionException: Failed to obtain JDBC Connection;
29 dynamic:
30 primary: master
31 druid:
32 initial-size: 0
33 max-active: 50
34 min-idle: 2
35 max-wait: -1
36 min-evictable-idle-time-millis: 30000
37 max-evictable-idle-time-millis: 30000
38 time-between-eviction-runs-millis: 0
39 validation-query: select 1
40 validation-query-timeout: -1
41 test-on-borrow: false
42 test-on-return: false
43 test-while-idle: true
44 pool-prepared-statements: true
45 # max-open-prepared-statements: 100
46 filters: stat,wall
47 share-prepared-statements: true
48 wall:
49 config:
50 condition-double-const-allow: true
51 condition-and-alway-true-allow: true
52 ##由mycat管理读写分离 不用代码控制(填写mycat的链接库)
53 datasource:
54 master:
55 url: jdbc:mysql://192.168.6.21:3306/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
56 username: sharding
57 password: dJ5xF7qC
58 driver-class-name: com.mysql.cj.jdbc.Driver
59 druid:
60 initial-size: 5
61 slave:
62 url: jdbc:mysql://192.168.6.21:3306/csbr_data_circulation_portal?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
63 username: sharding
64 password: dJ5xF7qC
65 driver-class-name: com.mysql.cj.jdbc.Driver
66 druid:
67 initial-size: 5
68 # redis配置
69 data:
70 redis:
71 # 集群
72 #cluster:
73 # nodes: redis-service.redis:6379
74 # 单节点
75 #host: redis-service.daop
76 #port: 6379
77 #password: "J7e411m693cA9"
78 timeout: 1000
79 prefix: daop-release
80 jedis:
81 pool:
82 max-idle: 8
83 max-wait: 2000
84 min-idle: 0
85 max-active: 100
86 test-on-borrow: true
87 test-while-idle: true
88 sql:
89 init:
90 schema-locations: classpath*:init.sql
91 encoding: UTF-8
92 mode: never
93 redisson:
94 address: redis://redis-service.daop:6379
95 password: "J7e411m693cA9"
96
97 seata:
98 enabled: true # 1.0新特性,需要依赖seata-spring-boot-starter,默认为true
99 tx-service-group: my_test_tx_group
100 application-id: ms-data-circulation-portal-service
101 registry:
102 type: nacos
103 nacos:
104 application: seata-server
105 cluster: seata-cluster
106 server-addr: nacos-cluster-service-develop.nacos-cluster:8848
107 password: U9u457p155vH@8
108 username: nacos
109 namespace: daop-lt
110 group: release
111 service:
112 vgroupMapping:
113 my_test_tx_group: seata-cluster
114 grouplist:
115 default: ms-daop-seata-service-release:8091
116
117 #数据库字段开启驼峰
118 mybatis:
119 configuration:
120 map-underscore-to-camel-case: true
121 callSettersOnNulls: true
122 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
123 mybatis-plus:
124 global-config:
125 db-config:
126 id-type: ASSIGN_UUID
127 logic-delete-value: "null"
128 logic-not-delete-value: N
129 mapper-locations: classpath*:mapper/**/*Mapper.xml
130 type-aliases-package: com.csbr.qingcloud.common.mybatis
131 ##生产环境屏蔽此配置 优化性能
132 configuration:
133 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
134 pagehelper:
135 helperDialect: mysql
136 reasonable: true
137 supportMethodsArguments: true
138 params: count=countSql
139
140 csbr:
141 kafka:
142 topic-prefix: DAOP-LT-RELEASE
143 consumer:
144 # 开启kafka消费者
145 enable: true
146 # kafka 服务集群地址,格式:HOST:PORT ,用逗号隔开
147 # bootstrap-servers: 210.12.100.201:9092
148 bootstrap-servers: kafka-cs-develop.daop:9092
149 # bootstrap-servers: 192.168.3.120:9092
150 # 是否启用自动提交 offset
151 enable-auto-commit: false
152 # 自动提交间隔时间(MS),仅在自动提交开启时有效
153 auto-commit-interval: 100
154 # 自动重置 offset。 latest:从最后开始,earliest: 从 offset 为 0 开始
155 auto-offset-reset: latest
156 # 消息 key 的反序列化方法
157 key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
158 # 消息 value 的反序列化方法
159 value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
160 # listener 开启的线程数
161 concurrency: 2
162 # session 超时时间
163 session-timeout: 60000
164 # 最大 poll 消息间隔时间,如果处理时间过长会导致异常
165 max-poll-interval: 10000
166 # 最大 poll 消息数量
167 max-poll-records: 2
168 producer:
169 # 开启kafka生产者
170 enable: true
171 # kafka 服务集群地址,格式:HOST:PORT ,多地址用逗号隔开
172 # bootstrap-servers: 210.12.100.201:9092
173 bootstrap-servers: kafka-cs-develop.daop:9092
174 # bootstrap-servers: 192.168.3.120:9092
175 # 失败后的重发次数
176 retries: 0
177 # 一次最多发送的数据量
178 batch-size: 4096
179 # 32M批处理缓冲区
180 buffer-memory: 33554432
181 # 生产者生产消息间隔,数值越大,间隔越长,用来减缓消费压力
182 linger: 1
183 feign:
184 hystrix:
185 enabled: false
186
187 query-limit:
188 white: TrTaskValid
189
1 spring:
2 application:
3 name: ms-data-circulation-portal-service
4 cloud:
5 nacos:
6 #配置中心
7 config:
8 server-addr: nacos-cluster-service.nacos-cluster:8848
9 file-extension: yaml
10 group: zq-release
11 namespace: daop-lt
12 # 开启nacos自动刷新,如果这个配置没有或者为false会导致配置不能自动刷新(auto-refresh、enable-remote-sync-config两者缺一不可)
13 auto-refresh: true
14 # 允许nacos服务端向本地同步配置
15 enable-remote-sync-config: true
16 #注册中心
17 discovery:
18 enabled: true
19 server-addr: nacos-cluster-service.nacos-cluster:8848
20 group: zq-release
21 namespace: daop-lt
22 metadata:
23 code: "004"
24 user:
25 name: nacos
26 password: nacos
27 management:
28 context-path: /actuator
29 #接口限流
30 sentinel:
31 transport:
32 # port: 7777
33 dashboard: sentinel-service.nacos-cluster:8858
34 #取消懒加载
35 eager: true
36 management:
37 endpoint:
38 health:
39 show-details: always
40 endpoints:
41 web:
42 exposure:
43 include: '*'
44 ###暂时禁用rabbit的健康检查
45 health:
46 rabbit:
47 enabled: false
48 sentinel:
49 enabled: false
50 feign:
51 sentinel:
52 enabled: true
...\ No newline at end of file ...\ No newline at end of file
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!