From efe7fefcd36f2614ee0bc4222b0fd82dd8c814a2 Mon Sep 17 00:00:00 2001 From: zhangyx <1254353766@qq.com> Date: Tue, 23 Mar 2021 10:13:54 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 2 +- src/main/resources/application-pro.yml | 168 +++++++++++++++++++++++++ src/main/resources/application.yml | 2 +- 3 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/application-pro.yml diff --git a/pro.yaml b/pro.yaml index 46a432f..e46f9f9 100644 --- a/pro.yaml +++ b/pro.yaml @@ -84,7 +84,7 @@ metadata: labels: app: biz-service-ebtp-extend-svc # [12] service的标签，可与参数[11]相同 annotations: - lb.cke.tg.unicom/target-vports: 18018-18018 #[13] 内部端口-外部端口映射 内部端口为server.port，即与参数[4]相同 +# lb.cke.tg.unicom/target-vports: 18018-18018 #[13] 内部端口-外部端口映射 内部端口为server.port，即与参数[4]相同 prometheus.io/port: '18018' #[13] prometheus自动发现service的端口，也是该微服务所使用的端口，与参数[4]相同 prometheus.io/test-svc: 'true' #[14] 开启prometheus自动发现service的功能，自动发现所带标签为test-svc的service spec: diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml new file mode 100644 index 0000000..9b13b0e --- /dev/null +++ b/src/main/resources/application-pro.yml @@ -0,0 +1,168 @@ +server: + port: 18018 + servlet: + context-path: / + +seata: + service: + vgroup-mapping: + biz-service-ebtp-extend-service-group: default + + #registry: + # type: eureka + # eureka: + # serviceUrl: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + meta: http://10.238.25.112:6001/ + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true + +spring: + aop: + auto: true #开启spring的aop配置 + proxy-target-class: true + + application: + name: biz-service-ebtp-extend + + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: auction + password: root + jdbc-url: jdbc:mysql://10.168.9.242:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.168.9.242:3306/ebtp_mall_extend?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: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + 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_test + + # 生产者配置参数 + 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" 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" password="Unicom#135"; + + # 生产区 redis 配置 + redis: + sentinel: + master: eshop-redis + nodes: 10.172.48.83:32521,10.172.48.100:32521,10.172.48.94:32561 + 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-id: http://10.238.25.112:${server.port} + # 这是客户端的注册地址， eureka 会通过这个地址建立管道 + ip-address: 10.238.25.112 + +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-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic + logic-delete-value: deleted # 逻辑已删除值 + logic-not-delete-value: normal # 逻辑未删除值 + +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: + workerId: 1 + datacenterId: 1 + # 服务名 + feign: + name: + open: biz-service-ebtp-opening #开标大厅服务 + process: biz-service-ebtp-process #评审流程服务 + project: biz-service-ebtp-project #项目服务 + resps: biz-service-ebtp-resps #应答结构化服务 + rsms: biz-service-ebtp-rsms #评审结构化服务 + tender: biz-service-ebtp-tender #投标服务 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..fc3033b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: uat \ No newline at end of file + active: pro \ No newline at end of file From 190f0800fe5ec35c82d55a0ba29f03955d0a607c Mon Sep 17 00:00:00 2001 From: zhangyx <1254353766@qq.com> Date: Tue, 23 Mar 2021 10:41:30 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 9b13b0e..a376071 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -41,7 +41,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver username: auction - password: root + password: ProdMall3_0118auction jdbc-url: jdbc:mysql://10.168.9.242:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://10.168.9.242:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j From c60369fdaadeaac9239f60ebc3d31667e705e0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=93=B6=E9=9B=AA?= Date: Fri, 26 Mar 2021 10:01:33 +0800 Subject: [PATCH 03/28] Update application.yml --- 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 f2b90d5..fc3033b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: uat \ No newline at end of file + active: pro \ No newline at end of file From cca90d636fc05d01abf6a4de215144f27b13fec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 30 Mar 2021 14:28:53 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZjcnExportServiceImpl.java | 7 + src/main/resources/application-localpro.yml | 153 ++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 src/main/resources/application-localpro.yml diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java index a371716..080c789 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.export.service.impl; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; import com.chinaunicom.mall.ebtp.extend.export.service.ExportService; import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService; @@ -38,13 +39,19 @@ public class ZjcnExportServiceImpl implements ExportService { @SneakyThrows @Override public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) { + log.info("评标专家承诺书：{}", JsonUtils.objectToJson(param)); //文件模板从数据库或者项目位置取得 InputStream file = templateFileService.getExportTemplet("zjcn"); + log.info("获取模板：{}", file); XWPFTemplate template = XWPFTemplate.compile(file); + log.info("template：{}", template); String fileName = new String("评标专家承诺书.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + log.info("fileName：{}", fileName); OutputStream os = response.getOutputStream(); + response.setHeader("Content-disposition", "attachment; filename=" + fileName); + log.info("开始write"); template.write(os); } diff --git a/src/main/resources/application-localpro.yml b/src/main/resources/application-localpro.yml new file mode 100644 index 0000000..eb40af5 --- /dev/null +++ b/src/main/resources/application-localpro.yml @@ -0,0 +1,153 @@ +server: + port: 18003 + servlet: + context-path: / + +seata: + service: + vgroup-mapping: + biz-service-ebtp-extend-local-service-group: seata-server-jl + registry: + type: eureka + eureka: + serviceUrl: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/eureka + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + meta: http://10.238.25.112:6001/ + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true + +spring: + aop: + auto: true #开启spring的aop配置 + proxy-target-class: true + application: + name: biz-service-ebtp-extend-local + + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: auction + password: ProdMall3_0118auction + jdbc-url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?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: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + write-dates-as-timestamps: false + + # 生产区 redis 配置 + redis: + sentinel: + master: eshop-redis2 + nodes: 10.172.48.83:32521,10.172.48.100:32521,10.172.48.94:32561 + password: Unicom#135 + +# 天宫Eureka配置 +eureka: + client: + service-url: + defaultZone: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/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 # 逻辑删除标记：已删除的数据 + +feign: + httpclient: + enabled: false + okhttp: + enabled: true + client: + config: + default: + connect-timeout: 20000 + read-timeout: 20000 +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: + workerId: 1 + datacenterId: 1 + # 服务名 + feign: + name: + open: biz-service-ebtp-opening #开标大厅服务 + process: biz-service-ebtp-process #评审流程服务 + project: biz-service-ebtp-project #项目服务 + resps: biz-service-ebtp-resps #应答结构化服务 + rsms: biz-service-ebtp-rsms #评审结构化服务 + tender: biz-service-ebtp-tender #投标服务 + documentcenter: core-service-document-center #文档中心 +document: + clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" From a711b8de53727b4efe0f378381996d99daf6aee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8A=B9=E5=BD=AC?= Date: Thu, 8 Apr 2021 09:16:29 +0800 Subject: [PATCH 05/28] Update application.yml --- 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 fc3033b..f2b90d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: pro \ No newline at end of file + active: uat \ No newline at end of file From b70fc58282bc2f4f9dfc07d5fa6939e93ab0423d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8A=B9=E5=BD=AC?= Date: Thu, 8 Apr 2021 09:16:41 +0800 Subject: [PATCH 06/28] Update application.yml --- 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 fc3033b..f2b90d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: pro \ No newline at end of file + active: uat \ No newline at end of file From 42288fc004dcb2c535731c08cfab5ab653dce8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=9B=A6=E9=94=90?= Date: Sat, 10 Apr 2021 11:09:10 +0800 Subject: [PATCH 07/28] Update config-gz --- config-gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-gz b/config-gz index 6fe3b43..980e05b 100644 --- a/config-gz +++ b/config-gz @@ -2,7 +2,7 @@ apiVersion: v1 clusters: - cluster: insecure-skip-tls-verify: true - server: https://10.125.164.35:48662 + server: https://10.125.164.111:42733;https://10.125.164.158:41745;https://10.125.164.8:43001 name: demok8s contexts: - context: @@ -14,4 +14,4 @@ kind: Config users: - name: cluster-admin user: - token: df5e4896a4f6d1b1447b2584ca7405f7 + token: ae123cd22080c2712d08cb31633a2fa6 \ No newline at end of file From 4f3b72a2a1602c3ad2109ca8435c2aed531bc0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=9B=A6=E9=94=90?= Date: Sat, 10 Apr 2021 11:10:19 +0800 Subject: [PATCH 08/28] Update deployment-gz.yaml --- deployment-gz.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deployment-gz.yaml b/deployment-gz.yaml index 4d9e7d4..50b0f2d 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -57,7 +57,11 @@ spec: env: # Apollo 配置中心变量设置 - name: APOLLO_CONFIGSERVICE - value: http://10.242.31.158:6001 + value: http://apollo-configservice:8080 + - name: MY_POD_IP #自动获取pod ip作为agent id + valueFrom: + fieldRef: + fieldPath: status.podIP --- kind: Service apiVersion: v1 @@ -67,7 +71,7 @@ metadata: labels: app: biz-service-ebtp-extend annotations: - lb.cke.tg.unicom/target-vports: 18018-18018 + # lb.cke.tg.unicom/target-vports: 18018-18018 prometheus.io/port: '18018' prometheus.io/jl-svc: 'true' spec: From 832ce161d48610b1a5dc8fb108cbc90958d0da73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=9B=A6=E9=94=90?= Date: Sat, 10 Apr 2021 11:12:37 +0800 Subject: [PATCH 09/28] Update application-uat.yml --- src/main/resources/application-uat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index ed339c2..819b0ae 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -19,7 +19,7 @@ app: # Apollo 配置信息 apollo: - meta: http://10.242.31.158:6001/ + meta: http://apollo-configservice:8080 bootstrap: namespace: application enabled: true @@ -102,7 +102,7 @@ spring: eureka: client: service-url: - defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka + defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka instance: prefer-ip-address: true instance-id: http://10.242.31.158:${server.port} From eade35d0ca9d37fff4020ddef3a3a0d548055313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=9B=A6=E9=94=90?= Date: Sat, 10 Apr 2021 11:12:57 +0800 Subject: [PATCH 10/28] Update logback.xml --- src/main/resources/logback.xml | 50 ++++------------------------------ 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index ab31609..e1ea49f 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -11,33 +11,23 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50} - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n - - - - ERROR - - DENY - - ACCEPT - - ${logback.logdir}/info.${logback.appname}.log + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log - ${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log - 3 + 90 true @@ -46,44 +36,14 @@ UTF-8 - %d [%thread] %-5level %logger{64} %line - %msg%n - - - - - - - Error - - - ${logback.logdir}/error.${logback.appname}.log - - - - ${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d [%thread] %-5level %logger{128} %line - %msg%n + %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n - - From bb828681f64644569740da6dd870907c878ac572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Mon, 12 Apr 2021 14:04:53 +0800 Subject: [PATCH 11/28] Update application-uat.yml --- src/main/resources/application-uat.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 819b0ae..c0f891c 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -105,9 +105,7 @@ eureka: defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka instance: prefer-ip-address: true - instance-id: http://10.242.31.158:${server.port} - # 这是客户端的注册地址， eureka 会通过这个地址建立管道 - ip-address: 10.242.31.158 + instance-ip: ${spring.cloud.client.ip-address}:${server.port} mybatis-plus: configuration: From 78888192f4a16fa782a0ac282e39a670d64bf8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Mon, 12 Apr 2021 16:51:18 +0800 Subject: [PATCH 12/28] Update logback.xml --- src/main/resources/logback.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index e1ea49f..e8a706c 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -42,6 +42,7 @@ + From 042f4699b1d3e823ecff17de3ed2c364605aa451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Mon, 12 Apr 2021 17:18:53 +0800 Subject: [PATCH 13/28] Update application-uat.yml --- src/main/resources/application-uat.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index c0f891c..5249254 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -6,12 +6,11 @@ server: seata: service: vgroup-mapping: - biz-service-ebtp-extend-service-group: default - - #registry: - # type: eureka - # eureka: - # serviceUrl: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka + biz-service-ebtp-extend-service-group: seata-server-jl + registry: + type: eureka + eureka: + serviceUrl: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka # 对应 apollo 配置中心的应用名 app: From 82b602d885e80079873859e1d0e5d2c5c1221a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8A=B9=E5=BD=AC?= Date: Tue, 13 Apr 2021 09:47:30 +0800 Subject: [PATCH 14/28] Update logback.xml --- src/main/resources/logback.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index e8a706c..4db3903 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -45,6 +45,7 @@ + From 39c387dbed3017049a48b8ec2a23cb13be296d13 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 13 Apr 2021 09:49:43 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timeService/TimeServiceConstant.java | 21 ++++++++++++++----- .../controller/TimeServiceController.java | 8 +++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java index 3f300f2..bfd086d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java @@ -64,7 +64,21 @@ public class TimeServiceConstant { * @param timestamp 时间戳加密原文 * @return 时间戳对象 */ - public TSAVerifyResult verifyTimeStamp(String timestamp){ + public TtsAgent.TtsParseResult verifyTimeStamp2(String timestamp){ + try{ + log.info("timestamp -->"+timestamp); + TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); + String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime()); + TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()), + verifyResult.getSignerSubject()); + return ttsParseResult; + }catch (Exception e){ + log.error("解析时间戳", e); + } + return null; + } + + private TSAVerifyResult verifyTimeStamp(String timestamp){ try{ log.info("timestamp -->"+timestamp); TSAVerifyResult verifyResult = client.verifyTimeStamp(Base64.decodeBase64(timestamp)); @@ -83,10 +97,7 @@ public class TimeServiceConstant { public TtsAgent.TtsParseResult getServiceTimeObj(String data){ try{ String timestamp = this.signTimeStamp(data); - TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); - String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime()); - TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()), - verifyResult.getSignerSubject()); + TtsAgent.TtsParseResult ttsParseResult = this.verifyTimeStamp2(timestamp); return ttsParseResult; }catch (Exception e){ log.error("获取时间戳异常", e); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java index d2e8503..3720306 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java @@ -39,10 +39,10 @@ public class TimeServiceController { * @return 时间戳对象 */ @ApiOperation("解析时间戳加密原文") - @GetMapping(value = "/verifyTimeStamp") - public BaseResponse verifyTimeStamp(@ApiParam(value = "时间戳加密原文", required = true) @RequestBody String timestamp) { + @PostMapping(value = "/verifyTimeStamp") + public BaseResponse verifyTimeStamp(@ApiParam(value = "时间戳加密原文", required = true) @RequestBody String timestamp) { TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.verifyTimeStamp(timestamp)); + return BaseResponse.success(constant.verifyTimeStamp2(timestamp)); } /** @@ -51,7 +51,7 @@ public class TimeServiceController { * @return 时间戳对象 */ @ApiOperation("直接获取时间戳对象（内涵日期）") - @PostMapping(value = "/getServiceTimeObj") + @GetMapping(value = "/getServiceTimeObj") public BaseResponse getServiceTimeObj(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { TimeServiceConstant constant = new TimeServiceConstant(); return BaseResponse.success(constant.getServiceTimeObj(data)); From 81aa01b3ea69c07e3acbae1709e80952c81eba2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8A=B9=E5=BD=AC?= Date: Tue, 13 Apr 2021 09:54:09 +0800 Subject: [PATCH 16/28] Update logback.xml --- src/main/resources/logback.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 4db3903..e8a706c 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -45,7 +45,6 @@ - From 17b964fef06cee35b9d6d8ae339893934e18c8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Thu, 22 Apr 2021 14:18:33 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0JVM=E5=A0=86=E5=86=85?= =?UTF-8?q?=E5=AD=98=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pro.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pro.yaml b/pro.yaml index ba8569a..7046d70 100644 --- a/pro.yaml +++ b/pro.yaml @@ -84,6 +84,14 @@ 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 8a7a4dae15bfead28c230e51f14660ede6896008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Thu, 22 Apr 2021 14:19:45 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback.xml | 115 +++++++++++---------------------- 1 file changed, 36 insertions(+), 79 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index ab31609..0c4c923 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,89 +1,46 @@ - - + + ${logback.appname} - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n - - - + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + + + - - - - - ERROR - - DENY - - ACCEPT - - - ${logback.logdir}/info.${logback.appname}.log - - - - ${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d [%thread] %-5level %logger{64} %line - %msg%n - - + - - - - Error - - - ${logback.logdir}/error.${logback.appname}.log - - - - ${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d [%thread] %-5level %logger{128} %line - %msg%n - - - - - - - - - - + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log + + + + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log + + 3 + + true + + + + + + UTF-8 + %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + + + + + + + + From 4103d833cc55ebb96383eb67ccf37ab6744ea6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Thu, 22 Apr 2021 14:43:19 +0800 Subject: [PATCH 19/28] Update logback.xml --- src/main/resources/logback.xml | 78 ++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 0c4c923..cf6d74b 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,46 +1,50 @@ - - + + ${logback.appname} - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n - - - + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + + + - - - ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log - - - - ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log - - 3 - - true - - - - - - UTF-8 - %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n - - - - - - - - + + + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.log + + + + ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log + + 3 + + true + + + + + + UTF-8 + %d ${MY_POD_IP} [%thread] %-5level %logger{64} %line - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + + + + + + + + + From fd407370d2dd94f2818499aba9fe3384a0f9e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Thu, 6 May 2021 15:08:45 +0800 Subject: [PATCH 20/28] Update application-test.yml --- src/main/resources/application-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index ca20abb..35053de 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -44,8 +44,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_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_extend?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_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 From c5001583af7145315af46850bf202c4bfeb1ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Thu, 6 May 2021 15:11:16 +0800 Subject: [PATCH 21/28] Update application-test.yml --- src/main/resources/application-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 35053de..ca20abb 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -44,8 +44,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_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_extend?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_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 From fab63c6ba71febe9305b6ee5aa94797c907cd105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 14 May 2021 08:57:02 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizbidnotice/dao/BizBidNoticeMapper.java | 16 +- .../dao/mapper/BizBidNoticeMapper.xml | 186 +++++++++--------- .../bizbidnotice/entity/BizBidNoticeVO.java | 83 ++++---- .../service/impl/BizBidNoticeServiceImpl.java | 7 +- .../controller/BizBidSharedController.java | 5 +- .../bizbidshared/entity/BizBidShared.java | 12 +- .../service/impl/BizBidSharedServiceImpl.java | 25 +-- .../BizBidSharedRecordController.java | 3 +- .../entity/BizBidSharedRecord.java | 1 - .../entity/BizBidSharedRecordVO.java | 2 - .../impl/BizBidSharedRecordServiceImpl.java | 14 +- 11 files changed, 170 insertions(+), 184 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java index 7be1ea5..54456d6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java @@ -1,30 +1,26 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.dao; -import java.time.LocalDateTime; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; +import org.apache.ibatis.annotations.Param; public interface BizBidNoticeMapper extends IBaseMapper { // public int deleteOff(String id); // public List getList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease, @Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - + // public List getListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); // public List getAllList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); // public List getAllListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - public Boolean fabu(@Param("id")String id); + public Boolean fabu(@Param("id") String id); - public Boolean qxfabu(@Param("id")String id); + public Boolean qxfabu(@Param("id") String id); - public Boolean top(@Param("id")String id); + public Boolean top(@Param("id") String id); - public Boolean qxtop(@Param("id")String id); + public Boolean qxtop(@Param("id") String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml index 1690a6d..b5af82a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml @@ -2,130 +2,130 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + select id,notice_name, notice_title, notice_content, notice_file,notice_release,notice_top, create_by, create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_notice - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update biz_bid_notice set delete_flag="deleted" where notice_id=#{notice_id} limit #{pageIndex},#{pageSize} - - + + update biz_bid_notice set notice_release="open" where id=#{id} - - + + update biz_bid_notice set notice_release="close" where id=#{id} - - + + update biz_bid_notice set notice_top="0" where id=#{id} - - + + update biz_bid_notice set notice_top="1" where id=#{id} - - - - update biz_bid_notice - - notice_name = #{noticeName}, - notice_title = #{noticeTitle}, - notice_content = #{noticeContent}, - notice_file = #{noticeFile}, - notice_release=#{noticeRelease} - notice_top=#{noticeTop} - update_by = #{updatBy}, - update_date = #{updateDate}, - tenant_id = #{tenantId}, - tenant_name = #{tenantName}, - last_update_time = #{lastTpdateTime}, - - where ID=#{id} - - - + + + update biz_bid_notice + + notice_name = #{noticeName}, + notice_title = #{noticeTitle}, + notice_content = #{noticeContent}, + notice_file = #{noticeFile}, + notice_release=#{noticeRelease} + notice_top=#{noticeTop} + update_by = #{updatBy}, + update_date = #{updateDate}, + tenant_id = #{tenantId}, + tenant_name = #{tenantName}, + last_update_time = #{lastTpdateTime}, + + where ID=#{id} + + + + update biz_bid_notice set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java index 661a7e5..603d043 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNoticeVO.java @@ -1,10 +1,5 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -26,49 +21,49 @@ import java.time.LocalDateTime; @ApiModel public class BizBidNoticeVO extends BasePageRequest implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * - */ - @ApiModelProperty(value = "ID") - private String id; + /** + * + */ + @ApiModelProperty(value = "ID") + private String id; - /** - * - */ - @ApiModelProperty(value = "noticeName") - private String noticeName; + /** + * + */ + @ApiModelProperty(value = "noticeName") + private String noticeName; - /** - * 标题 - */ - @ApiModelProperty(value = "标题") - private String noticeTitle; + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String noticeTitle; - /** - * 内容 - */ - @ApiModelProperty(value = "内容") - private String noticeContent; - /** - * 文件ID - */ - @ApiModelProperty(value = "文件ID") - private String noticeFile; - /** - * 是否发布 - */ - @ApiModelProperty(value = "是否发布") - private String noticeRelease; + /** + * 内容 + */ + @ApiModelProperty(value = "内容") + private String noticeContent; + /** + * 文件ID + */ + @ApiModelProperty(value = "文件ID") + private String noticeFile; + /** + * 是否发布 + */ + @ApiModelProperty(value = "是否发布") + private String noticeRelease; - /** - * 是否置顶 - */ - @ApiModelProperty(value = "是否置顶") - private String noticeTop; + /** + * 是否置顶 + */ + @ApiModelProperty(value = "是否置顶") + private String noticeTop; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createDate; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java index ef67461..68d3a0c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java @@ -40,7 +40,8 @@ public class BizBidNoticeServiceImpl extends BaseServiceImpl page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); listRelease(page.getRecords()); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java index 7744bfd..4a166c6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/controller/BizBidSharedController.java @@ -4,6 +4,7 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.controller; import cn.hutool.core.util.StrUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.constant.EbtpRoleEnum; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.stream.Collectors; @RestController @Api(tags = "") @@ -51,7 +53,8 @@ public class BizBidSharedController { if (StringUtils.isEmpty(bizBidShared.getId())) { bizBidShared.setId(PropertyUtils.getSnowflakeId()); } - bizBidShared.setSharedRole(StrUtil.join(",", bizBidShared.getSharedRoles())); + bizBidShared.setSharedRole(StrUtil.join(",", bizBidShared.getRoles().stream().map(m -> EbtpRoleEnum.matchRole(m).getDesc()).collect(Collectors.toList()))); + bizBidShared.setSharedRoles(StrUtil.join(",", bizBidShared.getRoles())); boolean save = ibizBidSharedService.saveOrUpdate(bizBidShared); return BaseResponse.success(save); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java index ee8f73a..4ae4b4c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java @@ -44,6 +44,12 @@ public class BizBidShared extends BaseEntity implements Serializable { @ApiModelProperty(value = "共享文档文件名") private String sharedName; + /** + * 共享文档使用角色 + */ + @ApiModelProperty(value = "共享文档使用角色") + private String sharedRoles; + /** * 共享文档使用角色 */ @@ -52,10 +58,9 @@ public class BizBidShared extends BaseEntity implements Serializable { /** * 共享文档使用角色list */ - @Transient @TableField(exist = false) - private List sharedRoles; + private List roles; /** * 共享文档ID */ @@ -78,4 +83,7 @@ public class BizBidShared extends BaseEntity implements Serializable { @TableField(exist = false) private String fileSuffix; + @TableField(exist = false) + private boolean isAllowDownload; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java index 2f2e235..d52a108 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java @@ -1,17 +1,14 @@ package com.chinaunicom.mall.ebtp.extend.bizbidshared.service.impl; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; import com.chinaunicom.mall.ebtp.extend.bizbidshared.dao.BizBidSharedMapper; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidSharedVO; @@ -19,10 +16,6 @@ import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedServic import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - /** * 对数据表 biz_bid_shared 操作的 serviceImpl * @@ -32,10 +25,11 @@ import java.util.stream.Collectors; public class BizBidSharedServiceImpl extends BaseServiceImpl implements IBizBidSharedService { @Autowired - private AttachmentClient attachmentClient; + private IBaseCacheUserService cacheUserService; @Override public IPage getList(BizBidSharedVO bizBidNotice) { + BaseCacheUser user = cacheUserService.getCacheUser(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName()) .like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole()) @@ -47,14 +41,9 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); - List collect = page.getRecords().stream().map(BizBidShared::getSharedFile).distinct().collect(Collectors.toList()); - Optional optional = attachmentClient.findByBusinessId(collect); - optional.ifPresent(o -> { - page.getRecords().forEach(r -> { - Optional first = o.get(r.getSharedFile()).stream().findFirst(); - first.ifPresent(f -> r.setFileName(f.getFilename()).setFileSuffix(FileUtil.getSuffix(f.getFilename()))); - }); - }); + //是否可下载 + page.getRecords().forEach(p -> p.setAllowDownload(p.getSharedRoles().contains(user.getCurrentRoleCode()))); + return page; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java index 5970c70..62c7126 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.java @@ -6,7 +6,6 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; -import com.chinaunicom.mall.ebtp.extend.bizbidshared.service.IBizBidSharedService; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.IBizBidSharedRecordService; @@ -60,7 +59,7 @@ public class BizBidSharedRecordController { bizBidSharedRecord.setRecordId(bizBidShared.getId()); bizBidSharedRecord.setRecordAccount(cacheUser.getLoginName()); bizBidSharedRecord.setRecordName(cacheUser.getFullName()); - bizBidSharedRecord.setRecordRole(cacheUser.getRoleIds()); + bizBidSharedRecord.setRecordRole(cacheUser.getCurrentRoleCode()); bizBidSharedRecord.setRecordStaff(cacheUser.getUserId()); boolean save = ibizBidSharedRecordService.save(bizBidSharedRecord); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java index 21d34d9..b3c1e1e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java @@ -71,5 +71,4 @@ public class BizBidSharedRecord extends BaseEntity implements Serializable { private String recordAccount; - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java index b127bca..32b0c95 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecordVO.java @@ -1,8 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java index ba920be..19992a0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.constant.EbtpRoleEnum; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.dao.BizBidSharedRecordMapper; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.service.IBizBidSharedRecordService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -22,8 +22,6 @@ import org.springframework.stereotype.Service; @Service public class BizBidSharedRecordServiceImpl extends BaseServiceImpl implements IBizBidSharedRecordService { - @Autowired - BizBidSharedRecordMapper bizBidSharedRecordMapper; @Override public IPage getList(BizBidSharedRecordVO recordVO) { @@ -38,13 +36,11 @@ public class BizBidSharedRecordServiceImpl extends BaseServiceImpl(recordVO.getPageNo(), recordVO.getPageSize()), wrapper); - } + Page page = this.page(new Page<>(recordVO.getPageNo(), recordVO.getPageSize()), wrapper); -// @Override -// public BizBidSharedRecord getByIdInfo(BizBidSharedRecord bizBidSharedRecord) { -// return bizBidSharedRecordMapper.getByIdInfo(bizBidSharedRecord.getRecordId(), bizBidSharedRecord.getCurrent(), bizBidSharedRecord.getPageSize()); -// } + page.getRecords().forEach(p -> p.setRecordRole(EbtpRoleEnum.matchRole(p.getRecordRole()).getDesc())); + return page; + } } From b51f6eed902b24784690a1e84ee311968642b6d4 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:22:51 +0800 Subject: [PATCH 23/28] =?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 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/deployment-gz.yaml b/deployment-gz.yaml index 50b0f2d..60c12e2 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -53,6 +53,13 @@ spec: # 需要暴露的端口库号列表 ports: - containerPort: 18018 + resources: + requests: + cpu: 2000m + memory: 4Gi + limits: + cpu: 4000m + memory: 8Gi # 容器运行前需设置的环境变量列表 env: # Apollo 配置中心变量设置 @@ -61,7 +68,14 @@ spec: - name: MY_POD_IP #自动获取pod ip作为agent id valueFrom: fieldRef: - fieldPath: status.podIP + 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 131b3780eba3a6adfe42ff661fac07cd9501917e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 18 May 2021 09:43:02 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E6=B3=A8=E5=86=8C=20UAT=20Skywalking=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9logback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-gz | 4 ++-- src/main/resources/logback.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-gz b/Dockerfile-gz index 2b18037..53df180 100644 --- a/Dockerfile-gz +++ b/Dockerfile-gz @@ -1,4 +1,4 @@ -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 @@ -7,4 +7,4 @@ RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 RUN mkdir -p /model COPY /target/classes/model/. /model/ ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index e8a706c..cf6d74b 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -11,7 +11,7 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50} - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n @@ -27,7 +27,7 @@ ${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log - 90 + 3 true From 8c3114cca74cd39c11520c86aef8e71fba7b0ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 25 May 2021 15:52:20 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0apollo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-gz => Dockerfile-dev | 5 +- Dockerfile-pro => Dockerfile-master | 2 +- Dockerfile-sim | 2 + Dockerfile-test | 10 -- Dockerfile-uat | 7 ++ config-test => config-dev | 0 config-pro => config-master | 0 config-sim | 17 +++ config-gz => config-uat | 0 deployment-test.yaml => deployment-dev.yaml | 46 ++++--- deployment-master.yaml | 118 ++++++++++++++++++ deployment-gz.yaml => deployment-sim.yaml | 59 +++++---- deployment-uat.yaml | 106 ++++++++++++++++ pro.yaml | 2 +- .../BizServiceEbtpExtendApplication.java | 2 + ...plication-test.yml => application-dev.yml} | 0 ...lication-pro.yml => application-mster.yml} | 0 src/main/resources/application.yml | 12 +- src/main/resources/logback.xml | 2 +- 19 files changed, 320 insertions(+), 70 deletions(-) rename Dockerfile-gz => Dockerfile-dev (63%) rename Dockerfile-pro => Dockerfile-master (56%) create mode 100644 Dockerfile-sim delete mode 100644 Dockerfile-test create mode 100644 Dockerfile-uat 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 (57%) create mode 100644 deployment-master.yaml rename deployment-gz.yaml => deployment-sim.yaml (51%) create mode 100644 deployment-uat.yaml rename src/main/resources/{application-test.yml => application-dev.yml} (100%) rename src/main/resources/{application-pro.yml => application-mster.yml} (100%) diff --git a/Dockerfile-gz b/Dockerfile-dev similarity index 63% rename from Dockerfile-gz rename to Dockerfile-dev index 53df180..3c897fa 100644 --- a/Dockerfile-gz +++ b/Dockerfile-dev @@ -3,8 +3,5 @@ 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 - -RUN mkdir -p /model -COPY /target/classes/model/. /model/ ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_extend-0.0.1.jar"] diff --git a/Dockerfile-pro b/Dockerfile-master similarity index 56% rename from Dockerfile-pro rename to Dockerfile-master index 13203f6..8d9237c 100644 --- a/Dockerfile-pro +++ b/Dockerfile-master @@ -1,2 +1,2 @@ FROM harbor.dcos.xixian.unicom.local/eshop/jdk8_springboot_agent:v1.6 -ADD target/biz_service_ebtp_extend-0.0.1.jar /app.jar \ No newline at end of file +ADD /target/biz_service_ebtp_extend-0.0.1.jar /app.jar \ No newline at end of file diff --git a/Dockerfile-sim b/Dockerfile-sim new file mode 100644 index 0000000..9b019d2 --- /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_extend-0.0.1.jar /app.jar \ No newline at end of file diff --git a/Dockerfile-test b/Dockerfile-test deleted file mode 100644 index 4a3ef16..0000000 --- a/Dockerfile-test +++ /dev/null @@ -1,10 +0,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 - -RUN mkdir -p /model -COPY /target/classes/model/. /model/ -ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-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_extend-0.0.1.jar"] diff --git a/Dockerfile-uat b/Dockerfile-uat new file mode 100644 index 0000000..8d548e7 --- /dev/null +++ b/Dockerfile-uat @@ -0,0 +1,7 @@ +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_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar","-jar", "/biz_service_ebtp_extend-0.0.1.jar"] 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 57% rename from deployment-test.yaml rename to deployment-dev.yaml index fd96120..3c7e0bd 100644 --- a/deployment-test.yaml +++ b/deployment-dev.yaml @@ -7,23 +7,23 @@ metadata: namespace: default labels: app: biz-service-ebtp-extend - + # 必选，详细定义 spec: # pod 副本数量 replicas: 1 - + # 滚动升级配置信息 strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 - + # 选择器，匹配pod模板 selector: matchLabels: app: biz-service-ebtp-extend - + template: metadata: labels: @@ -32,25 +32,31 @@ spec: annotations: prometheus.io/port: '18018' prometheus.io/jl-pod: 'true' - + # 定义容器模板，该模板可以包含多个容器 spec: # 必选，Pod中容器列表 containers: - - name: biz-service-ebtp-extend - image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest - # 需要暴露的端口库号列表 - ports: - - containerPort: 18018 - # 容器运行前需设置的环境变量列表 - env: - # Apollo 配置中心变量设置 - - name: APOLLO_CONFIGSERVICE - value: http://10.242.37.1488:6001 - - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES - value: skywalking-oap-cluster.skywalking:11800 - - name: SW_AGENT_NAME - value: biz-service-ebtp-extend + - name: biz-service-ebtp-extend + image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest + # 需要暴露的端口库号列表 + ports: + - containerPort: 18018 + # 容器运行前需设置的环境变量列表 + env: + # Apollo 配置中心变量设置 + - name: APOLLO_CONFIGSERVICE + value: http://10.242.37.1488:6001 + - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES + value: skywalking-oap-cluster.skywalking:11800 + - name: SW_AGENT_NAME + value: biz-service-ebtp-extend + - name: APP_NAME + value: biz_service_ebtp_extend_dev + - name: MY_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP --- kind: Service apiVersion: v1 @@ -71,5 +77,5 @@ spec: app: biz-service-ebtp-extend status: loadBalancer: {} - + --- \ No newline at end of file diff --git a/deployment-master.yaml b/deployment-master.yaml new file mode 100644 index 0000000..110aee1 --- /dev/null +++ b/deployment-master.yaml @@ -0,0 +1,118 @@ +# 接口版本 +apiVersion: apps/v1 +# 接口类型 +kind: Deployment +metadata: + name: biz-service-ebtp-extend + namespace: default + labels: + app: biz-service-ebtp-extend + +# 必选，详细定义 +spec: + # pod 副本数量 + replicas: 3 + + # 滚动升级配置信息 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + + # 选择器，匹配pod模板 + selector: + matchLabels: + app: biz-service-ebtp-extend + + template: + metadata: + labels: + # 模板名称 + app: biz-service-ebtp-extend + annotations: + prometheus.io/port: '18018' + 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-extend + topologyKey: "kubernetes.io/hostname" + # 必选，Pod中容器列表 + containers: + - name: biz-service-ebtp-extend + image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-extend:latest + 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: 18018 + #livenessProbe: + # failureThreshold: 3 + # httpGet: + # port: 18018 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 + # path: /actuator/prometheus + # scheme: HTTP + # initialDelaySeconds: 300 + # periodSeconds: 60 + # successThreshold: 1 + # timeoutSeconds: 2 + #readinessProbe: + # failureThreshold: 1 + # httpGet: + # port: 18018 #[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: AGENT_LICENCE + value: 527BFA7B28577578 + - name: APP_NAME + value: biz_service_ebtp_extend + - name: APOLLO_CONFIGSERVICE + value: http://apollo-configservice:8080 + - name: MY_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP +--- +kind: Service +apiVersion: v1 +metadata: + name: biz-service-ebtp-extend-svc # [11] service的名字，格式为“服务名-svc” + namespace: default + labels: + service: biz-service-ebtp-extend-svc # [12] service的标签，可与参数[11]相同 + annotations: + prometheus.io/port: '18018' #[13] prometheus自动发现service的端口，也是该微服务所使用的端口，与参数[4]相同 + prometheus.io/jl-svc: 'true' + +spec: + ports: + - port: 18018 #[15] 与参数4相同 + targetPort: 18018 #[16] 与参数4相同 + selector: + app: biz-service-ebtp-extend #[17] 该service对应Deployment的名字，与参数[1]相同 +--- \ No newline at end of file diff --git a/deployment-gz.yaml b/deployment-sim.yaml similarity index 51% rename from deployment-gz.yaml rename to deployment-sim.yaml index 60c12e2..50a52d0 100644 --- a/deployment-gz.yaml +++ b/deployment-sim.yaml @@ -11,7 +11,7 @@ metadata: # 必选，详细定义 spec: # pod 副本数量 - replicas: 1 + replicas: 3 # 滚动升级配置信息 strategy: @@ -35,66 +35,65 @@ spec: # 定义容器模板，该模板可以包含多个容器 spec: - # 挂载日志存储 volumes: - name: log persistentVolumeClaim: claimName: log-pvc readOnly: false - + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - biz-service-ebtp-extend + topologyKey: "kubernetes.io/hostname" # 必选，Pod中容器列表 containers: - name: biz-service-ebtp-extend image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest - # 在容器中挂载日志存储区 + 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: 18018 + - containerPort: 18018 resources: requests: - cpu: 2000m - memory: 4Gi + cpu: 1000m + memory: 2Gi limits: - cpu: 4000m - memory: 8Gi - # 容器运行前需设置的环境变量列表 + cpu: 3000m + memory: 6Gi env: - # Apollo 配置中心变量设置 + - name: AGENT_LICENCE + value: 527BFA7B28577578 + - name: APP_NAME + value: biz_service_ebtp_extend_sim - name: APOLLO_CONFIGSERVICE value: http://apollo-configservice:8080 - - name: MY_POD_IP #自动获取pod ip作为agent id + - 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-extend + name: biz-service-ebtp-extend-svc # [11] service的名字，格式为“服务名-svc” namespace: default labels: - app: biz-service-ebtp-extend + service: biz-service-ebtp-extend-svc # [12] service的标签，可与参数[11]相同 annotations: - # lb.cke.tg.unicom/target-vports: 18018-18018 - prometheus.io/port: '18018' + prometheus.io/port: '18018' #[13] prometheus自动发现service的端口，也是该微服务所使用的端口，与参数[4]相同 prometheus.io/jl-svc: 'true' + spec: ports: - - port: 18018 - targetPort: 18018 + - port: 18018 #[15] 与参数4相同 + targetPort: 18018 #[16] 与参数4相同 selector: - app: biz-service-ebtp-extend -status: - loadBalancer: {} - + app: biz-service-ebtp-extend #[17] 该service对应Deployment的名字，与参数[1]相同 --- \ No newline at end of file diff --git a/deployment-uat.yaml b/deployment-uat.yaml new file mode 100644 index 0000000..6af7fee --- /dev/null +++ b/deployment-uat.yaml @@ -0,0 +1,106 @@ +# 接口版本 +apiVersion: apps/v1 +# 接口类型 +kind: Deployment +metadata: + name: biz-service-ebtp-extend + namespace: default + labels: + app: biz-service-ebtp-extend + +# 必选，详细定义 +spec: + # pod 副本数量 + replicas: 1 + + # 滚动升级配置信息 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + + # 选择器，匹配pod模板 + selector: + matchLabels: + app: biz-service-ebtp-extend + + template: + metadata: + labels: + # 模板名称 + app: biz-service-ebtp-extend + annotations: + prometheus.io/port: '18018' + prometheus.io/jl-pod: 'true' + + # 定义容器模板，该模板可以包含多个容器 + spec: + # 挂载日志存储 + volumes: + - name: log + persistentVolumeClaim: + claimName: log-pvc + readOnly: false + + # 必选，Pod中容器列表 + containers: + - name: biz-service-ebtp-extend + image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest + # 在容器中挂载日志存储区 + volumeMounts: + - name: log + mountPath: /log + # 需要暴露的端口库号列表 + ports: + - containerPort: 18018 + resources: + requests: + cpu: 2000m + memory: 4Gi + limits: + cpu: 4000m + memory: 8Gi + # 容器运行前需设置的环境变量列表 + env: + # Apollo 配置中心变量设置 + - name: APOLLO_CONFIGSERVICE + value: http://apollo-configservice:8080 + - 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 + - name: APP_NAME + value: biz_service_ebtp_extend_uat + - name: MY_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP +--- +kind: Service +apiVersion: v1 +metadata: + name: biz-service-ebtp-extend + namespace: default + labels: + app: biz-service-ebtp-extend + annotations: + # lb.cke.tg.unicom/target-vports: 18018-18018 + prometheus.io/port: '18018' + prometheus.io/jl-svc: 'true' +spec: + ports: + - port: 18018 + targetPort: 18018 + selector: + app: biz-service-ebtp-extend +status: + loadBalancer: {} + +--- \ No newline at end of file diff --git a/pro.yaml b/pro.yaml index 7046d70..785b8f5 100644 --- a/pro.yaml +++ b/pro.yaml @@ -41,7 +41,7 @@ spec: containers: - name: biz-service-ebtp-extend #[6] 必选，容器名称，可填写微服务名称 image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-extend:latest #[7] 镜像名称，请把biz-service-ebtp-extend替换为服务名称 - 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 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java index 58523c6..e292cb9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend; +import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -23,6 +24,7 @@ import io.micrometer.core.instrument.MeterRegistry; @EnableEurekaClient @MapperScan({ "com.chinaunicom.mall.ebtp.extend.**.dao" }) @ComponentScan("com.chinaunicom.mall.ebtp.*") +@EnableApolloConfig public class BizServiceEbtpExtendApplication { public static void main(String[] args) { diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-dev.yml similarity index 100% rename from src/main/resources/application-test.yml rename to src/main/resources/application-dev.yml diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-mster.yml similarity index 100% rename from src/main/resources/application-pro.yml rename to src/main/resources/application-mster.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..89394d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,9 @@ -spring: - profiles: - active: uat \ No newline at end of file +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + bootstrap: + enabled: true + namespace: application \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index cf6d74b..0f35ed8 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + ${logback.appname} From a9dc1f24dc916fe7a61bfece63646ab6459733f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 25 May 2021 15:57:11 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0apollo?= 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 89394d5..738d175 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,4 +6,4 @@ app: apollo: bootstrap: enabled: true - namespace: application \ No newline at end of file + namespace: application0 \ No newline at end of file From 008a108a95488b791d05c683067dd833f453f95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 25 May 2021 15:59:28 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0apollo?= 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 738d175..89394d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,4 +6,4 @@ app: apollo: bootstrap: enabled: true - namespace: application0 \ No newline at end of file + namespace: application \ No newline at end of file From b09f0e2f3568a848e69deedc36cedcc2adf7882f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Tue, 25 May 2021 16:00:11 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0apollo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-uat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment-uat.yaml b/deployment-uat.yaml index 6af7fee..95e8e56 100644 --- a/deployment-uat.yaml +++ b/deployment-uat.yaml @@ -77,7 +77,7 @@ spec: -XX:MinRAMPercentage=20.0 -XX:MaxRAMPercentage=80.0 - name: APP_NAME - value: biz_service_ebtp_extend_uat + value: biz_service_ebtp_extend_uat - name: MY_POD_IP valueFrom: fieldRef: