diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 13d4a4e..f95183c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,16 @@ server: servlet: context-path: / +seata: + service: + vgroup-mapping: + biz-service-ebtp-project-service-group: default + grouplist: + default: 10.242.37.148:18035 + # 对应 apollo 配置中心的应用名 app: - id: biz-service-ebtp-project-dev + id: biz-service-ebtp-project # Apollo 配置信息 apollo: @@ -16,20 +23,13 @@ apollo: eagerLoad: enabled: true -seata: - service: - vgroup-mapping: - biz-service-ebtp-project-dev-service-group: default - grouplist: - default: 10.242.37.148:18035 - spring: aop: auto: true #开启spring的aop配置 proxy-target-class: true application: - name: biz-service-ebtp-project-dev + name: biz-service-ebtp-project shardingsphere: datasource: @@ -99,12 +99,12 @@ spring: eureka: client: service-url: - defaultZone: http://10.242.37.148:5001/eureka + defaultZone: http://eureka-1-svc:8080/eureka, http://eureka-2-svc:8080/eureka, http://eureka-3-svc:8080/eureka instance: prefer-ip-address: true - ip-address: 125.32.114.204 - hostname: 125.32.114.204 - instance-ip: 125.32.114.204:${server.port} + instance-id: http://10.242.37.148:${server.port} + # 这是客户端的注册地址， eureka 会通过这个地址建立管道 + ip-address: 10.242.37.148 mybatis-plus: configuration: @@ -112,7 +112,7 @@ mybatis-plus: map-underscore-to-camel-case: true auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 @@ -152,17 +152,17 @@ mconfig: service-name-purp: mall-purp #采购系统委托项目微服务 service-name-wfap: mall-wfap #重新评审 流程微服务 service-name-resu: mall-resu #重新评审 项目中心查询服务 - service-price-query : biz-service-price-query #商城询价服务 + service-price-query: biz-service-price-query #商城询价服务 service-price-usercenter: core-service-usercenter-public #用户中心服务 #内部服务 service-name-archive: biz-service-ebtp-archive #归档服务 service-name-auction: biz-service-ebtp-auction #竞拍服务API service-name-calibration: biz-service-ebtp-calibration #标段定标接口 - service-name-bid: biz-service-ebtp-bid #标段出始化流程 - service-name-process: biz-service-ebtp-process #标段出始化流程 - service-name-resps : biz-service-ebtp-resps #标段应答文件 - service-name-rsms : biz-service-ebtp-rsms #评审微服务 - service-name-tender : biz-service-ebtp-tender #标段投标微服务 + service-name-bid: biz-service-ebtp-bid #标段出始化流程 + service-name-process: biz-service-ebtp-process #标段出始化流程 + service-name-resps: biz-service-ebtp-resps #标段应答文件 + service-name-rsms: biz-service-ebtp-rsms #评审微服务 + service-name-tender: biz-service-ebtp-tender #标段投标微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 @@ -174,4 +174,4 @@ management: include: "*" cors: allowed-origins: "*" - allowed-methods: "*" + allowed-methods: "*" \ No newline at end of file diff --git a/src/main/resources/application-master.yml b/src/main/resources/application-master.yml index 52da35b..d431f82 100644 --- a/src/main/resources/application-master.yml +++ b/src/main/resources/application-master.yml @@ -2,7 +2,7 @@ server: port: 18012 servlet: context-path: / - + seata: service: vgroup-mapping: @@ -11,11 +11,11 @@ seata: type: eureka eureka: serviceUrl: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka - + # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project - + # Apollo 配置信息 apollo: meta: http://10.238.25.112:6001/ @@ -24,15 +24,15 @@ apollo: enabled: true eagerLoad: enabled: true - + spring: aop: auto: true #开启spring的aop配置 proxy-target-class: true - + application: name: biz-service-ebtp-project - + shardingsphere: datasource: names: ds0 @@ -66,21 +66,21 @@ spring: time-zone: GMT+8 serialization: write-dates-as-timestamps: false - + # 天宫Kafka增加了安全认证，需要配置安全属性 kafka: bootstrap-servers: 10.172.48.110:32050,10.172.48.109:32050,10.172.48.111:32050 template: default-topic: jl_eshop - + # 生产者配置参数 producer: client-id: core-service-ebtp-crypt - properties: + properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; - + # 消费者配置参数 consumer: group-id: core-service-ebtp-crypt-consumer @@ -89,7 +89,7 @@ spring: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; - + # 生产区 redis 配置 redis: sentinel: @@ -120,7 +120,7 @@ mybatis-plus: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 type-aliases-package: com.chinaunicom.mall.ebtp.project - + hystrix: command: default: @@ -134,13 +134,13 @@ hystrix: circuitBreaker: sleepWindowInMilliseconds: 20000 forceClosed: true - + ribbon: ReadTimeout: 20000 #请求处理的超时时间 ConnectTimeout: 20000 #请求连接超时时间 MaxAutoRetries: 0 #对当前实例的重试次数 MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 - + mconfig: swagger-ui-open: true exception-handle-enabled: true @@ -164,7 +164,7 @@ mconfig: service-name-tender: biz-service-ebtp-tender #标段投标微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 - + # 用户暴露给 prometheus 的健康数据 management: endpoints: diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 6925480..6c11231 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -41,8 +41,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 0d25893..80afb70 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -2,7 +2,7 @@ server: port: 18012 servlet: context-path: / - + seata: service: vgroup-mapping: @@ -11,11 +11,11 @@ seata: type: eureka eureka: serviceUrl: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka - + # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project - + # Apollo 配置信息 apollo: meta: http://apollo-configservice:8080/ @@ -24,15 +24,15 @@ apollo: enabled: true eagerLoad: enabled: true - + spring: aop: auto: true #开启spring的aop配置 proxy-target-class: true - + application: name: biz-service-ebtp-project - + shardingsphere: datasource: names: ds0 @@ -41,8 +41,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - jdbc-url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true + url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 @@ -66,21 +66,21 @@ spring: time-zone: GMT+8 serialization: write-dates-as-timestamps: false - + # 天宫Kafka增加了安全认证，需要配置安全属性 kafka: bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005 template: default-topic: jl_test - + # 生产者配置参数 producer: client-id: core-service-ebtp-crypt - properties: + properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - + # 消费者配置参数 consumer: group-id: core-service-ebtp-crypt-consumer @@ -89,7 +89,7 @@ spring: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - + # 天宫 redis 需要使用哨兵进行访问 redis: sentinel: @@ -121,7 +121,7 @@ mybatis-plus: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 type-aliases-package: com.chinaunicom.mall.ebtp.project - + hystrix: command: default: @@ -135,13 +135,13 @@ hystrix: circuitBreaker: sleepWindowInMilliseconds: 200000 forceClosed: true - + ribbon: ReadTimeout: 200000 #请求处理的超时时间 ConnectTimeout: 200000 #请求连接超时时间 MaxAutoRetries: 0 #对当前实例的重试次数 MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 - + mconfig: swagger-ui-open: true exception-handle-enabled: true @@ -165,7 +165,7 @@ mconfig: service-name-tender: biz-service-ebtp-tender #标段投标微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 - + # 用户暴露给 prometheus 的健康数据 management: endpoints: @@ -174,5 +174,4 @@ management: include: "*" cors: allowed-origins: "*" - allowed-methods: "*" - \ No newline at end of file + allowed-methods: "*" \ No newline at end of file