diff --git a/Dockerfile-test b/Dockerfile-dev similarity index 71% rename from Dockerfile-test rename to Dockerfile-dev index 7267f32..90379de 100644 --- a/Dockerfile-test +++ b/Dockerfile-dev @@ -4,4 +4,4 @@ ENV LANG=zh_CN.utf8 ENV LANGUAGE=zh_CN.utf8 RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] diff --git a/Dockerfile-gz b/Dockerfile-gz deleted file mode 100644 index abe3ef6..0000000 --- a/Dockerfile-gz +++ /dev/null @@ -1,7 +0,0 @@ -FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 -ENV LC_ALL=zh_CN.utf8 -ENV LANG=zh_CN.utf8 -ENV LANGUAGE=zh_CN.utf8 -RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 -ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] diff --git a/Dockerfile-pro b/Dockerfile-master similarity index 100% rename from Dockerfile-pro rename to Dockerfile-master diff --git a/Dockerfile-sim b/Dockerfile-sim new file mode 100644 index 0000000..468a525 --- /dev/null +++ b/Dockerfile-sim @@ -0,0 +1,2 @@ +FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6 +ADD target/biz_service_ebtp_project-0.0.1.jar /app.jar \ No newline at end of file diff --git a/Dockerfile-uat b/Dockerfile-uat new file mode 100644 index 0000000..3559981 --- /dev/null +++ b/Dockerfile-uat @@ -0,0 +1,7 @@ +FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6 +ENV LC_ALL=zh_CN.utf8 +ENV LANG=zh_CN.utf8 +ENV LANGUAGE=zh_CN.utf8 +RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 +ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file diff --git a/config-test b/config-dev similarity index 100% rename from config-test rename to config-dev diff --git a/config-pro b/config-master similarity index 100% rename from config-pro rename to config-master diff --git a/config-sim b/config-sim new file mode 100644 index 0000000..cfa151b --- /dev/null +++ b/config-sim @@ -0,0 +1,17 @@ +apiVersion: v1 +clusters: +- cluster: + insecure-skip-tls-verify: true + server: https://10.172.48.16:44039 + name: demok8s +contexts: +- context: + cluster: demok8s + user: cluster-admin + name: default +current-context: default +kind: Config +users: +- name: cluster-admin + user: + token: 2c00232d4e3b1498008315e8ab14283c diff --git a/config-gz b/config-uat similarity index 100% rename from config-gz rename to config-uat diff --git a/deployment-test.yaml b/deployment-dev.yaml similarity index 89% rename from deployment-test.yaml rename to deployment-dev.yaml index 312372a..c318bb1 100644 --- a/deployment-test.yaml +++ b/deployment-dev.yaml @@ -47,10 +47,16 @@ spec: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE value: http://10.242.37.148:6001 + - name: APP_NAME + value: biz_service_ebtp_project_dev - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES value: skywalking-oap-cluster.skywalking:11800 - name: SW_AGENT_NAME value: biz-service-ebtp-project + - name: MY_POD_IP #自动获取pod ip作为agent id + valueFrom: + fieldRef: + fieldPath: status.podIP --- kind: Service apiVersion: v1 diff --git a/pro.yaml b/deployment-master.yaml similarity index 97% rename from pro.yaml rename to deployment-master.yaml index f83d8fa..9da7ad8 100644 --- a/pro.yaml +++ b/deployment-master.yaml @@ -41,7 +41,7 @@ spec: containers: - name: biz-service-ebtp-project #[6] 必选，容器名称，可填写微服务名称 image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-project:latest #[7] 镜像名称，请把biz-service-ebtp-project替换为服务名称 - args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-Dspring.profiles.active=pro", "-jar", "/app.jar"] + args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"] volumeMounts: - name: log mountPath: /log @@ -75,7 +75,7 @@ spec: memory: 6Gi env: - name: APP_NAME - value: biz_ebtp_project + value: biz_service_ebtp_project_master - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE diff --git a/deployment-sim.yaml b/deployment-sim.yaml index 2ffddf3..791e4f0 100644 --- a/deployment-sim.yaml +++ b/deployment-sim.yaml @@ -41,7 +41,7 @@ spec: containers: - name: biz-service-ebtp-project #[6] 必选，容器名称，可填写微服务名称 image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-project:latest #[7] 镜像名称，请把biz-service-ebtp-project替换为服务名称 - args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-Dspring.profiles.active=sim", "-jar", "/app.jar"] + args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"] volumeMounts: - name: log mountPath: /log @@ -75,7 +75,7 @@ spec: memory: 6Gi env: - name: APP_NAME - value: biz_ebtp_project + value: biz_ebtp_project_sim - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE diff --git a/deployment-gz.yaml b/deployment-uat.yaml similarity index 80% rename from deployment-gz.yaml rename to deployment-uat.yaml index f9c757e..8e478cd 100644 --- a/deployment-gz.yaml +++ b/deployment-uat.yaml @@ -53,15 +53,31 @@ spec: # 需要暴露的端口库号列表 ports: - containerPort: 18012 + resources: + requests: + cpu: 2000m + memory: 4Gi + limits: + cpu: 4000m + memory: 8Gi # 容器运行前需设置的环境变量列表 env: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE value: http://apollo-configservice:8080 + - name: APP_NAME + value: biz_service_ebtp_project_uat - name: MY_POD_IP #自动获取pod ip作为agent id valueFrom: fieldRef: fieldPath: status.podIP + - name: JAVA_TOOL_OPTIONS + value: -XX:+UnlockExperimentalVMOptions + -XX:+UseContainerSupport + -XX:+UseCGroupMemoryLimitForHeap + -XX:InitialRAMPercentage=40.0 + -XX:MinRAMPercentage=20.0 + -XX:MaxRAMPercentage=80.0 --- kind: Service apiVersion: v1 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java index 53396ca..d37cccf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.project; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; +import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import io.micrometer.core.instrument.MeterRegistry; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; @@ -19,6 +20,7 @@ import org.springframework.context.annotation.ComponentScan; }) @EnableFeignClients @EnableEurekaClient +@EnableApolloConfig @MapperScan({"com.chinaunicom.mall.ebtp.project.**.dao"}) @ComponentScan("com.chinaunicom.mall.ebtp.*") public class BizServiceEbtpProjectApplication { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index d78b532..c5eae99 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -235,7 +235,6 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl> selectListByChart(@ApiParam(value = "主键id集合", required = true) @RequestBody List sectionIds){ + + return BaseResponse.success(projectSectionService.selectListByChart(sectionIds)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java index 9a67376..73bfa5f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java @@ -66,4 +66,11 @@ public interface ProjectSectionMapper extends IBaseMapper { * @return 返回结果 */ List selectArchiveById(@Param(value = "section") ProjectSectionVO projectSection); + + /** + * 查询统计标段信息直接回显字典值 + * @param sectionIds 标段ID集合 + * @return 返回结果 + */ + List selectListByChart(@Param(value = "sectionIds") List sectionIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml index 4dd2800..fdae6d3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml @@ -31,7 +31,6 @@ - @@ -76,7 +75,6 @@ - @@ -192,4 +190,24 @@ + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java index de3d282..c4dad74 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java @@ -104,4 +104,16 @@ public class ProjectSectionVO extends ProjectSection implements Serializable { @ApiModelProperty(value = "当前环节数") private Integer currentLink; + + @ApiModelProperty(value = "所属机构") + private String tendereeOrgName; + + @ApiModelProperty(value = "所属省份名称") + private String province; + + @ApiModelProperty(value = "当前环节字典回显") + private String businessModuleValue; + + @ApiModelProperty(value = "采购方式字典回显") + private String bidMethodDictValue; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java index fb86107..f5115e0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java @@ -201,4 +201,11 @@ public interface IProjectSectionService extends IBaseService{ * @return 返回业务流程 */ Integer getMaxBusinessModule(String projectId); + + /** + * 提供报表查询标段接口（西延专用） + * @param sectionIds 标段ID集合 + * @return 返回结果 + */ + List selectListByChart(List sectionIds); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 296ba6a..78ffb41 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -14,6 +14,8 @@ import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; +import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; +import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService; import com.chinaunicom.mall.ebtp.project.dictchooseprocess.entity.DictChooseProcess; import com.chinaunicom.mall.ebtp.project.dictchooseprocess.service.IDictChooseProcessService; import com.chinaunicom.mall.ebtp.project.feign.EbtpArchiveApi; @@ -81,6 +83,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectListByChart(List sectionIds) { + + List dictProjectList = dictProjectService.list(); + Map dictMap = dictProjectList.stream().collect(Collectors.toMap(key -> key.getParentType()+"_"+key.getCode(),dict -> dict)); + + List sectionVOList = projectSectionMapper.selectListByChart(sectionIds); + sectionVOList.forEach(n -> { + n.setBusinessModuleValue(dictMap.get("business_module="+n.getBidMethodDict()+"_"+n.getBusinessModule()).getDicName()); + n.setBidMethodDictValue(dictMap.get("procurement_mode=entrust"+"_"+n.getBidMethodDict()).getDicName()); + }); + + return sectionVOList; + } + /** * 拼装标段模块修改流程实体并插入数据 * @param sectionId 标段ID diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-dev.yml similarity index 94% rename from src/main/resources/application-test.yml rename to src/main/resources/application-dev.yml index ce375c5..f95183c 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-dev.yml @@ -2,18 +2,18 @@ server: port: 18012 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 - + # Apollo 配置信息 apollo: meta: http://10.242.37.148:6001/ @@ -22,15 +22,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 @@ -39,8 +39,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.26: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.26: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.26: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 @@ -64,22 +64,22 @@ spring: time-zone: GMT+8 serialization: write-dates-as-timestamps: false - - # 天宫Kafka增加了安全认证，需要配置安全属性 + + # 天宫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 auto-offset-reset: latest @@ -87,7 +87,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: @@ -105,7 +105,7 @@ eureka: instance-id: http://10.242.37.148:${server.port} # 这是客户端的注册地址， eureka 会通过这个地址建立管道 ip-address: 10.242.37.148 - + mybatis-plus: configuration: # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 @@ -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: 20000 forceClosed: true - + ribbon: ReadTimeout: 20000 #请求处理的超时时间 ConnectTimeout: 20000 #请求连接超时时间 MaxAutoRetries: 0 #对当前实例的重试次数 MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 - + mconfig: swagger-ui-open: true exception-handle-enabled: true @@ -165,8 +165,8 @@ mconfig: service-name-tender: biz-service-ebtp-tender #标段投标微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 - -# 用户暴露给 prometheus 的健康数据 + +# 用户暴露给 prometheus 的健康数据 management: endpoints: web: @@ -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 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index bbff1e0..17bd30e 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -39,8 +39,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.26: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.26: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.26: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 @@ -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: # 逻辑删除配置 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-master.yml similarity index 97% rename from src/main/resources/application-pro.yml rename to src/main/resources/application-master.yml index a138ee3..d431f82 100644 --- a/src/main/resources/application-pro.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 @@ -41,8 +41,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: profilb password: ProdMall3_0118profilb - jdbc-url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true + url: jdbc:mysql://10.168.9.36: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.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 2e7eb5b..6c11231 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -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.242.31.54:6001 @@ -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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..24e0216 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,14 @@ -spring: - profiles: - active: uat \ No newline at end of file +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-project + +# Apollo 配置信息 +apollo: + bootstrap: + enabled: true + namespace: application +# +#spring: +# profiles: +# active: test + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index d947716..0f35ed8 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + ${logback.appname}