From 75379d81ef5bb80949532a6e9981ad7dfc78eea6 Mon Sep 17 00:00:00 2001 From: dxc Date: Fri, 14 May 2021 16:25:43 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=91=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=90=AF=E5=8A=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-gz b/Dockerfile-gz index abe3ef6..cb28f47 100644 --- a/Dockerfile-gz +++ b/Dockerfile-gz @@ -1,7 +1,7 @@ -FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 +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", "-Dspring.profiles.active=uat", "-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=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file From d8259d3e8eefa57a3968a8abea07257a617ff93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=9A=93=E6=98=B1?= Date: Sat, 15 May 2021 14:27:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CPU=E5=86=85=E5=AD=98?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=99=90=E5=88=B6=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=83=A8=E7=BD=B2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-gz.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/deployment-gz.yaml b/deployment-gz.yaml index f9c757e..0bebba9 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -53,6 +53,13 @@ spec: # 需要暴露的端口库号列表 ports: - containerPort: 18012 + resources: + requests: + cpu: 2000m + memory: 4Gi + limits: + cpu: 4000m + memory: 8Gi # 容器运行前需设置的环境变量列表 env: # Apollo 配置中心变量设置 @@ -62,6 +69,13 @@ spec: 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 From 40731886c730ad94d205f7daf51f019303d864fe Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 18 May 2021 09:48:13 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6=E4=BF=9D=E7=95=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 43133e4..d5fccaa 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -27,7 +27,7 @@ ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log - 90 + 3 true From 491194c5efc7bc491e2308a388014ae1b59f590c Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 18 May 2021 14:45:19 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-pro.yml | 1 + src/main/resources/application-test.yml | 1 + src/main/resources/application-uat.yml | 1 + src/main/resources/logback.xml | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index a138ee3..c1a35a3 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -15,6 +15,7 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project + name: biz_service_ebtp_project_pro # Apollo 配置信息 apollo: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index ce375c5..0538a7c 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -13,6 +13,7 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project + name: biz_service_ebtp_project_test # Apollo 配置信息 apollo: diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 0d25893..03cb119 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -15,6 +15,7 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project + name: biz_service_ebtp_project_uat # Apollo 配置信息 apollo: diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index d5fccaa..a58ecc3 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,8 +1,8 @@ - + - + ${logback.appname} From 1cf48172ad496884cf25956d7d7c7eb3ec715245 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 18 May 2021 16:20:55 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-gz.yaml | 2 ++ deployment-test.yaml | 2 ++ pro.yaml | 2 ++ src/main/resources/application-pro.yml | 1 - src/main/resources/application-test.yml | 1 - src/main/resources/application-uat.yml | 1 - src/main/resources/logback.xml | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/deployment-gz.yaml b/deployment-gz.yaml index 0bebba9..8e478cd 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -65,6 +65,8 @@ spec: # 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: diff --git a/deployment-test.yaml b/deployment-test.yaml index 312372a..1babf28 100644 --- a/deployment-test.yaml +++ b/deployment-test.yaml @@ -47,6 +47,8 @@ spec: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE value: http://10.242.37.148:6001 + - name: APP_NAME + value: biz_service_ebtp_project_test - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES value: skywalking-oap-cluster.skywalking:11800 - name: SW_AGENT_NAME diff --git a/pro.yaml b/pro.yaml index 3b48a80..b3becef 100644 --- a/pro.yaml +++ b/pro.yaml @@ -80,6 +80,8 @@ spec: value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE value: http://apollo-configservice:8080 + - name: APP_NAME + value: biz_service_ebtp_project_pro - name: MY_POD_IP valueFrom: fieldRef: diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index c1a35a3..a138ee3 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -15,7 +15,6 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project - name: biz_service_ebtp_project_pro # Apollo 配置信息 apollo: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 0538a7c..ce375c5 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -13,7 +13,6 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project - name: biz_service_ebtp_project_test # Apollo 配置信息 apollo: diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 03cb119..0d25893 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -15,7 +15,6 @@ seata: # 对应 apollo 配置中心的应用名 app: id: biz-service-ebtp-project - name: biz_service_ebtp_project_uat # Apollo 配置信息 apollo: diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index a58ecc3..5ea9279 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,6 +1,6 @@ - + From d2a2434db44b4891c13c45dc2cb0cbe0a96a4dfd Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 19 May 2021 08:54:53 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pro.yaml b/pro.yaml index b3becef..10a1287 100644 --- a/pro.yaml +++ b/pro.yaml @@ -75,13 +75,11 @@ spec: memory: 6Gi env: - name: APP_NAME - value: biz_ebtp_project + value: biz_ebtp_project_pro - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE value: http://apollo-configservice:8080 - - name: APP_NAME - value: biz_service_ebtp_project_pro - name: MY_POD_IP valueFrom: fieldRef: From c19767b965d65ce759ed01cc2af69ef9db6b6d49 Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 19 May 2021 09:00:03 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pro.yaml b/pro.yaml index 10a1287..882e606 100644 --- a/pro.yaml +++ b/pro.yaml @@ -75,7 +75,7 @@ spec: memory: 6Gi env: - name: APP_NAME - value: biz_ebtp_project_pro + value: biz_service_ebtp_project_pro - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE From 88431bde7ed43777c2dfc4fc5fcc902dfaf19cad Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 20 May 2021 08:23:09 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A5=BF=E5=BB=B6?= =?UTF-8?q?=E6=A0=87=E6=AE=B5=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectRecordServiceImpl.java | 1 - .../controller/ProjectSectionController.java | 12 ++++++++++ .../dao/ProjectSectionMapper.java | 7 ++++++ .../dao/mapper/ProjectSectionMapper.xml | 22 +++++++++++++++++-- .../entity/ProjectSectionVO.java | 12 ++++++++++ .../service/IProjectSectionService.java | 7 ++++++ .../impl/ProjectSectionServiceImpl.java | 20 +++++++++++++++++ src/main/resources/application-local.yml | 2 +- 8 files changed, 79 insertions(+), 4 deletions(-) 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-local.yml b/src/main/resources/application-local.yml index bbff1e0..dcf610d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -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: # 逻辑删除配置 From 4af54583631f95e363c54c731065645dd14ddb60 Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 24 May 2021 09:33:18 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 4 ++-- src/main/resources/application-pro.yml | 4 ++-- src/main/resources/application-test.yml | 4 ++-- src/main/resources/application-uat.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index dcf610d..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 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index a138ee3..52da35b 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -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 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index ce375c5..8bcf108 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.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 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 0d25893..dd75844 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.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.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 From c3b9238d6df8a1a9ed1500785a418cc1d0c133af Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 14:09:24 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-gz => Dockerfile-dev | 2 +- Dockerfile-pro => Dockerfile-master | 0 Dockerfile-sim | 2 + Dockerfile-test | 2 +- config-test => config-dev | 0 config-pro => config-master | 0 config-sim | 17 ++ config-gz => config-uat | 0 deployment-test.yaml => deployment-dev.yaml | 6 +- pro.yaml => deployment-master.yaml | 4 +- deployment-sim.yaml | 114 ++++++++++++ deployment-gz.yaml => deployment-uat.yaml | 0 .../BizServiceEbtpProjectApplication.java | 2 + ...plication-test.yml => application-dev.yml} | 77 ++++---- ...ication-pro.yml => application-master.yml} | 0 src/main/resources/application-sim.yml | 176 ++++++++++++++++++ src/main/resources/application-uat.yml | 4 +- src/main/resources/application.yml | 17 +- 18 files changed, 374 insertions(+), 49 deletions(-) rename Dockerfile-gz => Dockerfile-dev (57%) rename Dockerfile-pro => Dockerfile-master (100%) create mode 100644 Dockerfile-sim rename config-test => config-dev (100%) rename config-pro => config-master (100%) create mode 100644 config-sim rename config-gz => config-uat (100%) rename deployment-test.yaml => deployment-dev.yaml (91%) rename pro.yaml => deployment-master.yaml (97%) create mode 100644 deployment-sim.yaml rename deployment-gz.yaml => deployment-uat.yaml (100%) rename src/main/resources/{application-test.yml => application-dev.yml} (82%) rename src/main/resources/{application-pro.yml => application-master.yml} (100%) create mode 100644 src/main/resources/application-sim.yml diff --git a/Dockerfile-gz b/Dockerfile-dev similarity index 57% rename from Dockerfile-gz rename to Dockerfile-dev index cb28f47..7267f32 100644 --- a/Dockerfile-gz +++ 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=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file +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"] 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..c0f9f42 --- /dev/null +++ b/Dockerfile-sim @@ -0,0 +1,2 @@ +FROM harbor.dcos.xixian.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-test b/Dockerfile-test index 7267f32..cb28f47 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -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", "-Dspring.profiles.active=uat", "-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 91% rename from deployment-test.yaml rename to deployment-dev.yaml index 1babf28..0a59cf4 100644 --- a/deployment-test.yaml +++ b/deployment-dev.yaml @@ -48,11 +48,15 @@ spec: - name: APOLLO_CONFIGSERVICE value: http://10.242.37.148:6001 - name: APP_NAME - value: biz_service_ebtp_project_test + 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 + 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 882e606..6a5ec81 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_service_ebtp_project_pro + value: biz_service_ebtp_project_master - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE diff --git a/deployment-sim.yaml b/deployment-sim.yaml new file mode 100644 index 0000000..7ae3b0f --- /dev/null +++ b/deployment-sim.yaml @@ -0,0 +1,114 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: biz-service-ebtp-project #[1] Deployment名称，可填写微服务名称 + namespace: default + labels: + app: biz-service-ebtp-project + +spec: + replicas: 3 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + selector: + matchLabels: + app: biz-service-ebtp-project #[2] 选择器匹配时标签名称，可填写微服务名称 + template: + metadata: + labels: + app: biz-service-ebtp-project #[3] 模板名称，可填写微服务名称 + annotations: + prometheus.io/port: '18012' + prometheus.io/jl-pod: 'true' + spec: + volumes: + - name: log + persistentVolumeClaim: + claimName: log-pvc + readOnly: false + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - biz-service-ebtp-project + topologyKey: "kubernetes.io/hostname" + 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)", "-jar", "/app.jar"] + volumeMounts: + - name: log + mountPath: /log + ports: + - containerPort: 18012 #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同 +# livenessProbe: +# failureThreshold: 3 +# httpGet: +# port: 18012 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# initialDelaySeconds: 300 +# periodSeconds: 60 +# successThreshold: 1 +# timeoutSeconds: 2 +# readinessProbe: +# failureThreshold: 1 +# httpGet: +# port: 18012 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# periodSeconds: 5 +# successThreshold: 2 +# timeoutSeconds: 2 + resources: + requests: + cpu: 1000m + memory: 2Gi + limits: + cpu: 3000m + memory: 6Gi + env: + - name: APP_NAME + value: biz_ebtp_project + - name: AGENT_LICENCE + value: 527BFA7B28577578 + - name: APOLLO_CONFIGSERVICE + value: http://apollo-configservice:8080 + - name: MY_POD_IP + 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 +metadata: + name: biz-service-ebtp-project-svc # [11] service的名字，格式为“服务名-svc” + namespace: default + labels: + service: biz-service-ebtp-project-svc # [12] service的标签，可与参数[11]相同 + annotations: + prometheus.io/port: '18012' #[13] prometheus自动发现service的端口，也是该微服务所使用的端口，与参数[4]相同 + prometheus.io/jl-svc: 'true' + +spec: + ports: + - port: 18012 #[15] 与参数4相同 + targetPort: 18012 #[16] 与参数4相同 + selector: + app: biz-service-ebtp-project #[17] 该service对应Deployment的名字，与参数[1]相同 +--- \ No newline at end of file diff --git a/deployment-gz.yaml b/deployment-uat.yaml similarity index 100% rename from deployment-gz.yaml rename to deployment-uat.yaml 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/resources/application-test.yml b/src/main/resources/application-dev.yml similarity index 82% rename from src/main/resources/application-test.yml rename to src/main/resources/application-dev.yml index 8bcf108..13d4a4e 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-dev.yml @@ -2,18 +2,11 @@ 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 - + id: biz-service-ebtp-project-dev + # Apollo 配置信息 apollo: meta: http://10.242.37.148:6001/ @@ -22,15 +15,22 @@ apollo: enabled: true 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 - + name: biz-service-ebtp-project-dev + shardingsphere: datasource: names: ds0 @@ -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: @@ -99,20 +99,20 @@ spring: eureka: client: service-url: - defaultZone: http://eureka-1-svc:8080/eureka, http://eureka-2-svc:8080/eureka, http://eureka-3-svc:8080/eureka + defaultZone: http://10.242.37.148:5001/eureka instance: prefer-ip-address: true - instance-id: http://10.242.37.148:${server.port} - # 这是客户端的注册地址， eureka 会通过这个地址建立管道 - ip-address: 10.242.37.148 - + ip-address: 125.32.114.204 + hostname: 125.32.114.204 + instance-ip: 125.32.114.204:${server.port} + mybatis-plus: configuration: # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 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: # 逻辑删除配置 @@ -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 @@ -152,21 +152,21 @@ 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: 标段重新评审审批单 - -# 用户暴露给 prometheus 的健康数据 + +# 用户暴露给 prometheus 的健康数据 management: endpoints: web: @@ -175,4 +175,3 @@ management: cors: allowed-origins: "*" allowed-methods: "*" - \ No newline at end of file diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-master.yml similarity index 100% rename from src/main/resources/application-pro.yml rename to src/main/resources/application-master.yml diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml new file mode 100644 index 0000000..6925480 --- /dev/null +++ b/src/main/resources/application-sim.yml @@ -0,0 +1,176 @@ +server: + port: 18012 + servlet: + context-path: / + +seata: + service: + vgroup-mapping: + biz-service-ebtp-project-service-group: seata-server-jl + registry: + 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 + bootstrap: + namespace: application + 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 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + 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 + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + props: + sql: + show: false + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + write-dates-as-timestamps: false + + # 天宫Kafka增加了安全认证，需要配置安全属性 + kafka: + bootstrap-servers: 10.125.164.24:32002,10.125.164.192:32096,10.125.164.89:32002 + template: + default-topic: jl_eshop + + # 生产者配置参数 + producer: + client-id: core-service-ebtp-crypt + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; + + # 消费者配置参数 + consumer: + group-id: core-service-ebtp-crypt-consumer + auto-offset-reset: latest + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; + + # 生产区 redis 配置 + redis: + sentinel: + master: eshop-redis-sim + nodes: 10.125.164.24:32510,10.125.164.90:32515,10.125.164.89:32516 + password: Unicom#135 + +# 天宫Eureka配置 +eureka: + client: + service-url: + defaultZone: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka + instance: + prefer-ip-address: true + instance-ip: ${spring.cloud.client.ip-address}:${server.port} + +mybatis-plus: + configuration: + # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 + map-underscore-to-camel-case: true + auto-mapping-behavior: full + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + global-config: + # 逻辑删除配置 + db-config: + logic-not-delete-value: normal # 逻辑删除标记：正常数据 + logic-delete-value: deleted # 逻辑删除标记：已删除的数据 + type-aliases-package: com.chinaunicom.mall.ebtp.project + +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + strategy: SEMAPHORE + thread: + timeoutInMilliseconds: 200000 #熔断超时时间 + circuitBreaker: + sleepWindowInMilliseconds: 20000 + forceClosed: true + +ribbon: + ReadTimeout: 20000 #请求处理的超时时间 + ConnectTimeout: 20000 #请求连接超时时间 + MaxAutoRetries: 0 #对当前实例的重试次数 + MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 + +mconfig: + swagger-ui-open: true + exception-handle-enabled: true + seata-open-enabled: false + work-id: 1 #终端ID + datacenter-id: 1 #数据中心ID + host-name: http://10.242.31.54/ + service-name-purp: mall-purp #采购系统委托项目微服务 + service-name-wfap: mall-wfap #重新评审 流程微服务 + service-name-resu: mall-resu #重新评审 项目中心查询服务 + 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 #标段投标微服务 + wfSectionNo: '080' + wfSectionName: 标段重新评审审批单 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" \ No newline at end of file diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index dd75844..0d25893 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.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.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 + 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 filters: stat,wall,log4j maxActive: 20 initialSize: 1 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..5a66e07 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-bid + +# Apollo 配置信息 +apollo: + bootstrap: + enabled: true + namespace: application +# +#spring: +# profiles: +# active: test + From eceef1812273a7e2a9f5253ff9277324d705296b Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 14:20:25 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 42 +++++++++++------------ src/main/resources/application-master.yml | 30 ++++++++-------- src/main/resources/application-sim.yml | 4 +-- src/main/resources/application-uat.yml | 37 ++++++++++---------- 4 files changed, 56 insertions(+), 57 deletions(-) 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 From 3efafeabf7d27e08bc466f2eba827408641cdf9c Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 14:44:22 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5a66e07..24e0216 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ # 对应 apollo 配置中心的应用名 app: - id: biz-service-ebtp-bid + id: biz-service-ebtp-project # Apollo 配置信息 apollo: From 260fae9fef1fd17b35774bea5495b04b89d48ee7 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 15:25:00 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-sim.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment-sim.yaml b/deployment-sim.yaml index 7ae3b0f..791e4f0 100644 --- a/deployment-sim.yaml +++ b/deployment-sim.yaml @@ -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 From 4057df5193fc14bb6bd3ab32d1180051b637949c Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 15:36:23 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-dev | 2 +- Dockerfile-sim | 2 +- Dockerfile-test => Dockerfile-uat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename Dockerfile-test => Dockerfile-uat (72%) diff --git a/Dockerfile-dev b/Dockerfile-dev index 7267f32..90379de 100644 --- a/Dockerfile-dev +++ 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-sim b/Dockerfile-sim index c0f9f42..468a525 100644 --- a/Dockerfile-sim +++ b/Dockerfile-sim @@ -1,2 +1,2 @@ -FROM harbor.dcos.xixian.unicom.local/eshop/jdk8_springboot_agent:v1.6 +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-test b/Dockerfile-uat similarity index 72% rename from Dockerfile-test rename to Dockerfile-uat index cb28f47..3559981 100644 --- a/Dockerfile-test +++ b/Dockerfile-uat @@ -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=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file +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 From 88d5ca2fc37b26af08f7bc3b7eb5f449cadffb4c Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 25 May 2021 17:08:26 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A5=E5=8F=8A=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment-dev.yaml b/deployment-dev.yaml index 0a59cf4..c318bb1 100644 --- a/deployment-dev.yaml +++ b/deployment-dev.yaml @@ -53,10 +53,10 @@ spec: value: skywalking-oap-cluster.skywalking:11800 - name: SW_AGENT_NAME value: biz-service-ebtp-project - - name: MY_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP + - name: MY_POD_IP #自动获取pod ip作为agent id + valueFrom: + fieldRef: + fieldPath: status.podIP --- kind: Service apiVersion: v1