From 3da588dd8672209fd31feeb086331fbc63234083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=9A=93=E6=98=B1?= Date: Thu, 27 May 2021 18:00:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=202.=E5=B0=B1=E7=BB=AA?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=B8=8E=E5=AD=98=E6=B4=BB=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-master.yaml | 55 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/deployment-master.yaml b/deployment-master.yaml index 110aee1..79e816c 100644 --- a/deployment-master.yaml +++ b/deployment-master.yaml @@ -36,10 +36,9 @@ spec: # 定义容器模板，该模板可以包含多个容器 spec: volumes: - - name: log - persistentVolumeClaim: - claimName: log-pvc - readOnly: false + - name: log + hostPath: + path: /var/lib/docker/log/349553515466-prod/default-group/30days affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -60,25 +59,25 @@ spec: 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 + livenessProbe: + failureThreshold: 3 + httpGet: + port: 18018 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 + path: /actuator/health + scheme: HTTP + initialDelaySeconds: 300 + periodSeconds: 60 + successThreshold: 1 + timeoutSeconds: 2 + readinessProbe: + failureThreshold: 1 + httpGet: + port: 18018 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 + path: /actuator/health + scheme: HTTP + periodSeconds: 5 + successThreshold: 2 + timeoutSeconds: 2 resources: requests: cpu: 1000m @@ -90,13 +89,21 @@ spec: - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APP_NAME - value: biz_service_ebtp_extend + value: biz_ebtp_extend #24位长度限，制统一去掉service - 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 From 72f4b7251f10dfbfd9dd98a3490bb37fe448cf95 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, 28 May 2021 14:29:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment-master.yaml b/deployment-master.yaml index 79e816c..04c5d8d 100644 --- a/deployment-master.yaml +++ b/deployment-master.yaml @@ -77,7 +77,7 @@ spec: scheme: HTTP periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 2 + timeoutSeconds: 2 resources: requests: cpu: 1000m From b2a9cb9a1a42f3a5f6e171a2fd6e5be45e9f4179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Sat, 5 Jun 2021 11:26:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizbidshared/service/impl/BizBidSharedServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 d52a108..f32cacc 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 @@ -33,6 +33,7 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName()) .like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole()) + .like(BizBidShared::getSharedRoles,user.getCurrentRoleCode()) .orderByDesc(BizBidShared::getCreateDate); if (bizBidNotice.getCreateDate() != null) {