From b9a76dc2d154ff199d157766df678783273ec2ff Mon Sep 17 00:00:00 2001 From: zhuoda Date: Thu, 7 Oct 2021 21:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=BE=88=E5=A4=9A?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E3=80=81=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=BE=88=E5=A4=9A=E5=8C=85=E7=9A=84=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E8=B7=A8=E5=BA=A6=E5=A5=BD=E5=87=A0=E5=A4=A9=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E4=BA=9B=E4=B8=8D=E8=AE=B0=E5=BE=97=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{anno => annoation}/NoNeedLogin.java | 2 +- .../{anno => annoation}/NoValidPrivilege.java | 2 +- .../service/common/code/UserErrorCode.java | 2 - .../common/constant/ApiUrlPrefixConst.java | 20 --- .../service/common/constant/CommonConst.java | 78 --------- .../common/constant/NumberLimitConst.java | 39 ----- .../common/constant/RedisKeyConst.java | 8 +- .../common/constant/RequestHeaderConst.java | 2 +- .../service/common/constant/StringConst.java | 37 +++++ .../service/common/constant/SystemConst.java | 15 -- .../common/constant/UrlPrefixConst.java | 15 ++ .../controller/AdminBaseController.java | 16 -- .../controller/SupportBaseController.java | 4 +- .../controller/SystemBaseController.java | 16 ++ .../{PageBaseDTO.java => PageParamDTO.java} | 13 +- ...ironmentBO.java => SystemEnvironment.java} | 6 +- .../service/common/domain/ValidateData.java | 16 ++ .../service/common/domain/ValidateList.java | 148 ++++++++++++++++++ .../{enumconst => enumeration}/BaseEnum.java | 2 +- .../GenderEnum.java | 2 +- .../SystemEnvironmentEnum.java | 2 +- ...sException.java => BusinessException.java} | 14 +- ...=> SecurityAuthenticationFailHandler.java} | 2 +- ...ource.java => SecurityMetadataSource.java} | 16 +- ...Matchers.java => SecurityUrlMatchers.java} | 7 +- .../serializer/FileKeyVoSerializer.java | 2 +- .../common/swagger/ApiModelPropertyEnum.java | 2 +- .../SwaggerApiModelPropertyEnumPlugin.java | 2 +- .../{ => common}/util/SmartAesUtil.java | 2 +- .../{ => common}/util/SmartBaseEnumUtil.java | 4 +- .../{ => common}/util/SmartBeanUtil.java | 2 +- .../util/SmartBigDecimalUtil.java | 2 +- .../util/SmartCollectionUtil.java | 2 +- .../{ => common}/util/SmartDigestUtil.java | 2 +- .../util/SmartEasyPoiExcelUtil.java | 2 +- .../util/SmartEmployeeTokenUtil.java | 2 +- .../{ => common}/util/SmartFileUtil.java | 2 +- .../{ => common}/util/SmartHttpUtil.java | 2 +- .../{ => common}/util/SmartIPUtil.java | 2 +- .../{ => common}/util/SmartPageUtil.java | 8 +- .../{ => common}/util/SmartRandomUtil.java | 2 +- .../{ => common}/util/SmartStringUtil.java | 2 +- .../util/SmartVerificationUtil.java | 2 +- .../util/date/SmartDateFormatterEnum.java | 2 +- .../util/date}/SmartDateUtil.java | 2 +- .../util/date/SmartLocalDateUtil.java | 2 +- .../{ => common}/util/excel/SmartExcel.java | 2 +- .../util/excel/SmartExcelFileType.java | 2 +- .../util/excel/SmartExcelReader.java | 4 +- .../{ => common}/util/excel/SmartSheet.java | 2 +- .../{en => enumeration}/CheckEnum.java | 4 +- .../{en => enumeration}/EnumValidator.java | 4 +- .../smartadmin/service/config/DateConfig.java | 4 +- .../service/config/SecurityConfig.java | 20 +-- .../service/config/SecurityMethodConfig.java | 10 +- .../service/config/SwaggerConfig.java | 2 +- .../config/SystemEnvironmentConfig.java | 10 +- ...enFilter.java => SecurityTokenFilter.java} | 12 +- .../handler/GlobalExceptionHandler.java | 129 +++++++++++++++ .../handler/SmartGlobalExceptionHandler.java | 106 ------------- .../business/category/CategoryController.java | 4 +- .../category/CategoryQueryService.java | 22 +-- .../business/category/CategoryService.java | 14 +- .../category/constant/CategoryTypeEnum.java | 2 +- .../business/goods/GoodsController.java | 6 +- .../module/business/goods/GoodsService.java | 4 +- .../goods/constant/GoodsTypeEnum.java | 2 +- .../business/goods/domain/GoodsQueryDTO.java | 4 +- .../business/notice/NoticeController.java | 10 +- .../module/business/notice/NoticeService.java | 8 +- .../notice/domain/dto/NoticeQueryDTO.java | 4 +- .../support/beanrecord/BeanRecordService.java | 8 +- .../beanrecord/annotation/FieldEnumValue.java | 2 +- .../support/captcha/CaptchaController.java | 2 +- .../support/captcha/CaptchaService.java | 10 +- .../{CaptchaDTO.java => CaptchaForm.java} | 2 +- .../datatracer/DataTracerController.java | 4 +- .../support/datatracer/DataTracerService.java | 2 +- .../constant/DataTracerBusinessTypeEnum.java | 2 +- .../constant/DataTracerOperateTypeEnum.java | 2 +- .../datatracer/domain/DataTracerDTO.java | 2 +- .../domain/DataTracerQueryForm.java | 4 +- .../file/domain/FileFolderTypeEnum.java | 2 +- .../support/file/domain/dto/FileQueryDTO.java | 4 +- .../support/file/service/FileService.java | 32 ++-- .../file/service/IFileStorageService.java | 4 +- .../heartbeat/HeartBeatController.java | 6 +- .../heartbeat/HeartBeatRecordHandler.java | 2 +- .../support/heartbeat/HeartBeatService.java | 8 +- .../heartbeat/core/HeartBeatRunnable.java | 2 +- .../idgenerator/IdGeneratorController.java | 5 +- .../idgenerator/constant/IdGeneratorEnum.java | 2 +- .../constant/IdGeneratorRuleTypeEnum.java | 2 +- .../{ => service}/IdGeneratorService.java | 61 ++++---- .../operatelog/OperateLogController.java | 18 +-- .../support/operatelog/OperateLogService.java | 6 +- .../{ => annoation}/OperateLog.java | 2 +- .../OperateLogAspect.java} | 21 +-- ...onfigDTO.java => OperateLogConfigDTO.java} | 4 +- .../domain/dto/OperateLogQueryDTO.java | 4 +- ...LogUserDTO.java => OperateLogUserDTO.java} | 2 +- .../support/reload/SmartReloadCommand.java | 8 +- .../core/AbstractSmartReloadCommand.java | 24 +-- .../reload/core/SmartReloadManager.java | 16 +- .../core/{anno => annoation}/SmartReload.java | 2 +- .../{ReloadItem.java => SmartReloadItem.java} | 2 +- ...loadObject.java => SmartReloadObject.java} | 2 +- .../core/thread/SmartReloadRunnable.java | 34 ++-- ...mitAspect.java => RepeatSubmitAspect.java} | 9 +- .../{ => annoation}/RepeatSubmit.java | 2 +- .../ResponseEncryptDecryptAspect.java | 4 +- .../system/datascope/DataScopeController.java | 4 +- .../system/datascope/MyBatisPlugin.java | 2 +- .../datascope/constant/DataScopeTypeEnum.java | 2 +- .../constant/DataScopeViewTypeEnum.java | 2 +- .../constant/DataScopeWhereInTypeEnum.java | 2 +- .../datascope/service/DataScopeService.java | 2 +- .../service/DataScopeSqlConfigService.java | 2 +- .../service/DataScopeViewService.java | 2 +- .../department/DepartmentController.java | 4 +- .../system/department/DepartmentService.java | 14 +- .../department/DepartmentTreeService.java | 6 +- .../module/system/employee/EmployeeConst.java | 15 ++ .../system/employee/EmployeeController.java | 6 +- .../system/employee/EmployeeService.java | 13 +- .../employee/domain/dto/EmployeeAddDTO.java | 4 +- .../employee/domain/dto/EmployeeLoginDTO.java | 6 +- .../employee/domain/dto/EmployeeQueryDTO.java | 4 +- .../domain/dto/EmployeeUpdatePwdDTO.java | 2 +- .../domain/entity/EmployeeEntity.java | 2 +- .../system/employee/domain/vo/EmployeeVO.java | 2 +- .../system/login/EmployeeLoginController.java | 8 +- .../system/login/EmployeeLoginService.java | 10 +- .../login/EmployeeLoginTokenService.java | 10 +- .../login/domain/EmployeeLoginInfoDTO.java | 2 +- .../module/system/menu/MenuController.java | 6 +- .../system/menu/MenuEmployeeService.java | 2 +- .../system/menu/MenuPermissionService.java | 6 +- .../module/system/menu/MenuService.java | 8 +- .../module/system/menu/RequestUrlService.java | 4 +- .../system/menu/constant/MenuTypeEnum.java | 2 +- .../system/role/basic/RoleController.java | 4 +- .../module/system/role/basic/RoleService.java | 2 +- .../role/basic/domain/dto/RoleQueryDTO.java | 4 +- .../roleemployee/RoleEmployeeController.java | 4 +- .../roleemployee/RoleEmployeeService.java | 4 +- .../role/rolemenu/RoleMenuController.java | 4 +- .../system/role/rolemenu/RoleMenuService.java | 6 +- .../systemconfig/SystemConfigController.java | 2 +- .../systemconfig/SystemConfigKeyEnum.java | 2 +- .../systemconfig/SystemConfigService.java | 8 +- .../domain/SystemConfigQueryDTO.java | 4 +- 152 files changed, 768 insertions(+), 685 deletions(-) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/{anno => annoation}/NoNeedLogin.java (85%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/{anno => annoation}/NoValidPrivilege.java (79%) delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/StringConst.java delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/UrlPrefixConst.java delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SystemBaseController.java rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/{PageBaseDTO.java => PageParamDTO.java} (80%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/{SystemEnvironmentBO.java => SystemEnvironment.java} (70%) create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateData.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateList.java rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/{enumconst => enumeration}/BaseEnum.java (97%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/{enumconst => enumeration}/GenderEnum.java (88%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/{enumconst => enumeration}/SystemEnvironmentEnum.java (93%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/{SmartBusinessException.java => BusinessException.java} (51%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/{SmartSecurityAuthenticationFailHandler.java => SecurityAuthenticationFailHandler.java} (93%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/{SmartSecurityMetadataSource.java => SecurityMetadataSource.java} (85%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/{SmartSecurityUrlMatchers.java => SecurityUrlMatchers.java} (94%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartAesUtil.java (98%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartBaseEnumUtil.java (96%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartBeanUtil.java (96%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartBigDecimalUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartCollectionUtil.java (97%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartDigestUtil.java (90%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartEasyPoiExcelUtil.java (98%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartEmployeeTokenUtil.java (95%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartFileUtil.java (97%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartHttpUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartIPUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartPageUtil.java (90%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartRandomUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartStringUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/SmartVerificationUtil.java (98%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/date/SmartDateFormatterEnum.java (96%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{util => common/util/date}/SmartDateUtil.java (99%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/date/SmartLocalDateUtil.java (98%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/excel/SmartExcel.java (97%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/excel/SmartExcelFileType.java (58%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/excel/SmartExcelReader.java (88%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/{ => common}/util/excel/SmartSheet.java (98%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/{en => enumeration}/CheckEnum.java (88%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/{en => enumeration}/EnumValidator.java (92%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/{SmartSecurityTokenFilter.java => SecurityTokenFilter.java} (84%) create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/GlobalExceptionHandler.java delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/{CaptchaDTO.java => CaptchaForm.java} (94%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/{ => service}/IdGeneratorService.java (78%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/{ => annoation}/OperateLog.java (95%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/{SmartOperateLogAspect.java => annoation/OperateLogAspect.java} (93%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/{SmartOperateLogConfigDTO.java => OperateLogConfigDTO.java} (88%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/{SmartOperateLogUserDTO.java => OperateLogUserDTO.java} (91%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/{anno => annoation}/SmartReload.java (96%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/{ReloadItem.java => SmartReloadItem.java} (91%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/{ReloadObject.java => SmartReloadObject.java} (93%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/{SmartRepeatSubmitAspect.java => RepeatSubmitAspect.java} (90%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/{ => annoation}/RepeatSubmit.java (97%) create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeConst.java diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoNeedLogin.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoNeedLogin.java similarity index 85% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoNeedLogin.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoNeedLogin.java index ec62643e..3e2c9c2d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoNeedLogin.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoNeedLogin.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.common.anno; +package net.lab1024.smartadmin.service.common.annoation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoValidPrivilege.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoValidPrivilege.java similarity index 79% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoValidPrivilege.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoValidPrivilege.java index 15e8ade4..fb7f11e9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/anno/NoValidPrivilege.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/annoation/NoValidPrivilege.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.common.anno; +package net.lab1024.smartadmin.service.common.annoation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/code/UserErrorCode.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/code/UserErrorCode.java index ae4ab032..b2dc2a42 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/code/UserErrorCode.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/code/UserErrorCode.java @@ -32,8 +32,6 @@ public enum UserErrorCode implements ErrorCode { LOGIN_FAILED(30010, "用户名或密码错误!"), - VERIFICATION_CODE_INVALID(30011, "验证码错误或已过期，请输入正确的验证码"), - ; private final int code; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java deleted file mode 100644 index 93d860b2..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.lab1024.smartadmin.service.common.constant; - -/** - * [ ] - * - * @author luoyi - * @date 2021/9/26 17:50 - */ -public class ApiUrlPrefixConst { - - /** - * 基础 api 前缀 - */ - public static final String API_PREFIX_SUPPORT = "/support"; - - /** - * 后管 api 前缀 - */ - public static final String API_PREFIX_ADMIN = "/admin"; -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java deleted file mode 100644 index d825166b..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java +++ /dev/null @@ -1,78 +0,0 @@ -package net.lab1024.smartadmin.service.common.constant; - -import com.google.common.collect.Interner; -import com.google.common.collect.Interners; - -import java.math.BigDecimal; -import java.util.*; - -/** - * [ 通用常量 ] - * - * @author zhuoda - */ -public class CommonConst { - - public static final int ZERO = 0; - - public static final long ONE = 1; - - /** - * 全局通用分隔符 - */ - public static final String SEPARATOR = ","; - - /** - * 全局通用分隔符 下划线 - */ - public static final String UNDERLINE = "_"; - - /** - * 全局通用分隔符 - */ - public static final Character SEPARATOR_CHAR = ','; - - /** - * 全局通用分隔符 斜杠 - */ - public static final String SEPARATOR_SLASH = "/"; - - /** - * 空字符串 - */ - public static final String EMPTY_STR = ""; - - /** - * 全局通用 默认id - */ - public static final long DEFAULT_ID = 0L; - - /** - * 100 常量 - */ - public static final Integer ONE_HUNDRED = 100; - - /** - * 100 常量 - */ - public static final BigDecimal ONE_HUNDRED_DECIMAL = new BigDecimal(100); - - /** - * 全局通用 默认父级id 最顶级 - */ - public static final Long DEFAULT_PARENT_ID = 0L; - - /** - * 空MaP - */ - public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap<>(0)); - - /** - * 空 list - */ - public static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0)); - - public static final Interner STRING_POOL = Interners.newWeakInterner(); - - -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java deleted file mode 100644 index 40040cf0..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.lab1024.smartadmin.service.common.constant; - -/** - * [ ] - * - * @author luoyi - * @date 2021/9/26 17:45 - */ -public class NumberLimitConst { - /** - * 用户昵称 - */ - public static final int USER_NICKNAME = 15; - - /** - * 短信验证码长度 - */ - public static final int SMS_CODE = 6; - - /** - * 短信发送间隔 秒 - */ - public static final int SMS_SEND_INTERVAL = 60; - - /** - * 短信有效期 秒 - */ - public static final int SMS_VALID_SECOND = 300; - - /** - * 验证码短信 每天的限制 - */ - public static final int SMS_DAY_LIMIT = 10; - - /** - * 文件名称长度 - */ - public static final int FILE_NAME = 100; -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RedisKeyConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RedisKeyConst.java index 5a73ec8f..dfd0c7a1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RedisKeyConst.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RedisKeyConst.java @@ -8,17 +8,17 @@ package net.lab1024.smartadmin.service.common.constant; */ public class RedisKeyConst { - public class Base { + public static final String PROJECT = "smart:"; - private static final String PROJECT = "base:"; + public class Support { public static final String FILE_URL = PROJECT + "file:"; - public static final String FILE_VO = PROJECT + "fileVO:"; + public static final String FILE_VO = PROJECT + "file-vo:"; public static final String LOCK = PROJECT + "lock:"; - public static final String ID_GENERATOR = LOCK + "id:"; + public static final String ID_GENERATOR = LOCK + "id-generator:"; public static final String CAPTCHA = PROJECT + "captcha:"; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java index 42045dd2..e606ccdb 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.common.constant; /** * [ ] * - * @author luoyi + * @author 罗伊 * @date 2021/9/26 17:43 */ public class RequestHeaderConst { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/StringConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/StringConst.java new file mode 100644 index 00000000..498ba43b --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/StringConst.java @@ -0,0 +1,37 @@ +package net.lab1024.smartadmin.service.common.constant; + +/** + * [ 通用常量 ] + * + * @author 卓大 + */ +public class StringConst { + + /** + * 全局通用分隔符 + */ + public static final String SEPARATOR = ","; + + /** + * 全局通用分隔符 下划线 + */ + public static final String UNDERLINE = "_"; + + /** + * 全局通用分隔符 + */ + public static final Character SEPARATOR_CHAR = ','; + + /** + * 全局通用分隔符 斜杠 + */ + public static final String SEPARATOR_SLASH = "/"; + + /** + * 空字符串 + */ + public static final String EMPTY_STR = ""; + + + +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java deleted file mode 100644 index 88cda58f..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.lab1024.smartadmin.service.common.constant; - -/** - * @author 罗伊 - * @date 2021-01-31 0:00 - */ -public class SystemConst { - - public static final class Password { - - public static final String DEFAULT = "123456"; - - public static final String SALT_FORMAT = "smartAdmin_%s"; - } -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/UrlPrefixConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/UrlPrefixConst.java new file mode 100644 index 00000000..0c709d3f --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/UrlPrefixConst.java @@ -0,0 +1,15 @@ +package net.lab1024.smartadmin.service.common.constant; + +/** + * redis key 常量类 + * + * @author 卓大 + * @date 2021/10/03 20:48 + */ +public class UrlPrefixConst { + + public static final String SYSTEM = "/system"; + + public static final String SUPPORT = "/support"; + +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java deleted file mode 100644 index 07a86b13..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.lab1024.smartadmin.service.common.controller; - -import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst; -import net.lab1024.smartadmin.service.common.constant.CommonConst; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author: 卓大 - * @create: 2020-03-31 08:54 PM from win10 - */ -@Slf4j -@RequestMapping(ApiUrlPrefixConst.API_PREFIX_ADMIN) -public class AdminBaseController { - -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java index 20f09906..aca32b5b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.common.controller; -import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst; +import net.lab1024.smartadmin.service.common.constant.UrlPrefixConst; import org.springframework.web.bind.annotation.RequestMapping; /** @@ -9,6 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author 胡克 * @date 2019/10/18 11:51 */ -@RequestMapping(ApiUrlPrefixConst.API_PREFIX_SUPPORT) +@RequestMapping(UrlPrefixConst.SUPPORT) public class SupportBaseController { } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SystemBaseController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SystemBaseController.java new file mode 100644 index 00000000..578fa2df --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SystemBaseController.java @@ -0,0 +1,16 @@ +package net.lab1024.smartadmin.service.common.controller; + +import lombok.extern.slf4j.Slf4j; +import net.lab1024.smartadmin.service.common.constant.UrlPrefixConst; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * 系统controller基类 + * + * @author 卓大 + * @date 2021/10/02 11:51 + */ +@RequestMapping(UrlPrefixConst.SYSTEM) +public class SystemBaseController { + +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageBaseDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageParamDTO.java similarity index 80% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageBaseDTO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageParamDTO.java index 971f5bc9..62541458 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageBaseDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/PageParamDTO.java @@ -6,10 +6,7 @@ import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Range; import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; import java.util.List; /** @@ -19,18 +16,20 @@ import java.util.List; * @Date Created in 2017/10/28 16:19 */ @Data -public class PageBaseDTO { +public class PageParamDTO { @ApiModelProperty(value = "页码(不能为空)", required = true, example = "1") @NotNull(message = "分页参数不能为空") - @Min(value = 1, message = "分页参数最小1") private Integer pageNum; @ApiModelProperty(value = "每页数量(不能为空)", required = true, example = "10") @NotNull(message = "每页数量不能为空") - @Range(min = 1, max = 200, message = "每页数量1-200") + @Max(value = 200, message = "每页最大为200") private Integer pageSize; + @ApiModelProperty("是否查询总条数") + protected Boolean searchCount; + @ApiModelProperty("排序字段集合") @Size(max = 10, message = "排序字段最多10") @Valid diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironment.java similarity index 70% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironment.java index bbf27d48..6ee1d007 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironment.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.common.domain; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; +import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; /** * 系统环境 @@ -13,12 +13,12 @@ import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; */ @AllArgsConstructor @Getter -public class SystemEnvironmentBO { +public class SystemEnvironment { /** * 是否位生产环境 */ - private Boolean isProd; + private boolean isProd; /** * 当前环境 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateData.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateData.java new file mode 100644 index 00000000..af2a23eb --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateData.java @@ -0,0 +1,16 @@ +package net.lab1024.smartadmin.service.common.domain; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author: listen + * @create: 2020/10/16 + */ +@Data +public class ValidateData { + + @NotNull(message = "数据不能为空哦") + private T data; +} \ No newline at end of file diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateList.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateList.java new file mode 100644 index 00000000..45840595 --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/ValidateList.java @@ -0,0 +1,148 @@ +package net.lab1024.smartadmin.service.common.domain; + +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import java.util.*; + +/** + * @author: zhuoda + * @create: 2020-02-03 17:37 PM from win10 + */ +public class ValidateList implements List { + + @Valid + @NotEmpty(message = "数据长度不能为空哦") + private List list; + + public ValidateList() { + this.list = new ArrayList<>(); + } + + public ValidateList(List list) { + this.list = list; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + @Override + public int size() { + return list.size(); + } + + @Override + public boolean isEmpty() { + return list.isEmpty(); + } + + @Override + public boolean contains(Object o) { + return list.contains(o); + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + + @Override + public Object[] toArray() { + return list.toArray(); + } + + @Override + public T[] toArray(T[] a) { + return list.toArray(a); + } + + @Override + public boolean add(E e) { + return list.add(e); + } + + @Override + public boolean remove(Object o) { + return list.remove(o); + } + + @Override + public boolean containsAll(Collection c) { + return list.containsAll(c); + } + + @Override + public boolean addAll(Collection c) { + return list.addAll(c); + } + + @Override + public boolean addAll(int index, Collection c) { + return list.addAll(index, c); + } + + @Override + public boolean removeAll(Collection c) { + return list.removeAll(c); + } + + @Override + public boolean retainAll(Collection c) { + return list.retainAll(c); + } + + @Override + public void clear() { + list.clear(); + } + + @Override + public E get(int index) { + return list.get(index); + } + + @Override + public E set(int index, E element) { + return list.set(index, element); + } + + @Override + public void add(int index, E element) { + list.add(index, element); + } + + @Override + public E remove(int index) { + return list.remove(index); + } + + @Override + public int indexOf(Object o) { + return list.indexOf(o); + } + + @Override + public int lastIndexOf(Object o) { + return list.lastIndexOf(o); + } + + @Override + public ListIterator listIterator() { + return list.listIterator(); + } + + @Override + public ListIterator listIterator(int index) { + return list.listIterator(index); + } + + @Override + public List subList(int fromIndex, int toIndex) { + return list.subList(fromIndex, toIndex); + } + +} \ No newline at end of file diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/BaseEnum.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/BaseEnum.java index c5f033b5..ce6b325a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/BaseEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.common.enumconst; +package net.lab1024.smartadmin.service.common.enumeration; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONAware; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/GenderEnum.java similarity index 88% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/GenderEnum.java index 7ece3654..7cfe1770 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/GenderEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.common.enumconst; +package net.lab1024.smartadmin.service.common.enumeration; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/SystemEnvironmentEnum.java similarity index 93% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/SystemEnvironmentEnum.java index 0d497534..3b659c95 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumeration/SystemEnvironmentEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.common.enumconst; +package net.lab1024.smartadmin.service.common.enumeration; import lombok.AllArgsConstructor; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/SmartBusinessException.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/BusinessException.java similarity index 51% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/SmartBusinessException.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/BusinessException.java index 542a56a7..a37d648e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/SmartBusinessException.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/exception/BusinessException.java @@ -8,28 +8,28 @@ import net.lab1024.smartadmin.service.common.code.ErrorCode; * @author 罗伊 * @date 2020/8/25 11:57 */ -public class SmartBusinessException extends RuntimeException { +public class BusinessException extends RuntimeException { - public SmartBusinessException() { + public BusinessException() { } - public SmartBusinessException(ErrorCode errorCode) { + public BusinessException(ErrorCode errorCode) { super(errorCode.getMsg()); } - public SmartBusinessException(String message) { + public BusinessException(String message) { super(message); } - public SmartBusinessException(String message, Throwable cause) { + public BusinessException(String message, Throwable cause) { super(message, cause); } - public SmartBusinessException(Throwable cause) { + public BusinessException(Throwable cause) { super(cause); } - public SmartBusinessException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + public BusinessException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityAuthenticationFailHandler.java similarity index 93% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityAuthenticationFailHandler.java index 0febc68b..f777a388 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityAuthenticationFailHandler.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityAuthenticationFailHandler.java @@ -18,7 +18,7 @@ import java.io.IOException; * @author * @date */ -public class SmartSecurityAuthenticationFailHandler implements AuthenticationEntryPoint { +public class SecurityAuthenticationFailHandler implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityMetadataSource.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityMetadataSource.java similarity index 85% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityMetadataSource.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityMetadataSource.java index d0b34f83..8173ddd1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityMetadataSource.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityMetadataSource.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.common.security; -import net.lab1024.smartadmin.service.common.anno.NoValidPrivilege; +import net.lab1024.smartadmin.service.common.annoation.NoValidPrivilege; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.prepost.*; @@ -22,7 +22,7 @@ import java.util.*; * @author 罗伊 * @date 2021-08-30 23:08 */ -public class SmartSecurityMetadataSource extends PrePostAnnotationSecurityMetadataSource { +public class SecurityMetadataSource extends PrePostAnnotationSecurityMetadataSource { public static final String PRIVILEGE_CHECK_NAME = "privilegeCheck"; @@ -30,12 +30,12 @@ public class SmartSecurityMetadataSource extends PrePostAnnotationSecurityMetada private final PrePostInvocationAttributeFactory attributeFactory; - private SmartSecurityUrlMatchers smartSecurityUrlMatchers; + private SecurityUrlMatchers securityUrlMatchers; - public SmartSecurityMetadataSource(PrePostInvocationAttributeFactory attributeFactory, SmartSecurityUrlMatchers smartSecurityUrlMatchers) { + public SecurityMetadataSource(PrePostInvocationAttributeFactory attributeFactory, SecurityUrlMatchers securityUrlMatchers) { super(attributeFactory); this.attributeFactory = attributeFactory; - this.smartSecurityUrlMatchers = smartSecurityUrlMatchers; + this.securityUrlMatchers = securityUrlMatchers; } @@ -43,7 +43,7 @@ public class SmartSecurityMetadataSource extends PrePostAnnotationSecurityMetada public Collection getAttributes(Method method, Class targetClass) { //只对固定的包的所有接口进行控制 - if (!targetClass.getName().startsWith(smartSecurityUrlMatchers.getValidPackage())) { + if (!targetClass.getName().startsWith(securityUrlMatchers.getValidPackage())) { return super.getAttributes(method, targetClass); } //自己的控制 @@ -77,9 +77,9 @@ public class SmartSecurityMetadataSource extends PrePostAnnotationSecurityMetada antPathMatcher.setCaseSensitive(false); antPathMatcher.setTrimTokens(true); //无需验证的URL集合 - List noValidUrlList = smartSecurityUrlMatchers.getNoValidUrl(); + List noValidUrlList = securityUrlMatchers.getNoValidUrl(); //获取方法的请求路径 - Set methodUrl = smartSecurityUrlMatchers.getMethodUrl(method); + Set methodUrl = securityUrlMatchers.getMethodUrl(method); if (this.contain(antPathMatcher, noValidUrlList, methodUrl)) { return super.getAttributes(method, targetClass); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityUrlMatchers.java similarity index 94% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityUrlMatchers.java index f8bd24fe..21025187 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SecurityUrlMatchers.java @@ -2,9 +2,7 @@ package net.lab1024.smartadmin.service.common.security; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.anno.NoNeedLogin; -import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.annoation.NoNeedLogin; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +28,7 @@ import java.util.Set; */ @Slf4j @Component -public class SmartSecurityUrlMatchers { +public class SecurityUrlMatchers { @Value("${project.module}") private String scanPackage; @@ -70,7 +68,6 @@ public class SmartSecurityUrlMatchers { ignoreUrl.add("/swagger-resources/**"); ignoreUrl.add("/webjars/**"); ignoreUrl.add("/*/api-docs"); - ignoreUrl.add(ApiUrlPrefixConst.API_PREFIX_SUPPORT + "/**"); log.info("忽略URL：{}", ignoreUrl); return ignoreUrl; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/serializer/FileKeyVoSerializer.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/serializer/FileKeyVoSerializer.java index 86426ea9..ab1ddb88 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/serializer/FileKeyVoSerializer.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/serializer/FileKeyVoSerializer.java @@ -19,7 +19,7 @@ import java.util.List; * @author 罗伊 * @date 2020/8/15 15:06 */ -public class FileKeyVoSerializer extends JsonSerializer { +public class FileKeyVOSerializer extends JsonSerializer { @Autowired private FileService fileService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java index cb20ad0e..ba1d563f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.common.swagger; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java index ecf59d08..c69114bd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.common.swagger; import com.google.common.base.Function; import com.google.common.base.Optional; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartAesUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartAesUtil.java similarity index 98% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartAesUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartAesUtil.java index 629db943..197fe8a6 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartAesUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartAesUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import lombok.extern.slf4j.Slf4j; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java index cb2c3211..4ab779a3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java @@ -1,6 +1,6 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import java.util.List; import java.util.Objects; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBeanUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBeanUtil.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBeanUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBeanUtil.java index 01eaa774..cf37bc45 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBeanUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBeanUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.springframework.beans.BeanUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBigDecimalUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBigDecimalUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBigDecimalUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBigDecimalUtil.java index 0fab9911..6b7130bc 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBigDecimalUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBigDecimalUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartCollectionUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartCollectionUtil.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartCollectionUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartCollectionUtil.java index 110b4c79..a8bcfb26 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartCollectionUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartCollectionUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.apache.commons.collections4.CollectionUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDigestUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartDigestUtil.java similarity index 90% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDigestUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartDigestUtil.java index e17a7432..370d9f29 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDigestUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartDigestUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.apache.commons.codec.digest.DigestUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEasyPoiExcelUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEasyPoiExcelUtil.java similarity index 98% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEasyPoiExcelUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEasyPoiExcelUtil.java index edfda2ad..4e0c2c4f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEasyPoiExcelUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEasyPoiExcelUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEmployeeTokenUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEmployeeTokenUtil.java similarity index 95% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEmployeeTokenUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEmployeeTokenUtil.java index 0c1ad6f1..540f3635 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartEmployeeTokenUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartEmployeeTokenUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartFileUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartFileUtil.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartFileUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartFileUtil.java index 8f84fc2d..4e84e28c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartFileUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartFileUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import java.io.*; import java.nio.charset.Charset; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartHttpUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartHttpUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartHttpUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartHttpUtil.java index d9f2ed14..7182cf9f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartHttpUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartHttpUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartIPUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartIPUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartIPUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartIPUtil.java index 594d6372..f4a482a9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartIPUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartIPUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartPageUtil.java similarity index 90% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartPageUtil.java index bee4103b..0ab5d5f4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartPageUtil.java @@ -1,8 +1,8 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import org.apache.commons.collections4.CollectionUtils; @@ -23,10 +23,10 @@ public class SmartPageUtil { * @param baseDTO * @return */ - public static Page convert2PageQuery(PageBaseDTO baseDTO) { + public static Page convert2PageQuery(PageParamDTO baseDTO) { Page page = new Page<>(baseDTO.getPageNum(), baseDTO.getPageSize()); // 设置排序字段 - List sortItemList = baseDTO.getSortItemList(); + List sortItemList = baseDTO.getSortItemList(); if (CollectionUtils.isNotEmpty(sortItemList)) { List orderItemList = sortItemList.stream().map(e -> new OrderItem(e.getColumn(), e.getIsAsc())).collect(Collectors.toList()); page.setOrders(orderItemList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartRandomUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartRandomUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartRandomUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartRandomUtil.java index ae64fc4b..a35d633e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartRandomUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartRandomUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.RandomUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartStringUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartStringUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartStringUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartStringUtil.java index c0d91e0f..abb12ee2 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartStringUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartStringUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import org.apache.commons.lang3.StringUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartVerificationUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartVerificationUtil.java similarity index 98% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartVerificationUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartVerificationUtil.java index 62ae063d..4b480278 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartVerificationUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartVerificationUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util; import java.util.regex.Pattern; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartDateFormatterEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateFormatterEnum.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartDateFormatterEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateFormatterEnum.java index 0ed67613..f5cd0dbf 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartDateFormatterEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateFormatterEnum.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util.date; +package net.lab1024.smartadmin.service.common.util.date; import java.time.format.DateTimeFormatter; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDateUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateUtil.java similarity index 99% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDateUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateUtil.java index acdaaeb5..4cb7438a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartDateUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartDateUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util; +package net.lab1024.smartadmin.service.common.util.date; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartLocalDateUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartLocalDateUtil.java similarity index 98% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartLocalDateUtil.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartLocalDateUtil.java index 3952303b..3e70404b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/date/SmartLocalDateUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/date/SmartLocalDateUtil.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util.date; +package net.lab1024.smartadmin.service.common.util.date; import java.time.*; import java.time.format.TextStyle; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcel.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcel.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcel.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcel.java index d9f6bb02..ae3e5988 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcel.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcel.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util.excel; +package net.lab1024.smartadmin.service.common.util.excel; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelFileType.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelFileType.java similarity index 58% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelFileType.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelFileType.java index f65658f9..372286db 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelFileType.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelFileType.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util.excel; +package net.lab1024.smartadmin.service.common.util.excel; /** * @author 卓大 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelReader.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelReader.java similarity index 88% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelReader.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelReader.java index 439c78e2..2bccaa00 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartExcelReader.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartExcelReader.java @@ -1,11 +1,11 @@ -package net.lab1024.smartadmin.service.util.excel; +package net.lab1024.smartadmin.service.common.util.excel; /** * @author 卓大 * @Date 2020/8/10 */ -import net.lab1024.smartadmin.service.util.SmartFileUtil; +import net.lab1024.smartadmin.service.common.util.SmartFileUtil; import java.io.File; import java.io.FileInputStream; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartSheet.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartSheet.java similarity index 98% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartSheet.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartSheet.java index 836657cd..988d0541 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/excel/SmartSheet.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/excel/SmartSheet.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.util.excel; +package net.lab1024.smartadmin.service.common.util.excel; import org.apache.poi.ss.usermodel.Cell; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/CheckEnum.java similarity index 88% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/CheckEnum.java index e0aaa780..69667bef 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/CheckEnum.java @@ -1,7 +1,7 @@ -package net.lab1024.smartadmin.service.common.validator.en; +package net.lab1024.smartadmin.service.common.validator.enumeration; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/EnumValidator.java similarity index 92% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/EnumValidator.java index 33cf83e7..fcf31e1b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/enumeration/EnumValidator.java @@ -1,7 +1,7 @@ -package net.lab1024.smartadmin.service.common.validator.en; +package net.lab1024.smartadmin.service.common.validator.enumeration; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DateConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DateConfig.java index c1f91c40..8d653c8a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DateConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/DateConfig.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import net.lab1024.smartadmin.service.util.date.SmartDateFormatterEnum; -import net.lab1024.smartadmin.service.util.date.SmartLocalDateUtil; +import net.lab1024.smartadmin.service.common.util.date.SmartDateFormatterEnum; +import net.lab1024.smartadmin.service.common.util.date.SmartLocalDateUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java index 187c42e7..c223d1f2 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityConfig.java @@ -1,8 +1,8 @@ package net.lab1024.smartadmin.service.config; -import net.lab1024.smartadmin.service.common.security.SmartSecurityUrlMatchers; -import net.lab1024.smartadmin.service.filter.SmartSecurityTokenFilter; -import net.lab1024.smartadmin.service.common.security.SmartSecurityAuthenticationFailHandler; +import net.lab1024.smartadmin.service.common.security.SecurityUrlMatchers; +import net.lab1024.smartadmin.service.filter.SecurityTokenFilter; +import net.lab1024.smartadmin.service.common.security.SecurityAuthenticationFailHandler; import net.lab1024.smartadmin.service.module.system.login.EmployeeLoginTokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -35,7 +35,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * url */ @Autowired - private SmartSecurityUrlMatchers smartSecurityUrlMatchers; + private SecurityUrlMatchers securityUrlMatchers; /** * 获取TOKEN 解析类 @@ -70,27 +70,27 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { // CSRF禁用，因为不使用session .csrf().disable() // 认证失败处理类 - .exceptionHandling().authenticationEntryPoint(new SmartSecurityAuthenticationFailHandler()).and() + .exceptionHandling().authenticationEntryPoint(new SecurityAuthenticationFailHandler()).and() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() // 过滤请求 .authorizeRequests(); //可以匿名登录的URL - String [] anonymousUrlArray = smartSecurityUrlMatchers.getAnonymousUrlArray(); + String [] anonymousUrlArray = securityUrlMatchers.getAnonymousUrlArray(); interceptUrlRegistry.antMatchers(anonymousUrlArray).permitAll(); //登录的URL - String [] authenticatedUrlArray = smartSecurityUrlMatchers.getAuthenticatedUrlArray(); + String [] authenticatedUrlArray = securityUrlMatchers.getAuthenticatedUrlArray(); interceptUrlRegistry.antMatchers(authenticatedUrlArray).authenticated(); - httpSecurity.addFilterBefore(new SmartSecurityTokenFilter(loginTokenService), UsernamePasswordAuthenticationFilter.class); - httpSecurity.addFilterBefore(corsFilter(), SmartSecurityTokenFilter.class); + httpSecurity.addFilterBefore(new SecurityTokenFilter(loginTokenService), UsernamePasswordAuthenticationFilter.class); + httpSecurity.addFilterBefore(corsFilter(), SecurityTokenFilter.class); } @Override public void configure(WebSecurity web) { // 忽略url WebSecurity.IgnoredRequestConfigurer ignoring = web.ignoring(); - List ignoreUrlListList = smartSecurityUrlMatchers.getIgnoreUrl(); + List ignoreUrlListList = securityUrlMatchers.getIgnoreUrl(); for (String url : ignoreUrlListList) { ignoring.antMatchers(url); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityMethodConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityMethodConfig.java index eced23ba..876c3234 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityMethodConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SecurityMethodConfig.java @@ -1,10 +1,8 @@ package net.lab1024.smartadmin.service.config; -import net.lab1024.smartadmin.service.common.security.SmartSecurityMetadataSource; -import net.lab1024.smartadmin.service.common.security.SmartSecurityUrlMatchers; +import net.lab1024.smartadmin.service.common.security.SecurityMetadataSource; +import net.lab1024.smartadmin.service.common.security.SecurityUrlMatchers; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.annotation.Order; import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory; import org.springframework.security.access.method.MethodSecurityMetadataSource; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -20,11 +18,11 @@ import org.springframework.security.config.annotation.method.configuration.Globa public class SecurityMethodConfig extends GlobalMethodSecurityConfiguration { @Autowired - private SmartSecurityUrlMatchers smartSecurityUrlMatchers; + private SecurityUrlMatchers securityUrlMatchers; @Override public MethodSecurityMetadataSource customMethodSecurityMetadataSource(){ ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(this.getExpressionHandler()); - return new SmartSecurityMetadataSource(attributeFactory, smartSecurityUrlMatchers); + return new SecurityMetadataSource(attributeFactory, securityUrlMatchers); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java index 8581617c..b86b6d19 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java @@ -9,7 +9,7 @@ import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.constant.RequestHeaderConst; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; +import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; import net.lab1024.smartadmin.service.common.swagger.SwaggerApiModelPropertyEnumPlugin; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeansException; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java index f9a3ac25..c8b100e1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java @@ -1,8 +1,8 @@ package net.lab1024.smartadmin.service.config; -import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; -import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.smartadmin.service.common.domain.SystemEnvironment; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -30,12 +30,12 @@ public class SystemEnvironmentConfig implements Condition { } @Bean - public SystemEnvironmentBO initEnvironment() { + public SystemEnvironment initEnvironment() { SystemEnvironmentEnum currentEnvironment = SmartBaseEnumUtil.getEnumByValue(systemEnvironment, SystemEnvironmentEnum.class); if (currentEnvironment == null) { throw new ExceptionInInitializerError("无法获取当前环境！请在 application.properties 或者 application.yaml 配置好参数：spring.profiles.active"); } - return new SystemEnvironmentBO(currentEnvironment == SystemEnvironmentEnum.PROD, currentEnvironment); + return new SystemEnvironment(currentEnvironment == SystemEnvironmentEnum.PROD, currentEnvironment); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SmartSecurityTokenFilter.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SecurityTokenFilter.java similarity index 84% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SmartSecurityTokenFilter.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SecurityTokenFilter.java index d88cb55b..243dc75a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SmartSecurityTokenFilter.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/filter/SecurityTokenFilter.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.filter; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.RequestHeaderConst; import net.lab1024.smartadmin.service.module.system.login.EmployeeLoginTokenService; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginBO; import org.apache.commons.lang3.StringUtils; @@ -24,13 +24,11 @@ import java.io.IOException; * @date */ -public class SmartSecurityTokenFilter extends OncePerRequestFilter { - - private static final String TOKEN_NAME = "x-access-token"; +public class SecurityTokenFilter extends OncePerRequestFilter { private EmployeeLoginTokenService loginTokenService; - public SmartSecurityTokenFilter(EmployeeLoginTokenService loginTokenService) { + public SecurityTokenFilter(EmployeeLoginTokenService loginTokenService) { this.loginTokenService = loginTokenService; } @@ -38,8 +36,8 @@ public class SmartSecurityTokenFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { //需要做token校验, 消息头的token优先于请求query参数的token - String xHeaderToken = request.getHeader(TOKEN_NAME); - String xRequestToken = request.getParameter(TOKEN_NAME); + String xHeaderToken = request.getHeader(RequestHeaderConst.TOKEN); + String xRequestToken = request.getParameter(RequestHeaderConst.TOKEN); String xAccessToken = null != xHeaderToken ? xHeaderToken : xRequestToken; if (StringUtils.isBlank(xAccessToken)) { chain.doFilter(request, response); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/GlobalExceptionHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/GlobalExceptionHandler.java new file mode 100644 index 00000000..7ee40e66 --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/GlobalExceptionHandler.java @@ -0,0 +1,129 @@ +package net.lab1024.smartadmin.service.handler; + +import lombok.extern.slf4j.Slf4j; +import net.lab1024.smartadmin.service.common.code.SystemErrorCode; +import net.lab1024.smartadmin.service.common.code.UserErrorCode; +import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.domain.SystemEnvironment; +import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.smartadmin.service.common.exception.BusinessException; +import org.springframework.beans.TypeMismatchException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.validation.BindException; +import org.springframework.validation.FieldError; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * [ 全局异常拦截 ] + * + * @author 罗伊 + * @date 2020/8/25 11:57 + */ +@Slf4j +@ControllerAdvice +public class GlobalExceptionHandler { + + @Autowired + private SystemEnvironment systemEnvironment; + + + /** + * json 格式错误 缺少请求体 + */ + @ResponseBody + @ExceptionHandler({HttpMessageNotReadableException.class}) + public ResponseDTO jsonFormatExceptionHandler(Exception e) { + if (!systemEnvironment.isProd()) { + log.error("全局JSON格式错误异常,URL:{}", getCurrentRequestUrl(), e); + } + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "参数JSON格式错误"); + } + + /** + * json 格式错误 缺少请求体 + */ + @ResponseBody + @ExceptionHandler({TypeMismatchException.class, BindException.class}) + public ResponseDTO paramExceptionHandler(Exception e) { + if (!systemEnvironment.isProd()) { + log.error("全局参数异常,URL:{}", getCurrentRequestUrl(), e); + } + + if (e instanceof BindException) { + if (e instanceof MethodArgumentNotValidException) { + List fieldErrors = ((MethodArgumentNotValidException) e).getBindingResult().getFieldErrors(); + List msgList = fieldErrors.stream().map(FieldError::getDefaultMessage).collect(Collectors.toList()); + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, String.join(",", msgList)); + } + + List fieldErrors = ((BindException) e).getFieldErrors(); + List error = fieldErrors.stream().map(field -> field.getField() + ":" + field.getRejectedValue()).collect(Collectors.toList()); + String errorMsg = UserErrorCode.PARAM_ERROR.getMsg() + ":" + error.toString(); + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, errorMsg); + } + + return ResponseDTO.error(UserErrorCode.PARAM_ERROR); + } + + /** + * 权限异常 + */ + @ResponseBody + @ExceptionHandler({AccessDeniedException.class}) + public ResponseDTO permissionExceptionHandler(AccessDeniedException e) { + if (!systemEnvironment.isProd()) { + log.error("全局参数异常,URL:{}", getCurrentRequestUrl(), e); + } + return ResponseDTO.error(UserErrorCode.NO_PERMISSION); + } + + /** + * 业务异常 + */ + @ResponseBody + @ExceptionHandler(BusinessException.class) + public ResponseDTO businessExceptionHandler(BusinessException e) { + if (!systemEnvironment.isProd()) { + log.error("全局业务异常,URL:{}", getCurrentRequestUrl(), e); + } + return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.getMessage()); + } + + /** + * 其他全部异常 + * + * @param e + * @return + */ + @ResponseBody + @ExceptionHandler(Throwable.class) + public ResponseDTO errorHandler(Throwable e) { + log.error("捕获全局异常,URL:{}", getCurrentRequestUrl(), e); + return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, systemEnvironment.isProd() ? null : e.toString()); + } + + /** + * 获取当前请求url + */ + private String getCurrentRequestUrl() { + RequestAttributes request = RequestContextHolder.getRequestAttributes(); + if (null == request) { + return null; + } + ServletRequestAttributes servletRequest = (ServletRequestAttributes) request; + return servletRequest.getRequest().getRequestURI(); + } + +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java deleted file mode 100644 index ea7de0b6..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java +++ /dev/null @@ -1,106 +0,0 @@ -package net.lab1024.smartadmin.service.handler; - -import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.code.SystemErrorCode; -import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO; -import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; -import net.lab1024.smartadmin.service.common.exception.SmartBusinessException; -import org.springframework.beans.TypeMismatchException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.validation.BindException; -import org.springframework.validation.FieldError; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * [ 全局异常拦截 ] - * - * @author 罗伊 - * @date 2020/8/25 11:57 - */ -@Slf4j -@ControllerAdvice -public class SmartGlobalExceptionHandler { - - @Autowired - private SystemEnvironmentBO systemEnvironmentBO; - - /** - * 添加全局异常处理流程 - * - * @param e - * @return - * @throws Exception - */ - @ResponseBody - @ExceptionHandler(Exception.class) - public ResponseDTO exceptionHandler(Exception e) { - - // json 格式错误 - if (e instanceof HttpMessageNotReadableException) { - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "请求参数JSON格式错误"); - } - - String uri = null; - RequestAttributes request = RequestContextHolder.getRequestAttributes(); - if (null != request) { - ServletRequestAttributes servletRequest = (ServletRequestAttributes) request; - uri = servletRequest.getRequest().getRequestURI(); - } - - // http 请求方式错误 - if (e instanceof HttpRequestMethodNotSupportedException) { - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "请求方式错误"); - } - - // 参数类型错误 - if (e instanceof TypeMismatchException) { - return ResponseDTO.error(UserErrorCode.PARAM_ERROR); - } - - // 参数校验未通过 - if (e instanceof MethodArgumentNotValidException) { - List fieldErrors = ((MethodArgumentNotValidException) e).getBindingResult().getFieldErrors(); - List msgList = fieldErrors.stream().map(FieldError::getDefaultMessage).collect(Collectors.toList()); - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, String.join(",", msgList)); - } - - // 参数绑定错误 - if (e instanceof BindException) { - List fieldErrors = ((BindException) e).getFieldErrors(); - List error = fieldErrors.stream().map(field -> field.getField() + ":" + field.getRejectedValue()).collect(Collectors.toList()); - String errorMsg = UserErrorCode.PARAM_ERROR.getMsg() + ":" + error.toString(); - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, errorMsg); - } - - if (e instanceof SmartBusinessException) { - return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.getMessage()); - } - - if (e instanceof AccessDeniedException) { - return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "您暂无权限"); - } - - log.error("捕获全局异常,URL:{}", uri, e); - - // 正式环境 不返回错误信息 - if (SystemEnvironmentEnum.PROD == systemEnvironmentBO.getCurrentEnvironment()) { - return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR); - } - - return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.toString()); - } -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java index 62767530..2a944574 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.business.category; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.business.category.domain.*; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +20,7 @@ import java.util.List; */ @Api(tags = SwaggerTagConst.Admin.MANAGER_CATEGORY) @RestController -public class CategoryController extends AdminBaseController { +public class CategoryController extends SystemBaseController { @Autowired private CategoryService categoryService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java index bf581825..004365a4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.business.category; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.constant.CacheModuleConst; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.module.business.category.domain.CategoryEntity; import net.lab1024.smartadmin.service.module.business.category.domain.CategorySimpleDTO; import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTreeQueryDTO; @@ -11,8 +11,8 @@ import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTr import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache; import net.lab1024.smartadmin.service.module.support.beancache.key.CacheKey; import net.lab1024.smartadmin.service.module.support.beancache.anno.CacheLoad; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartStringUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartStringUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +63,7 @@ public class CategoryQueryService { * 左边 categoryId 右边 type */ String businessId = CacheKey.getBusinessIdByCacheKey(cacheKey); - String[] split = businessId.split(CommonConst.UNDERLINE); + String[] split = businessId.split(StringConst.UNDERLINE); Integer categoryType = split.length > 1 ? Integer.valueOf(split[1]) : null; return categoryDao.queryByParentId(Lists.newArrayList(Long.valueOf(split[0])), categoryType, false); } @@ -76,7 +76,7 @@ public class CategoryQueryService { * @return */ private static String getCacheId(Long categoryId, Integer categoryType) { - return categoryId + CommonConst.UNDERLINE + categoryType; + return categoryId + StringConst.UNDERLINE + categoryType; } /** @@ -118,7 +118,7 @@ public class CategoryQueryService { */ public List queryCategoryByParent(Long categoryId, Integer categoryType) { if (null == categoryId) { - return CommonConst.EMPTY_LIST; + return StringConst.EMPTY_LIST; } String cacheKey = CacheKey.cacheKey(CacheModuleConst.Category.CATEGORY_SUB, getCacheId(categoryId, categoryType)); return cache.get(cacheKey); @@ -132,7 +132,7 @@ public class CategoryQueryService { */ public Map queryCategoryList(List categoryIdList) { if (CollectionUtils.isEmpty(categoryIdList)) { - return CommonConst.EMPTY_MAP; + return StringConst.EMPTY_MAP; } categoryIdList = categoryIdList.stream().distinct().collect(Collectors.toList()); @@ -161,7 +161,7 @@ public class CategoryQueryService { */ public List queryCategorySubId(List categoryIdList) { if (CollectionUtils.isEmpty(categoryIdList)) { - return CommonConst.EMPTY_LIST; + return StringConst.EMPTY_LIST; } // 查询所有子类 Map> subTypeMap = this.querySubCategoryFromCache(categoryIdList); @@ -236,7 +236,7 @@ public class CategoryQueryService { childrenVOList.forEach(item -> { item.setLabel(item.getCategoryName()); item.setValue(item.getCategoryId()); - item.setCategoryFullName(e.getCategoryFullName() + CommonConst.SEPARATOR_SLASH + item.getCategoryName()); + item.setCategoryFullName(e.getCategoryFullName() + StringConst.SEPARATOR_SLASH + item.getCategoryName()); }); // 递归查询 this.queryAndSetSubCategory(childrenVOList); @@ -266,7 +266,7 @@ public class CategoryQueryService { CategorySimpleDTO categoryDTO = new CategorySimpleDTO(); categoryDTO.setCategoryId(categoryId); categoryDTO.setCategoryName(categoryEntity.getCategoryName()); - categoryDTO.setCategoryFullName(SmartStringUtil.join(nameList, CommonConst.SEPARATOR_SLASH)); + categoryDTO.setCategoryFullName(SmartStringUtil.join(nameList, StringConst.SEPARATOR_SLASH)); categoryDTO.setParentId(categoryEntity.getParentId()); return categoryDTO; } @@ -288,7 +288,7 @@ public class CategoryQueryService { // 父级始终放在第一位 parentCategoryList.add(0, categoryEntity); Long parentId = categoryEntity.getParentId(); - if (Objects.equals(CommonConst.DEFAULT_PARENT_ID, parentId)) { + if (Objects.equals(StringConst.DEFAULT_PARENT_ID, parentId)) { return parentCategoryList; } parentCategoryList.addAll(0, this.queryCategoryAndParent(parentId)); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java index 85fd669e..a1234dbd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java @@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.business.category; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.business.category.domain.*; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,9 +43,9 @@ public class CategoryService { return res; } // 没有父类则使用默认父类 - Long parentId = null == addDTO.getParentId() ? CommonConst.DEFAULT_PARENT_ID : addDTO.getParentId(); + Long parentId = null == addDTO.getParentId() ? StringConst.DEFAULT_PARENT_ID : addDTO.getParentId(); categoryEntity.setParentId(parentId); - categoryEntity.setSort(null == addDTO.getSort() ? CommonConst.ZERO : addDTO.getSort()); + categoryEntity.setSort(null == addDTO.getSort() ? StringConst.ZERO : addDTO.getSort()); categoryEntity.setDeletedFlag(false); // 保存数据 @@ -106,7 +106,7 @@ public class CategoryService { if (Objects.equals(categoryEntity.getCategoryId(), parentId)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "父级类目怎么和自己相同了"); } - if (!Objects.equals(parentId, CommonConst.DEFAULT_PARENT_ID)) { + if (!Objects.equals(parentId, StringConst.DEFAULT_PARENT_ID)) { Optional optional = categoryQueryService.queryCategory(parentId); if (!optional.isPresent()) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "父级类目不存在~"); @@ -120,7 +120,7 @@ public class CategoryService { } else { // 如果没有父类 使用默认父类 - parentId = CommonConst.DEFAULT_PARENT_ID; + parentId = StringConst.DEFAULT_PARENT_ID; } // 校验同父类下 名称是否重复 @@ -169,7 +169,7 @@ public class CategoryService { if (null == queryDTO.getCategoryType()) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "类目类型不能为空"); } - queryDTO.setParentId(CommonConst.DEFAULT_PARENT_ID); + queryDTO.setParentId(StringConst.DEFAULT_PARENT_ID); } List treeList = categoryQueryService.queryCategoryTree(queryDTO); return ResponseDTO.ok(treeList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java index aec0e2b4..8844e068 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.business.category.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * 分类类型 枚举 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java index 5276c75f..0a5b06e3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java @@ -2,13 +2,13 @@ package net.lab1024.smartadmin.service.module.business.goods; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.module.business.goods.domain.*; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,7 +24,7 @@ import javax.validation.Valid; */ @Api(tags = SwaggerTagConst.Admin.MANAGER_GOODS) @RestController -public class GoodsController extends AdminBaseController { +public class GoodsController extends SystemBaseController { @Autowired private GoodsService goodsService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java index faa3dd31..e7f44eac 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java @@ -8,8 +8,8 @@ import net.lab1024.smartadmin.service.module.business.category.CategoryQueryServ import net.lab1024.smartadmin.service.module.business.category.constant.CategoryTypeEnum; import net.lab1024.smartadmin.service.module.business.category.domain.CategoryEntity; import net.lab1024.smartadmin.service.module.business.goods.domain.*; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java index 0b804a12..e86aa91f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.business.goods.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * 商品类型 枚举 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java index 2906d676..33c8edfa 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.goods.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; import net.lab1024.smartadmin.service.module.business.goods.constant.GoodsTypeEnum; import org.hibernate.validator.constraints.Length; @@ -14,7 +14,7 @@ import org.hibernate.validator.constraints.Length; * @date 2021/8/5 14:42 */ @Data -public class GoodsQueryDTO extends PageBaseDTO { +public class GoodsQueryDTO extends PageParamDTO { @ApiModelPropertyEnum(desc = "商品类型|可选", value = GoodsTypeEnum.class) private Integer goodsType; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java index 591bb531..e50ef464 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java @@ -3,14 +3,14 @@ package net.lab1024.smartadmin.service.module.business.notice; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.business.notice.domain.dto.*; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeDetailVO; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeVO; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,7 +24,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = {SwaggerTagConst.Admin.MANAGER_NOTICE}) -public class NoticeController extends AdminBaseController { +public class NoticeController extends SystemBaseController { @Autowired private NoticeService noticeService; @@ -44,7 +44,7 @@ public class NoticeController extends AdminBaseController { @ApiOperation(value = "分页查询未读消息", notes = "@author 罗伊") @PostMapping("/notice/unread/page/query") - public ResponseDTO> queryUnreadByPage(@RequestBody PageBaseDTO queryDTO) { + public ResponseDTO> queryUnreadByPage(@RequestBody PageParamDTO queryDTO) { return noticeService.queryUnreadByPage(queryDTO, SmartEmployeeTokenUtil.getRequestEmployeeId()); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeService.java index 71ce15a5..0990261a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeService.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.business.notice.dao.NoticeDao; @@ -12,8 +12,8 @@ import net.lab1024.smartadmin.service.module.business.notice.domain.entity.Notic import net.lab1024.smartadmin.service.module.business.notice.domain.entity.NoticeReceiveRecordEntity; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeDetailVO; import net.lab1024.smartadmin.service.module.business.notice.domain.vo.NoticeVO; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -74,7 +74,7 @@ public class NoticeService { * @param queryDTO * @return */ - public ResponseDTO> queryUnreadByPage(PageBaseDTO queryDTO, Long employeeId) { + public ResponseDTO> queryUnreadByPage(PageParamDTO queryDTO, Long employeeId) { Page page = SmartPageUtil.convert2PageQuery(queryDTO); List dtoList = noticeDao.queryUnreadByPage(page, employeeId, true); PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page, dtoList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryDTO.java index ceb96edc..43acd71e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/domain/dto/NoticeQueryDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; /** * [ ] @@ -10,7 +10,7 @@ import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; * @author 罗伊 */ @Data -public class NoticeQueryDTO extends PageBaseDTO { +public class NoticeQueryDTO extends PageParamDTO { @ApiModelProperty("开始日期") diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/BeanRecordService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/BeanRecordService.java index bc90a6d9..16f9af38 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/BeanRecordService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/BeanRecordService.java @@ -10,10 +10,10 @@ import net.lab1024.smartadmin.service.module.support.beanrecord.annotation.Field import net.lab1024.smartadmin.service.module.support.beanrecord.annotation.FieldEnumValue; import net.lab1024.smartadmin.service.module.support.beanrecord.annotation.FieldSqlValue; import net.lab1024.smartadmin.service.third.SmartApplicationContext; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; -import net.lab1024.smartadmin.service.util.SmartBigDecimalUtil; -import net.lab1024.smartadmin.service.util.date.SmartDateFormatterEnum; -import net.lab1024.smartadmin.service.util.date.SmartLocalDateUtil; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.util.SmartBigDecimalUtil; +import net.lab1024.smartadmin.service.common.util.date.SmartDateFormatterEnum; +import net.lab1024.smartadmin.service.common.util.date.SmartLocalDateUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java index 858f0708..7f38c32b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.module.support.beanrecord.annotation; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java index bfb28ffb..11eb58c0 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.captcha; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.anno.NoNeedLogin; +import net.lab1024.smartadmin.service.common.annoation.NoNeedLogin; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaService.java index 74fa48bb..3341960f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaService.java @@ -4,7 +4,7 @@ import com.google.code.kaptcha.impl.DefaultKaptcha; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.code.SystemErrorCode; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.constant.RedisKeyConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaVO; @@ -54,7 +54,7 @@ public class CaptchaService { return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "generate captcha error" ); } // uuid 唯一标识 - String uuid = UUID.randomUUID().toString().replace("-", CommonConst.EMPTY_STR); + String uuid = UUID.randomUUID().toString().replace("-", StringConst.EMPTY_STR); /** * 返回验证码对象 @@ -82,10 +82,10 @@ public class CaptchaService { String redisKey = buildCaptchaRedisKey(captchaId); String redisCode = redisService.get(redisKey); if (StringUtils.isBlank(redisCode)) { - return ResponseDTO.error(UserErrorCode.VERIFICATION_CODE_INVALID, "验证码错误或已过期，请刷新重试" ); + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "验证码错误或已过期，请刷新重试" ); } if (!Objects.equals(redisCode, captcha)) { - return ResponseDTO.error(UserErrorCode.VERIFICATION_CODE_INVALID, "验证码错误或已过期，请刷新重试" ); + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "验证码错误或已过期，请刷新重试" ); } // 校验通过 移除 redisService.del(redisKey); @@ -93,6 +93,6 @@ public class CaptchaService { } private String buildCaptchaRedisKey(String codeId) { - return RedisKeyConst.Base.CAPTCHA + codeId; + return RedisKeyConst.Support.CAPTCHA + codeId; } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaForm.java similarity index 94% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaDTO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaForm.java index 927126b6..4e321a14 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/domain/CaptchaForm.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; * @date 2021/8/31 20:52 */ @Data -public class CaptchaDTO { +public class CaptchaForm { @ApiModelProperty @NotBlank(message = "验证码标识不能为空" ) diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java index 715015b7..f9a8a3fc 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerQueryForm; @@ -24,7 +24,7 @@ import javax.validation.Valid; @Api(tags = {SwaggerTagConst.Admin.MANAGER_DATA_TRACER}) @RestController -public class DataTracerController extends AdminBaseController { +public class DataTracerController extends SystemBaseController { @Autowired private DataTracerService dataTracerService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerService.java index 123e23d8..37a00fac 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerService.java @@ -11,7 +11,7 @@ import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTrace import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerEntity; import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerQueryForm; import net.lab1024.smartadmin.service.module.support.datatracer.domain.DataTracerVO; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java index 22ce584a..3e6479ed 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ 数据业务类型 ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java index c06369ab..cd031f50 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java index c398e535..a11560fd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java @@ -1,7 +1,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer.domain; import lombok.Data; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; import net.lab1024.smartadmin.service.module.support.datatracer.constant.DataTracerBusinessTypeEnum; import java.time.LocalDateTime; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerQueryForm.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerQueryForm.java index 7d6f1025..786cb291 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerQueryForm.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerQueryForm.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; import net.lab1024.smartadmin.service.module.support.datatracer.constant.DataTracerBusinessTypeEnum; @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull; * @date 2021/8/17 8:47 */ @Data -public class DataTracerQueryForm extends PageBaseDTO { +public class DataTracerQueryForm extends PageParamDTO { @ApiModelPropertyEnum(DataTracerBusinessTypeEnum.class) private Integer businessType; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java index 2514bafd..3b6c07a1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.file.domain; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * 文件服务 文件夹位置类型枚举类 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryDTO.java index ac37440c..ffb33113 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/dto/FileQueryDTO.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.module.support.file.domain.dto; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; import net.lab1024.smartadmin.service.module.support.file.domain.FileFolderTypeEnum; import io.swagger.annotations.ApiModelProperty; @@ -13,7 +13,7 @@ import lombok.Data; * @Version: 1.0 */ @Data -public class FileQueryDTO extends PageBaseDTO { +public class FileQueryDTO extends PageParamDTO { @ApiModelProperty(value = "文件名称") private String fileName; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java index 243405b1..ed1eb2d7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.SystemErrorCode; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; -import net.lab1024.smartadmin.service.common.constant.NumberLimitConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.constant.RedisKeyConst; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; @@ -17,9 +16,9 @@ import net.lab1024.smartadmin.service.module.support.file.domain.dto.*; import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileUploadVO; import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileVO; import net.lab1024.smartadmin.service.third.SmartRedisService; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +47,11 @@ import java.util.stream.Collectors; @Service public class FileService { + /** + * 文件名最大长度 + */ + private static final int FILE_NAME_MAX_LENGTH = 100; + @Resource private IFileStorageService fileStorageService; @@ -99,7 +103,7 @@ public class FileService { } // 校验文件名称 String originalFilename = file.getOriginalFilename(); - if (StringUtils.isBlank(originalFilename) || originalFilename.length() > NumberLimitConst.FILE_NAME) { + if (StringUtils.isBlank(originalFilename) || originalFilename.length() > FILE_NAME_MAX_LENGTH) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "上传文件名称不能为空"); } // 校验文件大小 @@ -126,10 +130,10 @@ public class FileService { fileDao.insert(fileEntity); uploadVO.setFileId(fileEntity.getId()); //添加缓存 - String redisKey = RedisKeyConst.Base.FILE_URL + uploadVO.getFileKey(); + String redisKey = RedisKeyConst.Support.FILE_URL + uploadVO.getFileKey(); redisService.set(redisKey, uploadVO.getFileUrl(), fileStorageService.cacheExpireSecond()); - String fileRedisKey = RedisKeyConst.Base.FILE_VO + uploadVO.getFileKey(); + String fileRedisKey = RedisKeyConst.Support.FILE_VO + uploadVO.getFileKey(); FileVO fileVO = SmartBeanUtil.copy(fileEntity, FileVO.class); redisService.set(fileRedisKey, fileVO, fileStorageService.cacheExpireSecond()); } @@ -152,7 +156,7 @@ public class FileService { } private FileVO getCacheFileVO(String fileKey) { - String redisKey = RedisKeyConst.Base.FILE_VO + fileKey; + String redisKey = RedisKeyConst.Support.FILE_VO + fileKey; FileVO fileVO = redisService.getObject(redisKey, FileVO.class); if (fileVO == null) { fileVO = fileDao.getByFileKey(fileKey); @@ -177,15 +181,15 @@ public class FileService { return ResponseDTO.error(UserErrorCode.PARAM_ERROR); } // 处理逗号分隔的字符串 - List stringList = Arrays.asList(fileKey.split(CommonConst.SEPARATOR)); + List stringList = Arrays.asList(fileKey.split(StringConst.SEPARATOR)); stringList = stringList.stream().map(e -> this.getCacheUrl(e)).collect(Collectors.toList()); - String result = StringUtils.join(stringList, CommonConst.SEPARATOR_CHAR); + String result = StringUtils.join(stringList, StringConst.SEPARATOR_CHAR); return ResponseDTO.ok(result); } private String getCacheUrl(String fileKey) { - String redisKey = RedisKeyConst.Base.FILE_URL + fileKey; + String redisKey = RedisKeyConst.Support.FILE_URL + fileKey; String fileUrl = redisService.get(redisKey); if (null != fileUrl) { return fileUrl; @@ -212,9 +216,9 @@ public class FileService { List fileKeyList = queryDTO.getFileKeyList(); List resultDTOList = fileKeyList.stream().map(fileKey -> { // 处理逗号分隔的字符串 - List stringList = Arrays.asList(fileKey.split(CommonConst.SEPARATOR)); + List stringList = Arrays.asList(fileKey.split(StringConst.SEPARATOR)); stringList = stringList.stream().map(e -> fileStorageService.getFileUrl(e).getData()).collect(Collectors.toList()); - String result = StringUtils.join(stringList, CommonConst.SEPARATOR_CHAR); + String result = StringUtils.join(stringList, StringConst.SEPARATOR_CHAR); return new FileUrlResultDTO(fileKey, result); }).collect(Collectors.toList()); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java index f8f0e9fc..1700a27c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java @@ -3,8 +3,8 @@ package net.lab1024.smartadmin.service.module.support.file.service; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileDownloadDTO; import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileUploadVO; -import net.lab1024.smartadmin.service.util.date.SmartDateFormatterEnum; -import net.lab1024.smartadmin.service.util.date.SmartLocalDateUtil; +import net.lab1024.smartadmin.service.common.util.date.SmartDateFormatterEnum; +import net.lab1024.smartadmin.service.common.util.date.SmartLocalDateUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java index cc61ad68..20601c99 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; @@ -24,8 +24,8 @@ public class HeartBeatController extends SupportBaseController { @PostMapping("/heartBeat/query") @ApiOperation("查询心跳记录 @author 卓大") - public ResponseDTO> query(@RequestBody @Valid PageBaseDTO pageBaseDTO) { - return heartBeatService.pageQuery(pageBaseDTO); + public ResponseDTO> query(@RequestBody @Valid PageParamDTO pageParamDTO) { + return heartBeatService.pageQuery(pageParamDTO); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatRecordHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatRecordHandler.java index e363b812..daf2e6b5 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatRecordHandler.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatRecordHandler.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.module.support.heartbeat.core.HeartBeatRecord; import net.lab1024.smartadmin.service.module.support.heartbeat.core.IHeartBeatRecordHandler; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatService.java index 8f9956a8..1ca0d403 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatService.java @@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.support.heartbeat; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,8 +24,8 @@ public class HeartBeatService { private HeartBeatRecordDao heartBeatRecordDao; - public ResponseDTO> pageQuery(PageBaseDTO pageBaseDTO) { - Page pageQueryInfo = SmartPageUtil.convert2PageQuery(pageBaseDTO); + public ResponseDTO> pageQuery(PageParamDTO pageParamDTO) { + Page pageQueryInfo = SmartPageUtil.convert2PageQuery(pageParamDTO); List recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo); PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(pageQueryInfo, recordVOList); return ResponseDTO.ok(pageResultDTO); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/core/HeartBeatRunnable.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/core/HeartBeatRunnable.java index 878c1398..7973102d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/core/HeartBeatRunnable.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/core/HeartBeatRunnable.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.module.support.heartbeat.core; -import net.lab1024.smartadmin.service.util.SmartIPUtil; +import net.lab1024.smartadmin.service.common.util.SmartIPUtil; import org.apache.commons.lang3.StringUtils; import java.lang.management.ManagementFactory; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java index eb7814ff..93101c9a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java @@ -7,7 +7,8 @@ import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.module.support.idgenerator.service.IdGeneratorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -33,7 +34,7 @@ public class IdGeneratorController extends SupportBaseController { if (null == idGeneratorEnum) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "IdGenerator，不存在" + generatorId); } - return idGeneratorService.generate(idGeneratorEnum); + return ResponseDTO.ok(idGeneratorService.generate(idGeneratorEnum)); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java index bd11dd90..9dc99fdb 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.idgenerator.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * id生成枚举类 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java index 36f1ae75..dfb8474e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.idgenerator.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorService.java similarity index 78% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorService.java index 34938924..e9003be2 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/service/IdGeneratorService.java @@ -1,16 +1,18 @@ -package net.lab1024.smartadmin.service.module.support.idgenerator; +package net.lab1024.smartadmin.service.module.support.idgenerator.service; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.code.UnexpectedErrorCode; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.constant.RedisKeyConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.exception.BusinessException; +import net.lab1024.smartadmin.service.common.util.SmartRandomUtil; +import net.lab1024.smartadmin.service.module.support.idgenerator.IdGeneratorDao; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorRuleTypeEnum; import net.lab1024.smartadmin.service.module.support.idgenerator.domain.IdGeneratorEntity; import net.lab1024.smartadmin.service.module.support.idgenerator.domain.IdGeneratorRecordDTO; import net.lab1024.smartadmin.service.third.SmartRedisService; -import net.lab1024.smartadmin.service.util.SmartRandomUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,44 +57,41 @@ public class IdGeneratorService { /** * id 生成器 * - * @param idGeneratorEnum + * @param idGeneratorEnum 类型 * @return */ - public ResponseDTO generate(IdGeneratorEnum idGeneratorEnum) { + public String generate(IdGeneratorEnum idGeneratorEnum) { int generatorId = idGeneratorEnum.getValue(); IdGeneratorEntity idGeneratorEntity = this.idGeneratorMap.get(generatorId); if (null == idGeneratorEntity) { - return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "IdGenerator， 生成器 不存在" + generatorId); + throw new BusinessException("IdGenerator， 生成器 不存在 " + idGeneratorEnum.getDesc()); } - LocalDateTime now = LocalDateTime.now(); - int year = now.getYear(); - int monthValue = now.getMonthValue(); - int dayOfMonth = now.getDayOfMonth(); - - String lockKey = RedisKeyConst.Base.ID_GENERATOR + idGeneratorEnum.getDesc(); + // 获取全局唯一锁 + String lockKey = RedisKeyConst.Support.ID_GENERATOR + idGeneratorEnum.getDesc(); + boolean lock = false; + for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) { + try { + //60秒 + lock = redisService.getLock(lockKey, 60 * 1000L); + if (lock) { + break; + } + Thread.sleep(Math.max(SLEEP_MILLISECONDS, lastSleepMilliSeconds)); + } catch (Throwable e) { + log.error(e.getMessage(), e); + } + } + if (!lock) { + throw new BusinessException("IdGenerator， 生成器繁忙，无法处理： " + idGeneratorEnum.getDesc()); + } try { - boolean lock = false; - - for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) { - try { - //60秒 - lock = redisService.getLock(lockKey, 60 * 1000L); - if (lock) { - break; - } - Thread.sleep(Math.max(SLEEP_MILLISECONDS, lastSleepMilliSeconds)); - } catch (Throwable e) { - log.error(e.getMessage(), e); - } - } - - if (!lock) { - return ResponseDTO.error(UnexpectedErrorCode.BUSINESS_HANDING); - } - long beginTime = System.currentTimeMillis(); + LocalDateTime now = LocalDateTime.now(); + int year = now.getYear(); + int monthValue = now.getMonthValue(); + int dayOfMonth = now.getDayOfMonth(); IdGeneratorRecordDTO generatorRecordDTO = idGeneratorDao.selectHistoryLastNumber(generatorId, year, monthValue, dayOfMonth); if (generatorRecordDTO == null) { @@ -128,7 +127,7 @@ public class IdGeneratorService { String prefix = StringUtils.isBlank(idGeneratorEntity.getPrefix()) ? StringUtils.EMPTY : idGeneratorEntity.getPrefix(); lastSleepMilliSeconds = System.currentTimeMillis() - beginTime + 100; - return ResponseDTO.ok(prefix + nowFormat + finalId); + return prefix + nowFormat + finalId; } catch (Throwable e) { log.error(e.getMessage(), e); throw e; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java index 924acc87..8c1275c6 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java @@ -2,14 +2,16 @@ package net.lab1024.smartadmin.service.module.support.operatelog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; /** * [ ] @@ -29,16 +31,4 @@ public class OperateLogController extends SupportBaseController { return operateLogService.queryByPage(queryDTO); } - @ApiOperation(value = "删除 @author 罗伊") - @GetMapping("/userOperateLog/delete/{id}") - public ResponseDTO delete(@PathVariable("id") Long id) { - return operateLogService.delete(id); - } - - - @ApiOperation(value = "详情 @author 罗伊") - @GetMapping("/userOperateLog/detail/{id}") - public ResponseDTO detail(@PathVariable("id") Long id) { - return operateLogService.detail(id); - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java index 02281dd5..74c57414 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java @@ -6,8 +6,8 @@ import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +53,6 @@ public class OperateLogService { * @description 编辑 * @date 2019-05-15 11:32:14 */ - @Transactional(rollbackFor = Exception.class) public ResponseDTO update(OperateLogDTO updateDTO) { OperateLogEntity entity = SmartBeanUtil.copy(updateDTO, OperateLogEntity.class); operateLogDao.updateById(entity); @@ -65,7 +64,6 @@ public class OperateLogService { * @description 删除 * @date 2019-05-15 11:32:14 */ - @Transactional(rollbackFor = Exception.class) public ResponseDTO delete(Long id) { operateLogDao.deleteById(id); return ResponseDTO.ok(); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLog.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLog.java similarity index 95% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLog.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLog.java index 6d2c1b70..9210d2f1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLog.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLog.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.operatelog; +package net.lab1024.smartadmin.service.module.support.operatelog.annoation; import java.lang.annotation.*; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/SmartOperateLogAspect.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLogAspect.java similarity index 93% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/SmartOperateLogAspect.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLogAspect.java index 67e64b10..5bac3e17 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/SmartOperateLogAspect.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/annoation/OperateLogAspect.java @@ -1,12 +1,13 @@ -package net.lab1024.smartadmin.service.module.support.operatelog; +package net.lab1024.smartadmin.service.module.support.operatelog.annoation; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.SmartOperateLogConfigDTO; -import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.SmartOperateLogUserDTO; +import net.lab1024.smartadmin.service.module.support.operatelog.OperateLogDao; +import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogConfigDTO; +import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogUserDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity; import net.lab1024.smartadmin.service.third.SmartApplicationContext; -import net.lab1024.smartadmin.service.util.SmartStringUtil; +import net.lab1024.smartadmin.service.common.util.SmartStringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -35,11 +36,11 @@ import java.util.concurrent.ThreadPoolExecutor; */ @Slf4j @Aspect -public class SmartOperateLogAspect { +public class OperateLogAspect { private static final String pointCut = "@within(org.springframework.web.bind.annotation.RestController) || @within(org.springframework.stereotype.Controller)"; - private SmartOperateLogConfigDTO smartLogConfig; + private OperateLogConfigDTO smartLogConfig; /** * 线程池 @@ -49,8 +50,8 @@ public class SmartOperateLogAspect { /** * 构造方法 */ - public SmartOperateLogAspect(SmartOperateLogConfigDTO smartOperateLogConfigDTO) { - smartLogConfig = smartOperateLogConfigDTO; + public OperateLogAspect(OperateLogConfigDTO operateLogConfigDTO) { + smartLogConfig = operateLogConfigDTO; this.initThread(smartLogConfig); } @@ -71,7 +72,7 @@ public class SmartOperateLogAspect { /** * 初始化线程池 */ - private void initThread(SmartOperateLogConfigDTO configDTO) { + private void initThread(OperateLogConfigDTO configDTO) { int corePoolSize = Runtime.getRuntime().availableProcessors(); if (null != configDTO.getCorePoolSize()) { corePoolSize = configDTO.getCorePoolSize(); @@ -175,7 +176,7 @@ public class SmartOperateLogAspect { return; } //设置用户信息 - SmartOperateLogUserDTO user = smartLogConfig.getUserFunction().apply(request); + OperateLogUserDTO user = smartLogConfig.getUserFunction().apply(request); if (user == null) { return; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogConfigDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogConfigDTO.java similarity index 88% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogConfigDTO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogConfigDTO.java index 805f31c8..38e4865b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogConfigDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogConfigDTO.java @@ -16,12 +16,12 @@ import java.util.function.Supplier; */ @Data @Builder -public class SmartOperateLogConfigDTO { +public class OperateLogConfigDTO { /** * 用户信息 */ - private Function userFunction; + private Function userFunction; /** * 是否启用 */ diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryDTO.java index bff4c851..d10f37d5 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogQueryDTO.java @@ -1,6 +1,6 @@ package net.lab1024.smartadmin.service.module.support.operatelog.domain.dto; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; * @author 罗伊 */ @Data -public class OperateLogQueryDTO extends PageBaseDTO { +public class OperateLogQueryDTO extends PageParamDTO { @ApiModelProperty("开始日期") diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogUserDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogUserDTO.java similarity index 91% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogUserDTO.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogUserDTO.java index d2299109..8d8154a4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/SmartOperateLogUserDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/domain/dto/OperateLogUserDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * @Version: 1.0 */ @Data -public class SmartOperateLogUserDTO { +public class OperateLogUserDTO { /** * 用户id diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/SmartReloadCommand.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/SmartReloadCommand.java index f0db5c56..5117a5e8 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/SmartReloadCommand.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/SmartReloadCommand.java @@ -1,13 +1,13 @@ package net.lab1024.smartadmin.service.module.support.reload; import net.lab1024.smartadmin.service.module.support.reload.core.AbstractSmartReloadCommand; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadItem; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadItem; import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadResult; import net.lab1024.smartadmin.service.module.support.reload.dao.ReloadItemDao; import net.lab1024.smartadmin.service.module.support.reload.dao.ReloadResultDao; import net.lab1024.smartadmin.service.module.support.reload.domain.ReloadItemEntity; import net.lab1024.smartadmin.service.module.support.reload.domain.ReloadResultEntity; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,9 +34,9 @@ public class SmartReloadCommand extends AbstractSmartReloadCommand { * @return List */ @Override - public List readReloadItem() { + public List readReloadItem() { List reloadItemEntityList = reloadItemDao.selectList(null); - return SmartBeanUtil.copyList(reloadItemEntityList, ReloadItem.class); + return SmartBeanUtil.copyList(reloadItemEntityList, SmartReloadItem.class); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/AbstractSmartReloadCommand.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/AbstractSmartReloadCommand.java index f4802708..720f6df8 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/AbstractSmartReloadCommand.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/AbstractSmartReloadCommand.java @@ -1,8 +1,8 @@ package net.lab1024.smartadmin.service.module.support.reload.core; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadItem; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadObject; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadItem; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadObject; import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadResult; import java.util.List; @@ -39,14 +39,14 @@ public abstract class AbstractSmartReloadCommand { * * @return List */ - public abstract List readReloadItem(); + public abstract List readReloadItem(); /** * 处理Reload结果 * - * @param reloadResult + * @param smartReloadResult */ - public abstract void handleReloadResult(SmartReloadResult reloadResult); + public abstract void handleReloadResult(SmartReloadResult smartReloadResult); /** @@ -57,13 +57,13 @@ public abstract class AbstractSmartReloadCommand { if (tagIdentifierMap != null) { return tagIdentifierMap; } - List reloadItemList = this.readReloadItem(); - if (reloadItemList == null) { + List smartReloadItemList = this.readReloadItem(); + if (smartReloadItemList == null) { return tagIdentifierMap; } - for (ReloadItem reloadItem : reloadItemList) { - String tag = reloadItem.getTag(); - String identification = reloadItem.getIdentification(); + for (SmartReloadItem smartReloadItem : smartReloadItemList) { + String tag = smartReloadItem.getTag(); + String identification = smartReloadItem.getIdentification(); tagIdentifierMap.put(tag, identification); } return tagIdentifierMap; @@ -84,11 +84,11 @@ public abstract class AbstractSmartReloadCommand { * 获取重载对象 * @return */ - public ReloadObject reloadObject(String tag) { + public SmartReloadObject reloadObject(String tag) { if(this.smartReloadManager == null){ return null; } - Map reloadObjectMap = smartReloadManager.reloadObjectMap(); + Map reloadObjectMap = smartReloadManager.reloadObjectMap(); return reloadObjectMap.get(tag); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/SmartReloadManager.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/SmartReloadManager.java index 0902eb1c..ca3bcdb3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/SmartReloadManager.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/SmartReloadManager.java @@ -2,8 +2,8 @@ package net.lab1024.smartadmin.service.module.support.reload.core; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.module.support.reload.core.anno.SmartReload; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadObject; +import net.lab1024.smartadmin.service.module.support.reload.core.annoation.SmartReload; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadObject; import net.lab1024.smartadmin.service.module.support.reload.core.thread.SmartReloadRunnable; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; @@ -28,7 +28,7 @@ public class SmartReloadManager implements BeanPostProcessor { private static final String THREAD_NAME_PREFIX = "smart-admin-reload"; private static final int THREAD_COUNT = 1; - private Map reloadObjectMap = new ConcurrentHashMap<>(); + private Map reloadObjectMap = new ConcurrentHashMap<>(); private ScheduledThreadPoolExecutor threadPoolExecutor; @@ -62,7 +62,7 @@ public class SmartReloadManager implements BeanPostProcessor { continue; } String reloadTag = smartReload.value(); - this.register(reloadTag, new ReloadObject(bean, method)); + this.register(reloadTag, new SmartReloadObject(bean, method)); } return bean; } @@ -71,13 +71,13 @@ public class SmartReloadManager implements BeanPostProcessor { * 注册reload * * @param tag - * @param reloadObject + * @param smartReloadObject */ - private void register(String tag, ReloadObject reloadObject) { + private void register(String tag, SmartReloadObject smartReloadObject) { if (reloadObjectMap.containsKey(tag)) { log.error("<> register duplicated tag reload : " + tag + " , and it will be cover!"); } - reloadObjectMap.put(tag, reloadObject); + reloadObjectMap.put(tag, smartReloadObject); } /** @@ -85,7 +85,7 @@ public class SmartReloadManager implements BeanPostProcessor { * * @return */ - public Map reloadObjectMap() { + public Map reloadObjectMap() { return this.reloadObjectMap; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/anno/SmartReload.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/annoation/SmartReload.java similarity index 96% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/anno/SmartReload.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/annoation/SmartReload.java index 9f72b5d8..c5aa6a84 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/anno/SmartReload.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/annoation/SmartReload.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.reload.core.anno; +package net.lab1024.smartadmin.service.module.support.reload.core.annoation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadItem.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadItem.java similarity index 91% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadItem.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadItem.java index 76de6aef..411104d9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadItem.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadItem.java @@ -8,7 +8,7 @@ import lombok.Data; * @author zhuoda */ @Data -public class ReloadItem { +public class SmartReloadItem { /** * 项名称 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadObject.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadObject.java similarity index 93% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadObject.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadObject.java index 02a9f2cb..bc9e18c4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/ReloadObject.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/domain/SmartReloadObject.java @@ -13,7 +13,7 @@ import java.lang.reflect.Method; */ @Data @AllArgsConstructor -public class ReloadObject { +public class SmartReloadObject { /** * 方法对应的实例化对象 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/thread/SmartReloadRunnable.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/thread/SmartReloadRunnable.java index fd02d6a2..5a6cc267 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/thread/SmartReloadRunnable.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/reload/core/thread/SmartReloadRunnable.java @@ -2,8 +2,8 @@ package net.lab1024.smartadmin.service.module.support.reload.core.thread; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.module.support.reload.core.AbstractSmartReloadCommand; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadItem; -import net.lab1024.smartadmin.service.module.support.reload.core.domain.ReloadObject; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadItem; +import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadObject; import net.lab1024.smartadmin.service.module.support.reload.core.domain.SmartReloadResult; import java.io.PrintWriter; @@ -41,18 +41,18 @@ public class SmartReloadRunnable implements Runnable { * 检测Identifier变化，执行reload */ private void doTask() { - List reloadItemList = this.abstractSmartReloadCommand.readReloadItem(); + List smartReloadItemList = this.abstractSmartReloadCommand.readReloadItem(); ConcurrentHashMap tagIdentifierMap = this.abstractSmartReloadCommand.getTagIdentifierMap(); - for (ReloadItem reloadItem : reloadItemList) { - String tag = reloadItem.getTag(); - String tagIdentifier = reloadItem.getIdentification(); + for (SmartReloadItem smartReloadItem : smartReloadItemList) { + String tag = smartReloadItem.getTag(); + String tagIdentifier = smartReloadItem.getIdentification(); String preTagChangeIdentifier = tagIdentifierMap.get(tag); // 数据不一致 if (preTagChangeIdentifier == null || !preTagChangeIdentifier.equals(tagIdentifier)) { this.abstractSmartReloadCommand.putIdentifierMap(tag, tagIdentifier); // 执行重新加载此项的动作 - SmartReloadResult reloadResult = this.doReload(reloadItem); - this.abstractSmartReloadCommand.handleReloadResult(reloadResult); + SmartReloadResult smartReloadResult = this.doReload(smartReloadItem); + this.abstractSmartReloadCommand.handleReloadResult(smartReloadResult); } } } @@ -60,16 +60,16 @@ public class SmartReloadRunnable implements Runnable { /** * 方法调用 * - * @param reloadItem + * @param smartReloadItem * @return */ - private SmartReloadResult doReload(ReloadItem reloadItem) { + private SmartReloadResult doReload(SmartReloadItem smartReloadItem) { SmartReloadResult result = new SmartReloadResult(); - ReloadObject reloadObject = this.abstractSmartReloadCommand.reloadObject(reloadItem.getTag()); - Method method = reloadObject.getMethod(); - result.setTag(reloadItem.getTag()); - result.setArgs(reloadItem.getArgs()); - result.setIdentification(reloadItem.getIdentification()); + SmartReloadObject smartReloadObject = this.abstractSmartReloadCommand.reloadObject(smartReloadItem.getTag()); + Method method = smartReloadObject.getMethod(); + result.setTag(smartReloadItem.getTag()); + result.setArgs(smartReloadItem.getArgs()); + result.setIdentification(smartReloadItem.getIdentification()); result.setResult(true); int paramCount = method.getParameterCount(); if (paramCount > 1) { @@ -79,9 +79,9 @@ public class SmartReloadRunnable implements Runnable { } try { if (paramCount == 0) { - method.invoke(reloadObject.getReloadObject()); + method.invoke(smartReloadObject.getReloadObject()); } else { - method.invoke(reloadObject.getReloadObject(), reloadItem.getArgs()); + method.invoke(smartReloadObject.getReloadObject(), smartReloadItem.getArgs()); } } catch (Throwable throwable) { StringWriter sw = new StringWriter(); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/SmartRepeatSubmitAspect.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmitAspect.java similarity index 90% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/SmartRepeatSubmitAspect.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmitAspect.java index f5402466..55e3ba90 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/SmartRepeatSubmitAspect.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmitAspect.java @@ -4,6 +4,7 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.module.support.repeatsubmit.annoation.RepeatSubmit; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -23,7 +24,7 @@ import java.util.function.Function; * @date */ @Aspect -public class SmartRepeatSubmitAspect { +public class RepeatSubmitAspect { /** * 限制缓存最大数量 超过后先放入的会自动移除 @@ -37,10 +38,10 @@ public class SmartRepeatSubmitAspect { /** * 获取用户信息 - * + *rep * @param userFunction */ - public SmartRepeatSubmitAspect(Function userFunction) { + public RepeatSubmitAspect(Function userFunction) { this.userFunction = userFunction; } @@ -51,7 +52,7 @@ public class SmartRepeatSubmitAspect { * @return * @throws Throwable */ - @Around("@annotation(net.lab1024.smartadmin.service.module.support.repeatsubmit.RepeatSubmit)") + @Around("@annotation(net.lab1024.smartadmin.service.module.support.repeatsubmit.annoation.RepeatSubmit)") public Object around(ProceedingJoinPoint point) throws Throwable { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmit.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/annoation/RepeatSubmit.java similarity index 97% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmit.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/annoation/RepeatSubmit.java index 56c6b5e3..20ca0699 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/RepeatSubmit.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/repeatsubmit/annoation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.support.repeatsubmit; +package net.lab1024.smartadmin.service.module.support.repeatsubmit.annoation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/responseencrypt/ResponseEncryptDecryptAspect.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/responseencrypt/ResponseEncryptDecryptAspect.java index 10f25b03..4da19454 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/responseencrypt/ResponseEncryptDecryptAspect.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/responseencrypt/ResponseEncryptDecryptAspect.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.util.SmartAesUtil; -import net.lab1024.smartadmin.service.util.SmartDigestUtil; +import net.lab1024.smartadmin.service.common.util.SmartAesUtil; +import net.lab1024.smartadmin.service.common.util.SmartDigestUtil; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java index 4d27e05b..d5b4d33f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.datascope; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeAndViewTypeVO; import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeBatchSetRoleDTO; @@ -22,7 +22,7 @@ import java.util.List; */ @Api(tags = {SwaggerTagConst.Admin.MANAGER_ROLE}) @RestController -public class DataScopeController extends AdminBaseController { +public class DataScopeController extends SystemBaseController { @Autowired private DataScopeService dataScopeService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java index 4f68e018..a75f9a7a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/MyBatisPlugin.java @@ -4,7 +4,7 @@ import com.google.common.collect.Maps; import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeSqlConfigDTO; import net.lab1024.smartadmin.service.module.system.datascope.service.DataScopeSqlConfigService; import net.lab1024.smartadmin.service.third.SmartApplicationContext; -import net.lab1024.smartadmin.service.util.SmartStringUtil; +import net.lab1024.smartadmin.service.common.util.SmartStringUtil; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.*; import org.apache.ibatis.plugin.*; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java index cc3c6487..fa5a8f6c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java index 3cb298dd..57496174 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java index 90cf3b1b..9b0b64e1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java index 30ac0851..a0fd49f7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeService.java @@ -8,7 +8,7 @@ import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScope import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScopeViewTypeEnum; import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.*; import net.lab1024.smartadmin.service.module.system.datascope.domain.entity.DataScopeRoleEntity; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java index 3e6b19ea..09b2f3e9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeSqlConfigService.java @@ -8,7 +8,7 @@ import net.lab1024.smartadmin.service.module.system.datascope.constant.DataScope import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeSqlConfigDTO; import net.lab1024.smartadmin.service.module.system.datascope.strategy.DataScopePowerStrategy; import net.lab1024.smartadmin.service.third.SmartApplicationContext; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java index 93f052eb..5f464224 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/service/DataScopeViewService.java @@ -13,7 +13,7 @@ import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity; import net.lab1024.smartadmin.service.module.system.menu.MenuEmployeeService; import net.lab1024.smartadmin.service.module.system.role.roleemployee.RoleEmployeeDao; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; import java.util.Comparator; import java.util.List; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java index a964617b..68baeea8 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.department; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.department.domain.dto.DepartmentCreateDTO; import net.lab1024.smartadmin.service.module.system.department.domain.dto.DepartmentUpdateDTO; @@ -24,7 +24,7 @@ import java.util.List; */ @Api(tags = {SwaggerTagConst.Admin.MANAGER_DEPARTMENT}) @RestController -public class DepartmentController extends AdminBaseController { +public class DepartmentController extends SystemBaseController { @Autowired private DepartmentService departmentService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java index 1604c29f..bc18b6af 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.department; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.constant.CacheModuleConst; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache; import net.lab1024.smartadmin.service.module.support.beancache.key.CacheKey; @@ -15,7 +15,7 @@ import net.lab1024.smartadmin.service.module.system.department.domain.vo.Departm import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeDTO; import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; @@ -173,7 +173,7 @@ public class DepartmentService { List deptList = departmentVOList.stream().filter(e -> e.getId().equals(parentId)).collect(Collectors.toList()); for (DepartmentVO item : deptList) { result.add(item); - if (item.getParentId() != CommonConst.DEFAULT_PARENT_ID && item.getParentId() != null) { + if (item.getParentId() != StringConst.DEFAULT_PARENT_ID && item.getParentId() != null) { result.addAll(getParentDepartment(departmentVOList, item.getParentId(), result)); } } @@ -341,7 +341,7 @@ public class DepartmentService { if (departmentEntity == null) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - if (departmentEntity.getParentId() == null || departmentEntity.getParentId().equals(CommonConst.DEFAULT_PARENT_ID)) { + if (departmentEntity.getParentId() == null || departmentEntity.getParentId().equals(StringConst.DEFAULT_PARENT_ID)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "此部门已经是根节点无法移动"); } DepartmentEntity parentEntity = departmentDao.selectById(departmentEntity.getParentId()); @@ -453,7 +453,7 @@ public class DepartmentService { */ private void recursionFindParentDepartmentName(List departmentNameList, List departmentList, Long departmentId) { Optional findRes = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); - if (!findRes.isPresent() || findRes.get().getParentId() == CommonConst.DEFAULT_PARENT_ID) { + if (!findRes.isPresent() || findRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { return; } DepartmentVO departmentVO = findRes.get(); @@ -501,7 +501,7 @@ public class DepartmentService { private DepartmentVO recursionFindSchoolDepartmentId(List departmentList, Long departmentId) { Optional findRes = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); // 如果查询不到 或者自己本身为最顶级 返回null - if (!findRes.isPresent() || findRes.get().getParentId() == CommonConst.DEFAULT_PARENT_ID) { + if (!findRes.isPresent() || findRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { return null; } DepartmentVO departmentVO = findRes.get(); @@ -512,7 +512,7 @@ public class DepartmentService { return null; } // 若父级为最顶级 则返回本级ID - if (parentFindRes.get().getParentId() == CommonConst.DEFAULT_PARENT_ID) { + if (parentFindRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { return departmentVO; } // 若父级不为最顶级 进入递归 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java index f7e59247..624392a1 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java @@ -1,10 +1,10 @@ package net.lab1024.smartadmin.service.module.system.department; import com.google.common.collect.Lists; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class DepartmentTreeService { if (CollectionUtils.isEmpty(voList)) { return Lists.newArrayList(); } - List rootList = voList.stream().filter(e -> e.getParentId() == null || e.getParentId() == CommonConst.DEFAULT_PARENT_ID).collect(Collectors.toList()); + List rootList = voList.stream().filter(e -> e.getParentId() == null || e.getParentId() == StringConst.DEFAULT_PARENT_ID).collect(Collectors.toList()); if (CollectionUtils.isEmpty(rootList)) { return Lists.newArrayList(); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeConst.java new file mode 100644 index 00000000..7f816206 --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeConst.java @@ -0,0 +1,15 @@ +package net.lab1024.smartadmin.service.module.system.employee; + +/** + * @author 罗伊 + * @date 2021-01-31 0:00 + */ + class EmployeeConst { + + static final class Password { + + static final String DEFAULT = "123456"; + + static final String SALT_FORMAT = "smartAdmin_%s"; + } +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java index 46b06c96..d06b223c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java @@ -3,12 +3,12 @@ package net.lab1024.smartadmin.service.module.system.employee; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.employee.domain.dto.*; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @Api(tags = {SwaggerTagConst.Admin.MANAGER_EMPLOYEE}) -public class EmployeeController extends AdminBaseController { +public class EmployeeController extends SystemBaseController { @Autowired private EmployeeService employeeService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java index e6039a71..162a53c6 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.constant.CacheModuleConst; -import net.lab1024.smartadmin.service.common.constant.CommonConst; -import net.lab1024.smartadmin.service.common.constant.SystemConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache; @@ -21,8 +20,8 @@ import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginIn import net.lab1024.smartadmin.service.module.system.menu.MenuEmployeeService; import net.lab1024.smartadmin.service.module.system.role.roleemployee.RoleEmployeeDao; import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeEntity; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -403,7 +402,7 @@ public class EmployeeService { String cacheKey = CacheKey.cacheKey(CacheModuleConst.Employee.DEPARTMENT_EMPLOYEE_CACHE, departmentId.toString()); List employeeEntityList = beanCache.get(cacheKey); if (CollectionUtils.isEmpty(employeeEntityList)) { - return ResponseDTO.ok(CommonConst.EMPTY_LIST); + return ResponseDTO.ok(StringConst.EMPTY_LIST); } List voList = SmartBeanUtil.copyList(employeeEntityList, EmployeeVO.class); return ResponseDTO.ok(voList); @@ -489,8 +488,8 @@ public class EmployeeService { * @return */ public static String getEncryptPwd(String pwd) { - pwd = StringUtils.isBlank(pwd) ? SystemConst.Password.DEFAULT : pwd; - return DigestUtils.md5Hex(String.format(SystemConst.Password.SALT_FORMAT, pwd)); + pwd = StringUtils.isBlank(pwd) ? EmployeeConst.Password.DEFAULT : pwd; + return DigestUtils.md5Hex(String.format(EmployeeConst.Password.SALT_FORMAT, pwd)); } public static void main(String[] args) { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java index 5c0026a1..89af2cc4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java @@ -2,9 +2,9 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.enumconst.GenderEnum; +import net.lab1024.smartadmin.service.common.enumeration.GenderEnum; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; -import net.lab1024.smartadmin.service.util.SmartVerificationUtil; +import net.lab1024.smartadmin.service.common.util.SmartVerificationUtil; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeLoginDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeLoginDTO.java index 301dbdd8..a1679db5 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeLoginDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeLoginDTO.java @@ -2,8 +2,8 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaDTO; -import net.lab1024.smartadmin.service.util.SmartVerificationUtil; +import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaForm; +import net.lab1024.smartadmin.service.common.util.SmartVerificationUtil; import org.hibernate.validator.constraints.Length; import javax.validation.Valid; @@ -32,5 +32,5 @@ public class EmployeeLoginDTO { @ApiModelProperty("图形验证码|可选") // @NotNull(message = "图形验证码不能为空") @Valid - private CaptchaDTO captcha; + private CaptchaForm captcha; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryDTO.java index 9214be21..f448dd19 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeQueryDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Size; @@ -15,7 +15,7 @@ import java.util.List; * @date 2017年12月21日上午09:09:31 */ @Data -public class EmployeeQueryDTO extends PageBaseDTO { +public class EmployeeQueryDTO extends PageParamDTO { @ApiModelProperty("搜索词") @Length(max = 20, message = "搜索词最多20字符") diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java index 9b05658f..92ac023f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeUpdatePwdDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.util.SmartVerificationUtil; +import net.lab1024.smartadmin.service.common.util.SmartVerificationUtil; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java index 3f5451b5..8e60f27b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import net.lab1024.smartadmin.service.common.enumconst.GenderEnum; +import net.lab1024.smartadmin.service.common.enumeration.GenderEnum; import java.time.LocalDateTime; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java index 913e64df..aab63b02 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.enumconst.GenderEnum; +import net.lab1024.smartadmin.service.common.enumeration.GenderEnum; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; import java.time.LocalDateTime; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java index 22005387..617f4bd8 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java @@ -2,14 +2,14 @@ package net.lab1024.smartadmin.service.module.system.login; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.anno.NoNeedLogin; +import net.lab1024.smartadmin.service.common.annoation.NoNeedLogin; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeLoginDTO; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginVO; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,7 +26,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = {SwaggerTagConst.Admin.MANAGER_EMPLOYEE_LOGIN}) -public class EmployeeLoginController extends AdminBaseController { +public class EmployeeLoginController extends SystemBaseController { @Autowired private EmployeeLoginService employeeLoginService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginService.java index 58cc3a07..d5a7bf45 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginService.java @@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.system.login; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.support.captcha.CaptchaService; -import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaDTO; +import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaForm; import net.lab1024.smartadmin.service.module.system.department.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.DepartmentService; import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; @@ -18,7 +18,7 @@ import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginIn import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginVO; import net.lab1024.smartadmin.service.module.system.menu.MenuEmployeeService; import net.lab1024.smartadmin.service.module.system.menu.domain.MenuLoginBO; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,7 +60,7 @@ public class EmployeeLoginService { */ public ResponseDTO login(EmployeeLoginDTO loginDTO) { // 校验图形验证码 - CaptchaDTO captcha = loginDTO.getCaptcha(); + CaptchaForm captcha = loginDTO.getCaptcha(); if (null != captcha) { ResponseDTO res = captchaService.checkCaptcha(captcha.getCaptchaId(), captcha.getCaptcha()); if (!res.getOk()) { @@ -90,7 +90,7 @@ public class EmployeeLoginService { // 查询部门 DepartmentEntity deptEntity = departmentDao.selectById(employeeEntity.getDepartmentId()); - String deptName = null == deptEntity ? CommonConst.EMPTY_STR : deptEntity.getName(); + String deptName = null == deptEntity ? StringConst.EMPTY_STR : deptEntity.getName(); // 查询所在校区 DepartmentVO schoolIdByDepartment = departmentService.getSchoolIdByDepartment(employeeEntity.getDepartmentId()); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java index 3f936955..45ff7840 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java @@ -4,8 +4,8 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum; -import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO; +import net.lab1024.smartadmin.service.common.enumeration.SystemEnvironmentEnum; +import net.lab1024.smartadmin.service.common.domain.SystemEnvironment; import net.lab1024.smartadmin.service.module.system.employee.EmployeeService; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginBO; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; @@ -43,7 +43,7 @@ public class EmployeeLoginTokenService { private EmployeeService employeeService; @Autowired - private SystemEnvironmentBO systemEnvironmentBO; + private SystemEnvironment systemEnvironment; /** * 生成 JWT TOKEN @@ -75,7 +75,7 @@ public class EmployeeLoginTokenService { * 非生产环境 直接使用 token 作为id * 不需要的话 注释了吧 */ - SystemEnvironmentEnum currentEnvironment = systemEnvironmentBO.getCurrentEnvironment(); + SystemEnvironmentEnum currentEnvironment = systemEnvironment.getCurrentEnvironment(); if (SystemEnvironmentEnum.PROD != currentEnvironment && NumberUtils.isParsable(token)) { return employeeService.getById(Long.parseLong(token)); } @@ -106,7 +106,7 @@ public class EmployeeLoginTokenService { * 非生产环境 直接使用 token 作为id * 不需要的话 注释了吧 */ - SystemEnvironmentEnum currentEnvironment = systemEnvironmentBO.getCurrentEnvironment(); + SystemEnvironmentEnum currentEnvironment = systemEnvironment.getCurrentEnvironment(); if (SystemEnvironmentEnum.PROD != currentEnvironment && NumberUtils.isParsable(token)) { return employeeService.getBoById(Long.parseLong(token)); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java index e3aab712..837dafee 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.login.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.enumconst.GenderEnum; +import net.lab1024.smartadmin.service.common.enumeration.GenderEnum; import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum; import java.util.List; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java index 091260f9..8f144c50 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java @@ -3,10 +3,10 @@ package net.lab1024.smartadmin.service.module.system.menu; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.menu.domain.*; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,7 +20,7 @@ import java.util.List; */ @Api(tags = {SwaggerTagConst.Admin.MANAGER_MENU}) @RestController -public class MenuController extends AdminBaseController { +public class MenuController extends SystemBaseController { @Autowired private MenuService menuService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuEmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuEmployeeService.java index 99d9ff1a..111914e7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuEmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuEmployeeService.java @@ -11,7 +11,7 @@ import net.lab1024.smartadmin.service.module.system.menu.domain.MenuTreeVO; import net.lab1024.smartadmin.service.module.system.menu.domain.MenuVO; import net.lab1024.smartadmin.service.module.system.role.rolemenu.RoleMenuDao; import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuEntity; -import net.lab1024.smartadmin.service.util.SmartStringUtil; +import net.lab1024.smartadmin.service.common.util.SmartStringUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuPermissionService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuPermissionService.java index d488e915..46567afa 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuPermissionService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuPermissionService.java @@ -1,8 +1,8 @@ package net.lab1024.smartadmin.service.module.system.menu; -import net.lab1024.smartadmin.service.common.security.SmartSecurityMetadataSource; +import net.lab1024.smartadmin.service.common.security.SecurityMetadataSource; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; -import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; +import net.lab1024.smartadmin.service.common.util.SmartEmployeeTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * @author 卓大 * @date 2021/8/5 17:14 */ -@Service(SmartSecurityMetadataSource.PRIVILEGE_CHECK_NAME) +@Service(SecurityMetadataSource.PRIVILEGE_CHECK_NAME) public class MenuPermissionService { @Autowired diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java index 4c9858fb..b1a354a0 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java @@ -2,11 +2,11 @@ package net.lab1024.smartadmin.service.module.system.menu; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.menu.constant.MenuTypeEnum; import net.lab1024.smartadmin.service.module.system.menu.domain.*; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -231,7 +231,7 @@ public class MenuService { List menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null); //根据ParentId进行分组 Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List filterMenuVOList = this.filterNoParentMenu(parentMap, CommonConst.DEFAULT_PARENT_ID); + List filterMenuVOList = this.filterNoParentMenu(parentMap, StringConst.DEFAULT_PARENT_ID); return filterMenuVOList; } @@ -275,7 +275,7 @@ public class MenuService { List menuVOList = menuDao.queryMenuList(Boolean.FALSE, null, menuTypeList); //根据ParentId进行分组 Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List menuTreeVOList = this.buildMenuTree(parentMap, CommonConst.DEFAULT_PARENT_ID); + List menuTreeVOList = this.buildMenuTree(parentMap, StringConst.DEFAULT_PARENT_ID); return ResponseDTO.ok(menuTreeVOList); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java index 1bdc0d8a..2acb6457 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java @@ -1,12 +1,10 @@ package net.lab1024.smartadmin.service.module.system.menu; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.constant.CommonConst; import net.lab1024.smartadmin.service.module.system.menu.domain.RequestUrlVO; -import net.lab1024.smartadmin.service.util.SmartStringUtil; +import net.lab1024.smartadmin.service.common.util.SmartStringUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.AnnotationUtils; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java index 0ac74d29..cdb3235f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.menu.constant; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * 菜单类型枚举 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java index 88edfa80..d5fee985 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.role.basic; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleAddDTO; import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleUpdateDTO; @@ -22,7 +22,7 @@ import java.util.List; */ @Api(tags = {SwaggerTagConst.Admin.MANAGER_ROLE}) @RestController -public class RoleController extends AdminBaseController { +public class RoleController extends SystemBaseController { @Autowired private RoleService roleService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleService.java index 579c5021..b5352266 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleService.java @@ -8,7 +8,7 @@ import net.lab1024.smartadmin.service.module.system.role.basic.domain.entity.Rol import net.lab1024.smartadmin.service.module.system.role.basic.domain.vo.RoleVO; import net.lab1024.smartadmin.service.module.system.role.roleemployee.RoleEmployeeDao; import net.lab1024.smartadmin.service.module.system.role.rolemenu.RoleMenuDao; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryDTO.java index 83987bf7..a271756f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/domain/dto/RoleQueryDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.basic.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; /** * [ ] @@ -10,7 +10,7 @@ import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; * @author 罗伊 */ @Data -public class RoleQueryDTO extends PageBaseDTO { +public class RoleQueryDTO extends PageParamDTO { @ApiModelProperty("角色名称") private String roleName; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java index 8d3d8d05..fcb7abd9 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; @@ -26,7 +26,7 @@ import java.util.List; */ @Api(tags = {SwaggerTagConst.Admin.MANAGER_ROLE}) @RestController -public class RoleEmployeeController extends AdminBaseController { +public class RoleEmployeeController extends SystemBaseController { @Autowired private RoleEmployeeService roleEmployeeService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeService.java index 6ada861f..69f0075d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeService.java @@ -17,8 +17,8 @@ import net.lab1024.smartadmin.service.module.system.role.basic.domain.entity.Rol import net.lab1024.smartadmin.service.module.system.role.basic.domain.vo.RoleSelectedVO; import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeBatchDTO; import net.lab1024.smartadmin.service.module.system.role.roleemployee.domain.RoleEmployeeEntity; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java index 68d6ed14..44eb5a80 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java @@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.role.rolemenu; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; -import net.lab1024.smartadmin.service.common.controller.AdminBaseController; +import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuDTO; import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuTreeVO; @@ -20,7 +20,7 @@ import javax.validation.Valid; */ @RestController @Api(tags = {SwaggerTagConst.Admin.MANAGER_ROLE_MENU}) -public class RoleMenuController extends AdminBaseController { +public class RoleMenuController extends SystemBaseController { @Autowired private RoleMenuService roleMenuService; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java index fa9e4cd9..a809ebe7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.rolemenu; import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.constant.CommonConst; +import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.menu.MenuDao; import net.lab1024.smartadmin.service.module.system.menu.MenuEmployeeService; @@ -13,7 +13,7 @@ import net.lab1024.smartadmin.service.module.system.role.basic.domain.entity.Rol import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuDTO; import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuEntity; import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuTreeVO; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -83,7 +83,7 @@ public class RoleMenuService { //查询菜单权限 List menuVOList = menuDao.queryMenuList(Boolean.FALSE, Boolean.FALSE, null); Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List menuTreeList = this.buildMenuTree(parentMap, CommonConst.DEFAULT_PARENT_ID); + List menuTreeList = this.buildMenuTree(parentMap, StringConst.DEFAULT_PARENT_ID); res.setMenuTreeList(menuTreeList); return ResponseDTO.ok(res); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java index bbe73baa..32aaaab3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java @@ -7,7 +7,7 @@ import net.lab1024.smartadmin.service.common.controller.SupportBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.module.system.systemconfig.domain.*; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java index 8ea86a77..7542cd1d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig; import lombok.AllArgsConstructor; import lombok.Getter; -import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; +import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; /** * [ 系统配置常量类 ] diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigService.java index 3eb7b42e..6518d859 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigService.java @@ -6,11 +6,11 @@ import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.module.support.reload.core.anno.SmartReload; +import net.lab1024.smartadmin.service.module.support.reload.core.annoation.SmartReload; import net.lab1024.smartadmin.service.module.system.systemconfig.domain.*; -import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil; -import net.lab1024.smartadmin.service.util.SmartBeanUtil; -import net.lab1024.smartadmin.service.util.SmartPageUtil; +import net.lab1024.smartadmin.service.common.util.SmartBaseEnumUtil; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryDTO.java index 4292aac2..56c2f3af 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/domain/SystemConfigQueryDTO.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; +import net.lab1024.smartadmin.service.common.domain.PageParamDTO; import org.hibernate.validator.constraints.Length; /** @@ -14,7 +14,7 @@ import org.hibernate.validator.constraints.Length; * @since JDK1.8 */ @Data -public class SystemConfigQueryDTO extends PageBaseDTO { +public class SystemConfigQueryDTO extends PageParamDTO { @ApiModelProperty("参数KEY") @Length(max = 50, message = "参数Key最多50字符")