异常处理

tyr-server/src/main/java/cn/axzo/tyr/server/config/exception/ExceptionController.java

@@ -0,0 +1,34 @@
+package cn.axzo.tyr.server.config.exception;
+
+import cn.axzo.basics.common.exception.ServiceException;
+import cn.axzo.framework.domain.web.result.ApiResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import java.util.Set;
+
+@RestControllerAdvice
+@Slf4j
+public class ExceptionController {
+    @ExceptionHandler(ServiceException.class)
+    public ApiResult<Void> exceptionHandler(ServiceException e) {
+        log.info("业务异常", e);
+        return ApiResult.err(e.getErrorCode(), e.getMessage());
+    }
+
+    @ExceptionHandler(ConstraintViolationException.class)
+    @ResponseBody
+    public ApiResult<String> handleConstraintViolationException(ConstraintViolationException exception) {
+        Set<ConstraintViolation<?>> violations = exception.getConstraintViolations();
+        StringBuilder builder = new StringBuilder();
+        for (ConstraintViolation violation : violations) {
+            builder.append(violation.getMessage());
+            break;
+        }
+        return ApiResult.err(builder.toString());
+    }
+}

tyr-server/src/main/java/cn/axzo/tyr/server/config/exception/ServiceExceptionResultHandler.java

@@ -7,9 +7,6 @@ import cn.axzo.framework.autoconfigure.web.exception.handler.AbstractExceptionAp
 import cn.axzo.framework.domain.web.code.IRespCode;
 import cn.axzo.framework.domain.web.code.RespCode;
 import cn.axzo.framework.domain.web.result.ApiResult;
-import cn.azxo.framework.common.model.CommonResponse;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -24,7 +21,7 @@ import java.util.Set;
  * @author wangli
  * @since 2023/9/11 11:39
  */
-@Component
+//@Component
 public class ServiceExceptionResultHandler extends AbstractExceptionApiResultHandler<ServiceException> {
     public ServiceExceptionResultHandler(RespErrorCodeMappingProperties properties) {
         super(properties);
@@ -46,5 +43,4 @@ public class ServiceExceptionResultHandler extends AbstractExceptionApiResultHan
         }
         return ApiResult.err(builder.toString());
     }
-
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java

@@ -1,16 +1,16 @@
 package cn.axzo.tyr.server.service.impl;
 
-import cn.axzo.framework.domain.ServiceException;
+import cn.axzo.basics.common.exception.ServiceException;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
+import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
 import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam;
 import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
-import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
-import cn.axzo.tyr.server.repository.entity.SaasRole;
-import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
 import cn.axzo.tyr.server.repository.dao.SaasRoleDao;
 import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao;
+import cn.axzo.tyr.server.repository.entity.SaasRole;
+import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
 import cn.axzo.tyr.server.service.SaasRoleUserService;
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.RequiredArgsConstructor;

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java

@@ -1,34 +1,23 @@
 package cn.axzo.tyr.server.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
-import cn.axzo.framework.domain.ServiceException;
-import cn.axzo.framework.domain.web.BizException;
-import cn.axzo.framework.domain.web.code.BaseCode;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
-import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
-import cn.axzo.tyr.client.model.BaseWorkspaceModel;
-import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserRelationDTO;
-import cn.axzo.tyr.client.model.roleuser.req.DeleteRoleUserParam;
 import cn.axzo.tyr.client.model.roleuser.req.RoleUserParam;
 import cn.axzo.tyr.server.repository.dao.SaasRoleDao;
 import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao;
-import cn.axzo.tyr.server.repository.entity.SaasRole;
 import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
 import cn.axzo.tyr.server.service.SaasRoleUserRelationService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author haiyangjin