Merge branch 'master-shared' into dev

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

src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java

@@ -33,6 +33,7 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl<BizBidSharedMapper,
         LambdaQueryWrapper<BizBidShared> 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) {