merge: 合并代码，解决代码冲突

Author: colorful3

src/main/java/io/github/talelin/latticy/common/exception/RestExceptionHandler.java

@@ -30,6 +30,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static io.github.talelin.autoconfigure.util.RequestUtil.getSimpleRequest;
 
@@ -196,10 +198,16 @@ public UnifyResponseVO processException(HttpMessageNotReadableException exceptio
         UnifyResponseVO result = new UnifyResponseVO();
         result.setRequest(getSimpleRequest(request));
         String errorMessage = CodeMessageConfiguration.getMessage(10170);
-        if (!StringUtils.hasText(errorMessage)) {
-            result.setMessage(exception.getMessage());
+        Throwable cause = exception.getCause();
+        if(cause != null) {
+            String msg = this.convertMessage(cause);
+            result.setMessage(msg);
         } else {
-            result.setMessage(errorMessage);
+            if (!StringUtils.hasText(errorMessage)) {
+                result.setMessage(exception.getMessage());
+            } else {
+                result.setMessage(errorMessage);
+            }
         }
         result.setCode(Code.PARAMETER_ERROR.getCode());
         response.setStatus(HttpStatus.BAD_REQUEST.value());
@@ -252,4 +260,26 @@ public UnifyResponseVO processException(Exception exception, HttpServletRequest
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
         return result;
     }
+
+    /**
+     * 传参类型错误时，用于消息转换
+     * @param throwable
+     * @return 错误信息
+     */
+    private String convertMessage(Throwable throwable) {
+        String error = throwable.toString();
+        String regulation = "\\[\"(.*?)\"]+";
+        Pattern pattern = Pattern.compile(regulation);
+        Matcher matcher = pattern.matcher(error);
+        String group = "";
+        if(matcher.find()) {
+            String matchString = matcher.group();
+            matchString = matchString
+                    .replace("[","")
+                    .replace("]","");
+            matchString = matchString.replaceAll("\\\"","") + "字段类型错误";
+            group += matchString;
+        }
+        return group;
+    }
 }

src/main/java/io/github/talelin/latticy/service/impl/AdminServiceImpl.java

@@ -162,6 +162,10 @@ public boolean deleteGroup(Integer id) {
             throw new ForbiddenException(10075);
         }
         throwGroupNotExistById(id);
+        List<Integer> groupUserIds = groupService.getGroupUserIds(id);
+        if(groupUserIds.size() > 0) {
+            throw new ForbiddenException(10027);
+        }
         return groupService.removeById(id);
     }
 

src/main/resources/code-message.properties

@@ -30,6 +30,7 @@ code-message[10023]=\u5206\u7EC4\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u65B0\u5EFA
 code-message[10024]=\u5206\u7EC4\u4E0D\u5B58\u5728
 code-message[10025]=\u627E\u4E0D\u5230\u76F8\u5E94\u7684\u89C6\u56FE\u5904\u7406\u5668
 code-message[10026]=\u672A\u627E\u5230\u6587\u4EF6
+code-message[10027]=\u5206\u7EC4\u4E0B\u5B58\u5728\u7528\u6237\uFF0C\u4E0D\u53EF\u5220\u9664\u5F53\u524D\u5206\u7EC4
 code-message[10030]=\u53C2\u6570\u9519\u8BEF
 code-message[10031]=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF
 code-message[10032]=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u5BC6\u7801