diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java index 75f1458c..f20a8dfe 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/BadRequestException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.odboy.framework.exception.web; +package cn.odboy.framework.exception; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/ServerException.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/ServerException.java index 35bb3f05..3e061b6f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/ServerException.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/ServerException.java @@ -1,2 +1,42 @@ -package cn.odboy.framework.exception.web;public class ServerException { +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.odboy.framework.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; + +@Getter +public class ServerException extends RuntimeException { + + private Integer status = INTERNAL_SERVER_ERROR.value(); + + public ServerException(String msg) { + super(msg); + } + + public ServerException(HttpStatus status, String msg) { + super(msg); + this.status = status.value(); + } + + public ServerException(Throwable cause) { + super(cause.getMessage()); + this.status = INTERNAL_SERVER_ERROR.value(); + } } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java index f313955a..c941a029 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/ApiError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.odboy.framework.exception.web.handler; +package cn.odboy.framework.exception.handler; import lombok.Data; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java index 286040d9..15e26ece 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package cn.odboy.framework.exception.web.handler; +package cn.odboy.framework.exception.handler; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java index d8bd9dc6..64917deb 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java @@ -16,7 +16,7 @@ package cn.odboy.framework.mybatisplus.config; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; /** diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java index bc34f1b1..62b668ff 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpCmdGenUtil.java @@ -18,7 +18,7 @@ package cn.odboy.framework.mybatisplus.core; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsBaseUserTimeTb; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.*; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java index 2606cca5..ad5317be 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java @@ -20,7 +20,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsBaseUserTimeTb; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.mybatisplus.config.CsMpQuery; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java index 5c01ca6b..5c736bf9 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpServiceImpl.java @@ -19,7 +19,7 @@ package cn.odboy.framework.mybatisplus.core.interfaces; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.mybatisplus.core.CsMpQUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java index 97ae2594..4f6d568f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java @@ -18,7 +18,7 @@ package cn.odboy.framework.properties.model; import cn.odboy.base.CsObject; import cn.odboy.constant.CaptchaCodeEnum; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.util.CsStringUtil; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java index 8e77ca86..ff733b6a 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java @@ -16,7 +16,7 @@ package cn.odboy.framework.websocket.util; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.websocket.model.WsSidVo; import lombok.experimental.UtilityClass; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java index 157cfcb1..a1dc28b6 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java @@ -16,7 +16,7 @@ package cn.odboy.util; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import java.util.concurrent.atomic.AtomicLong; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java index 1a9d9a63..80694425 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java @@ -22,7 +22,7 @@ import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import cn.odboy.constant.FileTypeEnum; import cn.odboy.constant.SystemConst; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java index 30ce6abf..b667e5fe 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsValidUtil.java @@ -16,7 +16,7 @@ package cn.odboy.util; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import lombok.experimental.UtilityClass; import javax.validation.ConstraintViolation; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index b397e4d0..fcc7a1da 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -21,7 +21,7 @@ import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousPostMapping; import cn.odboy.constant.CaptchaCodeEnum; import cn.odboy.constant.SystemConst; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.dal.model.SystemUserInfoVo; @@ -39,7 +39,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 38d8af1e..bbb8a828 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -19,7 +19,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsPageResult; import cn.odboy.constant.FileTypeEnum; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; import cn.odboy.system.dal.model.SystemQueryStorageArgs; import cn.odboy.system.service.SystemLocalStorageService; @@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 1eda16f2..4e3f0deb 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -19,7 +19,7 @@ package cn.odboy.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.SystemMenuVo; import cn.odboy.system.dal.model.SystemQueryMenuArgs; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 2175e3a0..df279acd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -19,7 +19,7 @@ package cn.odboy.system.controller; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsPageResult; import cn.odboy.framework.context.CsSpringBeanHolder; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; @@ -30,7 +30,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index a357c5fc..13613e60 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -19,7 +19,7 @@ package cn.odboy.system.controller; import cn.hutool.core.lang.Dict; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.model.SystemCreateRoleArgs; import cn.odboy.system.dal.model.SystemQueryRoleArgs; @@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 9fd4db6a..5a059260 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -20,7 +20,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageArgs; import cn.odboy.base.CsPageResult; import cn.odboy.base.CsSelectOptionVo; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java index bb212122..ebb84b21 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.bizlock; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.redis.CsRedisHelper; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java index 0ca999a3..79537e06 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAccessDeniedHandler.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.framework.exception.web.handler.ApiError; +import cn.odboy.framework.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.HttpStatus; import org.springframework.security.access.AccessDeniedException; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java index 40509ec9..08910b7e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/JwtAuthenticationEntryPoint.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.framework.exception.web.handler.ApiError; +import cn.odboy.framework.exception.handler.ApiError; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index 2f04a787..4c54d08b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.permission.core.handler; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.SystemRoleCodeVo; import cn.odboy.system.dal.model.SystemUserJwtVo; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java index 1811c3b0..c499aa30 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.quartz; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import lombok.extern.slf4j.Slf4j; import org.quartz.*; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/OssStorageConfiguration.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/OssStorageConfiguration.java index 171a0667..e018ea25 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/OssStorageConfiguration.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/OssStorageConfiguration.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.storage; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.OSSConfigModel; import io.minio.MinioClient; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java index 54338e14..78133c4b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/local/MultipartConfig.java @@ -16,7 +16,7 @@ package cn.odboy.system.framework.storage.local; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java index 9bd204d5..bc8097aa 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java @@ -22,7 +22,7 @@ import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.OSSConfigModel; import cn.odboy.framework.properties.model.StorageOSSModel; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index c5bdcf20..64088eca 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -21,7 +21,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.SystemCreateDeptArgs; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index bf9f7fc9..457e03c5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -20,7 +20,7 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.constant.SystemCaptchaBizEnum; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index fd126404..c9a0de24 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -18,7 +18,7 @@ package cn.odboy.system.service; import cn.hutool.core.bean.BeanUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.model.SystemCreateJobArgs; import cn.odboy.system.dal.model.SystemQueryJobArgs; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 92f3fd41..da683051 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -20,7 +20,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IORuntimeException; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.server.core.CsFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index fea66c41..0b1824f5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -20,7 +20,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.odboy.framework.context.CsSpringBeanHolder; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.TransferProtocolConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 48277ed3..724a04b4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -20,7 +20,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.redis.CsRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 5ea20af9..720d3009 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -20,7 +20,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index 70ae276c..b3063d49 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -18,7 +18,7 @@ package cn.odboy.system.service; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.server.core.CsFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java index 871248d4..42e2a5cf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java @@ -19,7 +19,7 @@ package cn.odboy.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsPageResult; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.StorageOSSModel; import cn.odboy.framework.server.core.CsFileLocalUploadHelper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java index f5da5012..a983a839 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java @@ -16,7 +16,7 @@ package cn.odboy.system.util; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.mybatisplus.config.DataTypeEnum; import cn.odboy.util.CsCloseUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java index e2a7693e..88f5b9d7 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java @@ -18,7 +18,8 @@ package cn.odboy.task.core; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.context.CsSpringBeanHolder; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; +import cn.odboy.framework.exception.ServerException; import cn.odboy.task.constant.TaskJobKeys; import cn.odboy.task.dal.dataobject.TaskInstanceDetailTb; import cn.odboy.task.dal.dataobject.TaskInstanceInfoTb; @@ -180,7 +181,7 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob { }); } catch (Exception e) { taskInstanceDetailService.fastFailWithInfo(id, code, e.getMessage()); - throw new RuntimeException(e); + throw new ServerException(e); } } taskInstanceInfoService.fastSuccessWithData(id, dataMap); diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskManage.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskManage.java index 690eaba2..a8fd81ea 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskManage.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskManage.java @@ -18,7 +18,7 @@ package cn.odboy.task.core; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.context.CsSpringBeanHolder; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.constant.TaskChangeTypeEnum; import cn.odboy.task.constant.TaskJobKeys; import cn.odboy.task.constant.TaskStatusEnum; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskStepExecutor.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskStepExecutor.java index da1fdf5d..a8ba6c0c 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskStepExecutor.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskStepExecutor.java @@ -15,7 +15,7 @@ */ package cn.odboy.task.core; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.dal.model.TaskTemplateNodeVo; import org.quartz.JobDataMap; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeBuildJava.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeBuildJava.java index 53370224..baac1842 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeBuildJava.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeBuildJava.java @@ -16,7 +16,7 @@ package cn.odboy.task.core.impl; import cn.hutool.core.thread.ThreadUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.core.TaskStepCallback; import cn.odboy.task.core.TaskStepExecutor; import cn.odboy.task.dal.model.TaskTemplateNodeVo; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeDeployJava.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeDeployJava.java index 847f4b86..5b16e574 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeDeployJava.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeDeployJava.java @@ -16,7 +16,7 @@ package cn.odboy.task.core.impl; import cn.hutool.core.thread.ThreadUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.core.TaskStepCallback; import cn.odboy.task.core.TaskStepExecutor; import cn.odboy.task.dal.model.TaskTemplateNodeVo; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeInit.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeInit.java index 09a181c2..7a443394 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeInit.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeInit.java @@ -15,7 +15,7 @@ */ package cn.odboy.task.core.impl; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.core.TaskStepCallback; import cn.odboy.task.core.TaskStepExecutor; import cn.odboy.task.dal.model.TaskTemplateNodeVo; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeMergeBranch.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeMergeBranch.java index d3b85abf..13fe76f4 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeMergeBranch.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/core/impl/TaskStepNodeMergeBranch.java @@ -16,7 +16,7 @@ package cn.odboy.task.core.impl; import cn.hutool.core.thread.ThreadUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.core.TaskStepCallback; import cn.odboy.task.core.TaskStepExecutor; import cn.odboy.task.dal.model.TaskTemplateNodeVo; diff --git a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/service/impl/TaskInstanceStepDetailServiceImpl.java b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/service/impl/TaskInstanceStepDetailServiceImpl.java index b624f74f..fa4eedef 100644 --- a/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/service/impl/TaskInstanceStepDetailServiceImpl.java +++ b/cutejava/cutejava-module-task/src/main/java/cn/odboy/task/service/impl/TaskInstanceStepDetailServiceImpl.java @@ -16,7 +16,7 @@ package cn.odboy.task.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.odboy.framework.exception.web.BadRequestException; +import cn.odboy.framework.exception.BadRequestException; import cn.odboy.task.constant.TaskStatusEnum; import cn.odboy.task.dal.dataobject.TaskInstanceStepDetailTb; import cn.odboy.task.dal.mysql.TaskInstanceStepDetailMapper;