Merge branch 'develop'

kustomization/base/deployment.yaml

@@ -19,9 +19,9 @@ spec:
         - name: pms
           image: REGISTRY/NAMESPACE/IMAGE:TAG
           readinessProbe:
-            initialDelaySeconds: 480
-            periodSeconds: 10
-            failureThreshold: 20
+            initialDelaySeconds: 15
+            periodSeconds: 5
+            failureThreshold: 10
             httpGet:
               path: /pms/actuator/health/readiness
               port: pms-port
@@ -31,9 +31,7 @@ spec:
             - name: localtime
               mountPath: /etc/localtime
               readOnly: true
-          resources:
-            limits:
-              cpu: 100m
+          resources: { }
           ports:
             - containerPort: 8099
               name: pms-port

kustomization/base/service.yaml

@@ -6,7 +6,6 @@ metadata:
 spec:
   selector:
     app: pms
-  type: NodePort
   ports:
     - port: 8099
       #nodePort: 30199
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -11,11 +11,11 @@ commonAnnotations:
 patches:
 - path: ./increase_replicas.yaml
 - path: ./configMap.yaml
-- path: ./service-patch.yaml
-  target:
-    kind: Service
-    name: pms-svc
+#- path: ./service-patch.yaml
+#  target:
+#    kind: Service
+#    name: pms-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 52d8be6d96c5022b3a7060b7064e3f4e85a6eb6c
+  newTag: 37582a668837033ad61d64321c6fa7620ea17d45

kustomization/overlays/prod/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 namespace: prod
 #namePrefix: prod-
 commonLabels:
@@ -9,12 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-- path: ./increase_replicas.yaml
-- path: ./configMap.yaml
-- path: ./service-patch.yaml
-  target:
-    kind: Service
-    name: pms-svc
+  - path: ./increase_replicas.yaml
+  - path: ./configMap.yaml
+#- path: ./service-patch.yaml
+#  target:
+#    kind: Service
+#    name: pms-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/pms

src/main/java/com/mmc/pms/common/ResultEnum.java

@@ -53,7 +53,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
   PARAM_DEFECT("5004", "参数缺失"),
   LOGIN_ACCOUNT_NOT_EXIT_ERROR("5005", "账号不存在"),
   LOGIN_PASSWORD_ERROR("5006", "密码错误"),
-  LOGIN_ACCOUNT_STATUS_ERROR("5008", "外部访问"),
+  LOGIN_ACCOUNT_STATUS_ERROR("5008", "未登录"),
   OPERATE_USER_ORDERCOUNT_ERROR("5007", "当前账号有存在相关订单未关闭"),
   WALLET_CASH_NOT_ENOUGH_ERROR("5009", "现金余额不足"),
 

src/main/java/com/mmc/pms/error/GlobalExceptionHandler.java

+package com.mmc.pms.error;
+
+import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.common.ResultEnum;
+import com.mmc.pms.util.BizException;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
+import org.springframework.validation.BindException;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingPathVariableException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author 作者 geDuo
+ * @version 创建时间：2021年8月27日 上午10:15:30
+ * @explain 类说明
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    /**
+     * 统一处理参数校验错误异常(非Spring接口数据绑定验证)
+     *
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(BindException.class)
+    @ResponseBody
+    public ResultBody processValidException(BindException e) {
+        // 获取校验错误结果信息，并将信息组装
+        List<String> errorStringList = e.getBindingResult().getAllErrors().stream().map(ObjectError::getDefaultMessage)
+                .collect(Collectors.toList());
+        String errorMessage = String.join("; ", errorStringList);
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    /**
+     * 统一处理参数校验错误异常
+     *
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseBody
+    public ResultBody processValidException(IllegalArgumentException e) {
+        String errorMessage = String.join("; ", e.getMessage());
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    @ExceptionHandler(ConstraintViolationException.class)
+    @ResponseBody
+    public ResultBody processValidException(ConstraintViolationException e) {
+        String errorMessage = e.getConstraintViolations().stream().map(ConstraintViolation::getMessage)
+                .collect(Collectors.joining(","));
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseBody
+    public ResultBody processValidException(MethodArgumentNotValidException e) {
+        String errorMessage = e.getBindingResult().getAllErrors().stream()
+                .map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining(","));
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    @ResponseBody
+    public ResultBody processValidException(MissingServletRequestParameterException e) {
+        String errorMessage = e.getParameterName() + " 不能为空";
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    @ExceptionHandler(MissingPathVariableException.class)
+    @ResponseBody
+    public ResultBody processValidException(MissingPathVariableException e) {
+        String errorMessage = e.getVariableName() + " 不能为空";
+        return ResultBody.error(ResultEnum.BODY_NOT_MATCH.getResultCode(), errorMessage);
+    }
+
+    @ExceptionHandler(BizException.class)
+    @ResponseBody
+    public ResultBody processValidException(BizException e) {
+        return ResultBody.error(e.getErrorCode(), e.getErrorMsg());
+    }
+}