diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseCode.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseCode.java index be757d5..1df3559 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseCode.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseCode.java @@ -22,6 +22,7 @@ public class ResponseCode { public static final int DATABASE_DELETE_ERROR = 20034; public static final int DATABASE_TIMEOUT_ERROR = 20035; public static final int DATABASE_CONNECT_ERROR = 20036; + public static final int DATABASE_DATA_TO_LONG = 20037; public static final int UNAUTHORIZED = 30010; public static final int ACCESS_DENIED = 30030; diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/handler/CustomExceptionHandler.java b/Pinnacle/src/main/java/com/cfive/pinnacle/handler/CustomExceptionHandler.java index de75bf2..f135950 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/handler/CustomExceptionHandler.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/handler/CustomExceptionHandler.java @@ -3,6 +3,7 @@ package com.cfive.pinnacle.handler; import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseResult; import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DuplicateKeyException; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; @@ -28,6 +29,9 @@ public class CustomExceptionHandler { if (e instanceof DisabledException) { return ResponseResult.build(ResponseCode.USER_DISABLE, e.getMessage(), null); } + if (e instanceof DataIntegrityViolationException) { + return ResponseResult.build(ResponseCode.DATABASE_DATA_TO_LONG, e.getMessage(), null); + } log.debug(e.getMessage(), e); diff --git a/ui/src/constants/Common.constants.ts b/ui/src/constants/Common.constants.ts index 49c4f95..e48ed3f 100644 --- a/ui/src/constants/Common.constants.ts +++ b/ui/src/constants/Common.constants.ts @@ -29,6 +29,7 @@ const DATABASE_UPDATE_ERROR = 20033 const DATABASE_DELETE_ERROR = 20034 const DATABASE_TIMEOUT_ERROR = 20035 const DATABASE_CONNECT_ERROR = 20036 +const DATABASE_DATA_TO_LONG = 20037 const UNAUTHORIZED = 30010 const ACCESS_DENIED = 30030 @@ -67,6 +68,7 @@ export { DATABASE_DELETE_ERROR, DATABASE_TIMEOUT_ERROR, DATABASE_CONNECT_ERROR, + DATABASE_DATA_TO_LONG, UNAUTHORIZED, ACCESS_DENIED, USER_DISABLE, diff --git a/ui/src/pages/power/GroupManagement.vue b/ui/src/pages/power/GroupManagement.vue index 5419c75..64a7cc8 100644 --- a/ui/src/pages/power/GroupManagement.vue +++ b/ui/src/pages/power/GroupManagement.vue @@ -37,7 +37,12 @@ :model="groupForm" > - + diff --git a/ui/src/pages/power/RoleManagement.vue b/ui/src/pages/power/RoleManagement.vue index f8930c8..43c26c0 100644 --- a/ui/src/pages/power/RoleManagement.vue +++ b/ui/src/pages/power/RoleManagement.vue @@ -38,7 +38,12 @@ :model="roleForm" > - + diff --git a/ui/src/services/index.ts b/ui/src/services/index.ts index 8264a78..348dfc9 100644 --- a/ui/src/services/index.ts +++ b/ui/src/services/index.ts @@ -3,6 +3,7 @@ import { clearLocalStorage, getToken } from '@/utils/common' import router from '@/router' import { ACCESS_DENIED, + DATABASE_DATA_TO_LONG, TOKEN_HAS_EXPIRED, TOKEN_IS_ILLEGAL, UNAUTHORIZED @@ -49,6 +50,12 @@ service.interceptors.response.use( message: '暂无权限操作' }) return await Promise.reject(response?.data) + case DATABASE_DATA_TO_LONG: + ElMessage.error({ + dangerouslyUseHTMLString: true, + message: '数据过长' + }) + return await Promise.reject(response?.data) } return response },