From a6186afd78f3018ea706feaad4ffb2afbc07a19d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 八月 2024 15:37:15 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 22
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotRoleException.java | 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java | 8
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java | 4
se-common/se-common-log/pom.xml | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 24
se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileSizeLimitExceededException.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excel.java | 6
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm | 15
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java | 6
se-common/ruoyi-common-log/pom.xml | 0
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/IdUtils.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java | 6
se-common/se-common-core/pom.xml | 0
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java | 14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java | 22
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java | 4
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysRole.java | 6
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java | 2
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictData.java | 8
se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java | 4
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictType.java | 6
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java | 16
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java | 2
se-api/se-api-system/pom.xml | 4
se-common/se-common-core/src/main/java/com/se/common/core/exception/user/CaptchaExpireException.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/web/page/PageDomain.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 14
se-common/se-common-security/src/main/java/com/se/common/security/interceptor/HeaderInterceptor.java | 18
se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excels.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/ExceptionUtil.java | 4
se-common/se-common-datascope/src/main/java/com/se/common/datascope/annotation/DataScope.java | 4
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java | 2
se-common/se-common-redis/pom.xml | 0
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java | 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm | 4
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresLogin.java | 4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm | 5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java | 18
se-common/se-common-sensitive/src/main/java/com/se/common/sensitive/annotation/Sensitive.java | 8
se-common/se-common-swagger/pom.xml | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java | 6
se-common/ruoyi-common-core/pom.xml | 0
se-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/web/domain/AjaxResult.java | 8
se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableCustomConfig.java | 32
se-common/se-common-core/src/main/java/com/se/common/core/constant/Constants.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java | 4
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java | 2
se-common/se-common-sensitive/pom.xml | 0
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 6
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java | 2
se-common/se-common-security/pom.xml | 0
se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerAutoConfiguration.java | 123 +++
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java | 16
se-common/se-common-datascope/pom.xml | 0
se-common/se-common-core/src/main/java/com/se/common/core/web/controller/BaseController.java | 15
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/text/Convert.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/constant/UserConstants.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 4
se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteUserFallbackFactory.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 0
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java | 2
se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerProperties.java | 343 ++++++++
se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableSupport.java | 8
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java | 22
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java | 20
se-api/se-api-system/src/main/java/com/se/system/api/RemoteFileService.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/Seq.java | 8
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java | 2
se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java | 0
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java | 2
se-api/se-api-system/src/main/java/com/se/system/api/RemoteUserService.java | 6
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 30
se-common/se-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileTypeUtils.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/exception/ServiceException.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java | 2
se-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java | 6
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java | 24
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotPermissionException.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java | 11
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 34
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthLogic.java | 31
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java | 2
se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java | 14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 32
se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/UUID.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 8
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java | 2
se-common/pom.xml | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 20
se-common/ruoyi-common-swagger/pom.xml | 0
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/utils/SpringUtils.java | 4
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java | 2
se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java | 0
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 2
se-common/se-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDept.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/domain/R.java | 6
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java | 4
se-common/ruoyi-common-security/pom.xml | 0
se-common/se-common-redis/src/main/java/com/se/common/redis/configure/FastJson2JsonRedisSerializer.java | 6
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java | 2
se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresPermissions.java | 4
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileUtils.java | 6
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java | 18
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 4
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java | 2
se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/enums/UserStatus.java | 4
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignRequestInterceptor.java | 12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 14
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 16
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java | 20
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java | 2
se-common/se-common-security/src/main/java/com/se/common/security/aspect/PreAuthorizeAspect.java | 97 ++
se-common/se-common-redis/src/main/java/com/se/common/redis/service/RedisService.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 4
se-common/se-common-log/src/main/java/com/se/common/log/filter/PropertyPreExcludeFilter.java | 4
se-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 14
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/web/domain/TreeEntity.java | 4
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 6
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java | 2
se-common/ruoyi-common-datascope/pom.xml | 0
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java | 2
se-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java | 24
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 4
se-common/se-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysLogininfor.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java | 4
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/constant/SecurityConstants.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java | 12
se-common/se-common-security/src/main/java/com/se/common/security/annotation/Logical.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java | 2
se-common/se-common-security/src/main/java/com/se/common/security/config/ApplicationConfig.java | 4
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java | 2
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java | 12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java | 6
se-common/se-common-core/src/main/java/com/se/common/core/exception/GlobalException.java | 4
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java | 14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 18
se-common/se-common-security/src/main/java/com/se/common/security/utils/SecurityUtils.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java | 18
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 6
se-common/se-common-core/src/main/java/com/se/common/core/constant/ServiceNameConstants.java | 4
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysOperLog.java | 6
ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java | 6
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java | 2
se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteLogFallbackFactory.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java | 8
se-common/se-common-core/src/main/java/com/se/common/core/utils/html/EscapeUtil.java | 6
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java | 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/utils/PageUtils.java | 10
se-common/se-common-core/src/main/java/com/se/common/core/utils/html/HTMLFilter.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java | 2
se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerWebConfiguration.java | 4
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java | 14
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java | 2
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 18
se-common/se-common-core/src/main/java/com/se/common/core/utils/ip/IpUtils.java | 8
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java | 2
se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresRoles.java | 4
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java | 20
se-common/se-common-core/src/main/java/com/se/common/core/exception/CaptchaException.java | 4
se-common/se-common-datasource/src/main/java/com/se/common/datasource/annotation/Slave.java | 4
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java | 2
se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java | 0
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java | 18
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java | 8
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java | 2
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java | 2
se-common/se-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java | 4
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/utils/StringUtils.java | 9
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java | 2
se-api/se-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 6
se-common/se-common-core/src/main/java/com/se/common/core/exception/file/InvalidExtensionException.java | 4
se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteFileFallbackFactory.java | 2
se-api/se-api-system/src/main/java/com/se/system/api/RemoteLogService.java | 6
se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/utils/poi/ExcelHandlerAdapter.java | 4
se-common/se-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 5
se-common/se-common-core/src/main/java/com/se/common/core/utils/bean/BeanUtils.java | 4
se-common/se-common-redis/src/main/java/com/se/common/redis/configure/RedisConfig.java | 4
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java | 2
se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java | 12
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java | 6
se-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
se-common/se-common-security/src/main/java/com/se/common/security/service/TokenService.java | 25
se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileNameLengthLimitExceededException.java | 4
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java | 2
se-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/utils/file/ImageUtils.java | 4
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/utils/DateUtils.java | 4
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java | 6
se-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java | 2
se-common/se-common-core/src/main/java/com/se/common/core/exception/CheckedException.java | 4
se-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java | 4
se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableDataInfo.java | 4
se-common/ruoyi-common-redis/pom.xml | 0
se-common/se-common-core/src/main/java/com/se/common/core/text/StrFormatter.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthUtil.java | 10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableRyFeignClients.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java | 2
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java | 2
se-common/ruoyi-common-sensitive/pom.xml | 0
/dev/null | 74 -
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java | 4
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java | 2
se-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 0
se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignAutoConfiguration.java | 4
se-common/se-common-security/src/main/java/com/se/common/security/config/WebMvcConfig.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java | 4
se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java | 2
320 files changed, 1,442 insertions(+), 912 deletions(-)
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
deleted file mode 100644
index da19513..0000000
--- a/ruoyi-api/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <modules>
- <module>ruoyi-api-system</module>
- </modules>
-
- <artifactId>ruoyi-api</artifactId>
- <packaging>pom</packaging>
-
- <description>
- ruoyi-api绯荤粺鎺ュ彛
- </description>
-
-</project>
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
deleted file mode 100644
index 9fd70d6..0000000
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-api</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ruoyi-api-system</artifactId>
-
- <description>
- ruoyi-api-system绯荤粺鎺ュ彛妯″潡
- </description>
-
- <dependencies>
-
- <!-- RuoYi Common Core-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
deleted file mode 100644
index ed49e2c..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.system.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
-
-/**
- * 鏂囦欢鏈嶅姟
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
-public interface RemoteFileService
-{
- /**
- * 涓婁紶鏂囦欢
- *
- * @param file 鏂囦欢淇℃伅
- * @return 缁撴灉
- */
- @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
deleted file mode 100644
index 525eda3..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ruoyi.system.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
-import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
-
-/**
- * 鏃ュ織鏈嶅姟
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
-public interface RemoteLogService
-{
- /**
- * 淇濆瓨绯荤粺鏃ュ織
- *
- * @param sysOperLog 鏃ュ織瀹炰綋
- * @param source 璇锋眰鏉ユ簮
- * @return 缁撴灉
- */
- @PostMapping("/operlog")
- public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
-
- /**
- * 淇濆瓨璁块棶璁板綍
- *
- * @param sysLogininfor 璁块棶瀹炰綋
- * @param source 璇锋眰鏉ユ簮
- * @return 缁撴灉
- */
- @PostMapping("/logininfor")
- public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
deleted file mode 100644
index 95cb91d..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.ruoyi.system.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * 鐢ㄦ埛鏈嶅姟
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService
-{
- /**
- * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴蜂俊鎭�
- *
- * @param username 鐢ㄦ埛鍚�
- * @param source 璇锋眰鏉ユ簮
- * @return 缁撴灉
- */
- @GetMapping("/user/info/{username}")
- public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
- /**
- * 娉ㄥ唽鐢ㄦ埛淇℃伅
- *
- * @param sysUser 鐢ㄦ埛淇℃伅
- * @param source 璇锋眰鏉ユ簮
- * @return 缁撴灉
- */
- @PostMapping("/user/register")
- public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
- /**
- * 璁板綍鐢ㄦ埛鐧诲綍IP鍦板潃鍜岀櫥褰曟椂闂�
- *
- * @param sysUser 鐢ㄦ埛淇℃伅
- * @param source 璇锋眰鏉ユ簮
- * @return 缁撴灉
- */
- @PutMapping("/user/recordlogin")
- public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
deleted file mode 100644
index 91173f0..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 閮ㄩ棬琛� sys_dept
- *
- * @author ruoyi
- */
-public class SysDept extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 閮ㄩ棬ID */
- private Long deptId;
-
- /** 鐖堕儴闂↖D */
- private Long parentId;
-
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
-
- /** 閮ㄩ棬鍚嶇О */
- private String deptName;
-
- /** 鏄剧ず椤哄簭 */
- private Integer orderNum;
-
- /** 璐熻矗浜� */
- private String leader;
-
- /** 鑱旂郴鐢佃瘽 */
- private String phone;
-
- /** 閭 */
- private String email;
-
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
- private String status;
-
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
-
- /** 鐖堕儴闂ㄥ悕绉� */
- private String parentName;
-
- /** 瀛愰儴闂� */
- private List<SysDept> children = new ArrayList<SysDept>();
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public Long getParentId()
- {
- return parentId;
- }
-
- public void setParentId(Long parentId)
- {
- this.parentId = parentId;
- }
-
- public String getAncestors()
- {
- return ancestors;
- }
-
- public void setAncestors(String ancestors)
- {
- this.ancestors = ancestors;
- }
-
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public Integer getOrderNum()
- {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum)
- {
- this.orderNum = orderNum;
- }
-
- public String getLeader()
- {
- return leader;
- }
-
- public void setLeader(String leader)
- {
- this.leader = leader;
- }
-
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- public String getPhone()
- {
- return phone;
- }
-
- public void setPhone(String phone)
- {
- this.phone = phone;
- }
-
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getParentName()
- {
- return parentName;
- }
-
- public void setParentName(String parentName)
- {
- this.parentName = parentName;
- }
-
- public List<SysDept> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<SysDept> children)
- {
- this.children = children;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("deptId", getDeptId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("deptName", getDeptName())
- .append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
deleted file mode 100644
index e0c4a17..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 瀛楀吀鏁版嵁琛� sys_dict_data
- *
- * @author ruoyi
- */
-public class SysDictData extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瀛楀吀缂栫爜 */
- @Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
- private Long dictCode;
-
- /** 瀛楀吀鎺掑簭 */
- @Excel(name = "瀛楀吀鎺掑簭", cellType = ColumnType.NUMERIC)
- private Long dictSort;
-
- /** 瀛楀吀鏍囩 */
- @Excel(name = "瀛楀吀鏍囩")
- private String dictLabel;
-
- /** 瀛楀吀閿�� */
- @Excel(name = "瀛楀吀閿��")
- private String dictValue;
-
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- private String dictType;
-
- /** 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛� */
- private String cssClass;
-
- /** 琛ㄦ牸瀛楀吀鏍峰紡 */
- private String listClass;
-
- /** 鏄惁榛樿锛圷鏄� N鍚︼級 */
- @Excel(name = "鏄惁榛樿", readConverterExp = "Y=鏄�,N=鍚�")
- private String isDefault;
-
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- public Long getDictCode()
- {
- return dictCode;
- }
-
- public void setDictCode(Long dictCode)
- {
- this.dictCode = dictCode;
- }
-
- public Long getDictSort()
- {
- return dictSort;
- }
-
- public void setDictSort(Long dictSort)
- {
- this.dictSort = dictSort;
- }
-
- @NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getDictLabel()
- {
- return dictLabel;
- }
-
- public void setDictLabel(String dictLabel)
- {
- this.dictLabel = dictLabel;
- }
-
- @NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
- @Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
- public String getDictValue()
- {
- return dictValue;
- }
-
- public void setDictValue(String dictValue)
- {
- this.dictValue = dictValue;
- }
-
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getDictType()
- {
- return dictType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- @Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
- public String getCssClass()
- {
- return cssClass;
- }
-
- public void setCssClass(String cssClass)
- {
- this.cssClass = cssClass;
- }
-
- public String getListClass()
- {
- return listClass;
- }
-
- public void setListClass(String listClass)
- {
- this.listClass = listClass;
- }
-
- public boolean getDefault()
- {
- return UserConstants.YES.equals(this.isDefault);
- }
-
- public String getIsDefault()
- {
- return isDefault;
- }
-
- public void setIsDefault(String isDefault)
- {
- this.isDefault = isDefault;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("dictCode", getDictCode())
- .append("dictSort", getDictSort())
- .append("dictLabel", getDictLabel())
- .append("dictValue", getDictValue())
- .append("dictType", getDictType())
- .append("cssClass", getCssClass())
- .append("listClass", getListClass())
- .append("isDefault", getIsDefault())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
deleted file mode 100644
index c51a48d..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 瀛楀吀绫诲瀷琛� sys_dict_type
- *
- * @author ruoyi
- */
-public class SysDictType extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瀛楀吀涓婚敭 */
- @Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC)
- private Long dictId;
-
- /** 瀛楀吀鍚嶇О */
- @Excel(name = "瀛楀吀鍚嶇О")
- private String dictName;
-
- /** 瀛楀吀绫诲瀷 */
- @Excel(name = "瀛楀吀绫诲瀷")
- private String dictType;
-
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- public Long getDictId()
- {
- return dictId;
- }
-
- public void setDictId(Long dictId)
- {
- this.dictId = dictId;
- }
-
- @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getDictName()
- {
- return dictName;
- }
-
- public void setDictName(String dictName)
- {
- this.dictName = dictName;
- }
-
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛�")
- public String getDictType()
- {
- return dictType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("dictId", getDictId())
- .append("dictName", getDictName())
- .append("dictType", getDictType())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java
deleted file mode 100644
index c953b19..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 鏂囦欢淇℃伅
- *
- * @author ruoyi
- */
-public class SysFile
-{
- /**
- * 鏂囦欢鍚嶇О
- */
- private String name;
-
- /**
- * 鏂囦欢鍦板潃
- */
- private String url;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getUrl()
- {
- return url;
- }
-
- public void setUrl(String url)
- {
- this.url = url;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("name", getName())
- .append("url", getUrl())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java
deleted file mode 100644
index cd3be58..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 绯荤粺璁块棶璁板綍琛� sys_logininfor
- *
- * @author ruoyi
- */
-public class SysLogininfor extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** ID */
- @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
- private Long infoId;
-
- /** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐢ㄦ埛璐﹀彿")
- private String userName;
-
- /** 鐘舵�� 0鎴愬姛 1澶辫触 */
- @Excel(name = "鐘舵��", readConverterExp = "0=鎴愬姛,1=澶辫触")
- private String status;
-
- /** 鍦板潃 */
- @Excel(name = "鍦板潃")
- private String ipaddr;
-
- /** 鎻忚堪 */
- @Excel(name = "鎻忚堪")
- private String msg;
-
- /** 璁块棶鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date accessTime;
-
- public Long getInfoId()
- {
- return infoId;
- }
-
- public void setInfoId(Long infoId)
- {
- this.infoId = infoId;
- }
-
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
-
- public Date getAccessTime()
- {
- return accessTime;
- }
-
- public void setAccessTime(Date accessTime)
- {
- this.accessTime = accessTime;
- }
-}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
deleted file mode 100644
index a3c350f..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍琛� oper_log
- *
- * @author ruoyi
- */
-public class SysOperLog extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鏃ュ織涓婚敭 */
- @Excel(name = "鎿嶄綔搴忓彿", cellType = ColumnType.NUMERIC)
- private Long operId;
-
- /** 鎿嶄綔妯″潡 */
- @Excel(name = "鎿嶄綔妯″潡")
- private String title;
-
- /** 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛� */
- @Excel(name = "涓氬姟绫诲瀷", readConverterExp = "0=鍏跺畠,1=鏂板,2=淇敼,3=鍒犻櫎,4=鎺堟潈,5=瀵煎嚭,6=瀵煎叆,7=寮洪��,8=鐢熸垚浠ｇ爜,9=娓呯┖鏁版嵁")
- private Integer businessType;
-
- /** 涓氬姟绫诲瀷鏁扮粍 */
- private Integer[] businessTypes;
-
- /** 璇锋眰鏂规硶 */
- @Excel(name = "璇锋眰鏂规硶")
- private String method;
-
- /** 璇锋眰鏂瑰紡 */
- @Excel(name = "璇锋眰鏂瑰紡")
- private String requestMethod;
-
- /** 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級 */
- @Excel(name = "鎿嶄綔绫诲埆", readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
- private Integer operatorType;
-
- /** 鎿嶄綔浜哄憳 */
- @Excel(name = "鎿嶄綔浜哄憳")
- private String operName;
-
- /** 閮ㄩ棬鍚嶇О */
- @Excel(name = "閮ㄩ棬鍚嶇О")
- private String deptName;
-
- /** 璇锋眰url */
- @Excel(name = "璇锋眰鍦板潃")
- private String operUrl;
-
- /** 鎿嶄綔鍦板潃 */
- @Excel(name = "鎿嶄綔鍦板潃")
- private String operIp;
-
- /** 璇锋眰鍙傛暟 */
- @Excel(name = "璇锋眰鍙傛暟")
- private String operParam;
-
- /** 杩斿洖鍙傛暟 */
- @Excel(name = "杩斿洖鍙傛暟")
- private String jsonResult;
-
- /** 鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛� */
- @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=寮傚父")
- private Integer status;
-
- /** 閿欒娑堟伅 */
- @Excel(name = "閿欒娑堟伅")
- private String errorMsg;
-
- /** 鎿嶄綔鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date operTime;
-
- /** 娑堣�楁椂闂� */
- @Excel(name = "娑堣�楁椂闂�", suffix = "姣")
- private Long costTime;
-
- public Long getOperId()
- {
- return operId;
- }
-
- public void setOperId(Long operId)
- {
- this.operId = operId;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public Integer getBusinessType()
- {
- return businessType;
- }
-
- public void setBusinessType(Integer businessType)
- {
- this.businessType = businessType;
- }
-
- public Integer[] getBusinessTypes()
- {
- return businessTypes;
- }
-
- public void setBusinessTypes(Integer[] businessTypes)
- {
- this.businessTypes = businessTypes;
- }
-
- public String getMethod()
- {
- return method;
- }
-
- public void setMethod(String method)
- {
- this.method = method;
- }
-
- public String getRequestMethod()
- {
- return requestMethod;
- }
-
- public void setRequestMethod(String requestMethod)
- {
- this.requestMethod = requestMethod;
- }
-
- public Integer getOperatorType()
- {
- return operatorType;
- }
-
- public void setOperatorType(Integer operatorType)
- {
- this.operatorType = operatorType;
- }
-
- public String getOperName()
- {
- return operName;
- }
-
- public void setOperName(String operName)
- {
- this.operName = operName;
- }
-
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- public String getOperUrl()
- {
- return operUrl;
- }
-
- public void setOperUrl(String operUrl)
- {
- this.operUrl = operUrl;
- }
-
- public String getOperIp()
- {
- return operIp;
- }
-
- public void setOperIp(String operIp)
- {
- this.operIp = operIp;
- }
-
- public String getOperParam()
- {
- return operParam;
- }
-
- public void setOperParam(String operParam)
- {
- this.operParam = operParam;
- }
-
- public String getJsonResult()
- {
- return jsonResult;
- }
-
- public void setJsonResult(String jsonResult)
- {
- this.jsonResult = jsonResult;
- }
-
- public Integer getStatus()
- {
- return status;
- }
-
- public void setStatus(Integer status)
- {
- this.status = status;
- }
-
- public String getErrorMsg()
- {
- return errorMsg;
- }
-
- public void setErrorMsg(String errorMsg)
- {
- this.errorMsg = errorMsg;
- }
-
- public Date getOperTime()
- {
- return operTime;
- }
-
- public void setOperTime(Date operTime)
- {
- this.operTime = operTime;
- }
-
- public Long getCostTime()
- {
- return costTime;
- }
-
- public void setCostTime(Long costTime)
- {
- this.costTime = costTime;
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
deleted file mode 100644
index 62df8b5..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 瑙掕壊琛� sys_role
- *
- * @author ruoyi
- */
-public class SysRole extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瑙掕壊ID */
- @Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC)
- private Long roleId;
-
- /** 瑙掕壊鍚嶇О */
- @Excel(name = "瑙掕壊鍚嶇О")
- private String roleName;
-
- /** 瑙掕壊鏉冮檺 */
- @Excel(name = "瑙掕壊鏉冮檺")
- private String roleKey;
-
- /** 瑙掕壊鎺掑簭 */
- @Excel(name = "瑙掕壊鎺掑簭")
- private Integer roleSort;
-
- /** 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛� */
- @Excel(name = "鏁版嵁鑼冨洿", readConverterExp = "1=鎵�鏈夋暟鎹潈闄�,2=鑷畾涔夋暟鎹潈闄�,3=鏈儴闂ㄦ暟鎹潈闄�,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄�")
- private String dataScope;
-
- /** 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 */
- private boolean menuCheckStrictly;
-
- /** 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛� */
- private boolean deptCheckStrictly;
-
- /** 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "瑙掕壊鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
-
- /** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */
- private boolean flag = false;
-
- /** 鑿滃崟缁� */
- private Long[] menuIds;
-
- /** 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛� */
- private Long[] deptIds;
-
- /** 瑙掕壊鑿滃崟鏉冮檺 */
- private Set<String> permissions;
-
- public SysRole()
- {
-
- }
-
- public SysRole(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
-
- public boolean isAdmin()
- {
- return isAdmin(this.roleId);
- }
-
- public static boolean isAdmin(Long roleId)
- {
- return roleId != null && 1L == roleId;
- }
-
- @NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getRoleName()
- {
- return roleName;
- }
-
- public void setRoleName(String roleName)
- {
- this.roleName = roleName;
- }
-
- @NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getRoleKey()
- {
- return roleKey;
- }
-
- public void setRoleKey(String roleKey)
- {
- this.roleKey = roleKey;
- }
-
- @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public Integer getRoleSort()
- {
- return roleSort;
- }
-
- public void setRoleSort(Integer roleSort)
- {
- this.roleSort = roleSort;
- }
-
- public String getDataScope()
- {
- return dataScope;
- }
-
- public void setDataScope(String dataScope)
- {
- this.dataScope = dataScope;
- }
-
- public boolean isMenuCheckStrictly()
- {
- return menuCheckStrictly;
- }
-
- public void setMenuCheckStrictly(boolean menuCheckStrictly)
- {
- this.menuCheckStrictly = menuCheckStrictly;
- }
-
- public boolean isDeptCheckStrictly()
- {
- return deptCheckStrictly;
- }
-
- public void setDeptCheckStrictly(boolean deptCheckStrictly)
- {
- this.deptCheckStrictly = deptCheckStrictly;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public boolean isFlag()
- {
- return flag;
- }
-
- public void setFlag(boolean flag)
- {
- this.flag = flag;
- }
-
- public Long[] getMenuIds()
- {
- return menuIds;
- }
-
- public void setMenuIds(Long[] menuIds)
- {
- this.menuIds = menuIds;
- }
-
- public Long[] getDeptIds()
- {
- return deptIds;
- }
-
- public void setDeptIds(Long[] deptIds)
- {
- this.deptIds = deptIds;
- }
-
- public Set<String> getPermissions()
- {
- return permissions;
- }
-
- public void setPermissions(Set<String> permissions)
- {
- this.permissions = permissions;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("roleId", getRoleId())
- .append("roleName", getRoleName())
- .append("roleKey", getRoleKey())
- .append("roleSort", getRoleSort())
- .append("dataScope", getDataScope())
- .append("menuCheckStrictly", isMenuCheckStrictly())
- .append("deptCheckStrictly", isDeptCheckStrictly())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
deleted file mode 100644
index 43625ea..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.annotation.Excels;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
-
-/**
- * 鐢ㄦ埛瀵硅薄 sys_user
- *
- * @author ruoyi
- */
-public class SysUser extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鐢ㄦ埛ID */
- @Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
- private Long userId;
-
- /** 閮ㄩ棬ID */
- @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
- private Long deptId;
-
- /** 鐢ㄦ埛璐﹀彿 */
- @Excel(name = "鐧诲綍鍚嶇О")
- private String userName;
-
- /** 鐢ㄦ埛鏄电О */
- @Excel(name = "鐢ㄦ埛鍚嶇О")
- private String nickName;
-
- /** 鐢ㄦ埛閭 */
- @Excel(name = "鐢ㄦ埛閭")
- private String email;
-
- /** 鎵嬫満鍙风爜 */
- @Excel(name = "鎵嬫満鍙风爜", cellType = ColumnType.TEXT)
- private String phonenumber;
-
- /** 鐢ㄦ埛鎬у埆 */
- @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
- private String sex;
-
- /** 鐢ㄦ埛澶村儚 */
- private String avatar;
-
- /** 瀵嗙爜 */
- private String password;
-
- /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
- private String status;
-
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
-
- /** 鏈�鍚庣櫥褰旾P */
- @Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
- private String loginIp;
-
- /** 鏈�鍚庣櫥褰曟椂闂� */
- @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
- private Date loginDate;
-
- /** 閮ㄩ棬瀵硅薄 */
- @Excels({
- @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
- @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
- })
- private SysDept dept;
-
- /** 瑙掕壊瀵硅薄 */
- private List<SysRole> roles;
-
- /** 瑙掕壊缁� */
- private Long[] roleIds;
-
- /** 宀椾綅缁� */
- private Long[] postIds;
-
- /** 瑙掕壊ID */
- private Long roleId;
-
- public SysUser()
- {
-
- }
-
- public SysUser(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getUserId()
- {
- return userId;
- }
-
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public boolean isAdmin()
- {
- return isAdmin(this.userId);
- }
-
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getNickName()
- {
- return nickName;
- }
-
- public void setNickName(String nickName)
- {
- this.nickName = nickName;
- }
-
- @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getUserName()
- {
- return userName;
- }
-
- public void setUserName(String userName)
- {
- this.userName = userName;
- }
-
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
-
- @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- public String getPhonenumber()
- {
- return phonenumber;
- }
-
- public void setPhonenumber(String phonenumber)
- {
- this.phonenumber = phonenumber;
- }
-
- public String getSex()
- {
- return sex;
- }
-
- public void setSex(String sex)
- {
- this.sex = sex;
- }
-
- public String getAvatar()
- {
- return avatar;
- }
-
- public void setAvatar(String avatar)
- {
- this.avatar = avatar;
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getLoginIp()
- {
- return loginIp;
- }
-
- public void setLoginIp(String loginIp)
- {
- this.loginIp = loginIp;
- }
-
- public Date getLoginDate()
- {
- return loginDate;
- }
-
- public void setLoginDate(Date loginDate)
- {
- this.loginDate = loginDate;
- }
-
- public SysDept getDept()
- {
- return dept;
- }
-
- public void setDept(SysDept dept)
- {
- this.dept = dept;
- }
-
- public List<SysRole> getRoles()
- {
- return roles;
- }
-
- public void setRoles(List<SysRole> roles)
- {
- this.roles = roles;
- }
-
- public Long[] getRoleIds()
- {
- return roleIds;
- }
-
- public void setRoleIds(Long[] roleIds)
- {
- this.roleIds = roleIds;
- }
-
- public Long[] getPostIds()
- {
- return postIds;
- }
-
- public void setPostIds(Long[] postIds)
- {
- this.postIds = postIds;
- }
-
- public Long getRoleId()
- {
- return roleId;
- }
-
- public void setRoleId(Long roleId)
- {
- this.roleId = roleId;
- }
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("userId", getUserId())
- .append("deptId", getDeptId())
- .append("userName", getUserName())
- .append("nickName", getNickName())
- .append("email", getEmail())
- .append("phonenumber", getPhonenumber())
- .append("sex", getSex())
- .append("avatar", getAvatar())
- .append("password", getPassword())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("loginIp", getLoginIp())
- .append("loginDate", getLoginDate())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .append("dept", getDept())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
deleted file mode 100644
index 41def87..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
-
-/**
- * 鏂囦欢鏈嶅姟闄嶇骇澶勭悊
- *
- * @author ruoyi
- */
-@Component
-public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
-{
- private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
-
- @Override
- public RemoteFileService create(Throwable throwable)
- {
- log.error("鏂囦欢鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage());
- return new RemoteFileService()
- {
- @Override
- public R<SysFile> upload(MultipartFile file)
- {
- return R.fail("涓婁紶鏂囦欢澶辫触:" + throwable.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
deleted file mode 100644
index f2c0422..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
-
-/**
- * 鏃ュ織鏈嶅姟闄嶇骇澶勭悊
- *
- * @author ruoyi
- */
-@Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
-{
- private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
-
- @Override
- public RemoteLogService create(Throwable throwable)
- {
- log.error("鏃ュ織鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage());
- return new RemoteLogService()
- {
- @Override
- public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
- {
- return R.fail("淇濆瓨鎿嶄綔鏃ュ織澶辫触:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
- {
- return R.fail("淇濆瓨鐧诲綍鏃ュ織澶辫触:" + throwable.getMessage());
- }
- };
-
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
deleted file mode 100644
index 5972b3f..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * 鐢ㄦ埛鏈嶅姟闄嶇骇澶勭悊
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
- private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
- @Override
- public RemoteUserService create(Throwable throwable)
- {
- log.error("鐢ㄦ埛鏈嶅姟璋冪敤澶辫触:{}", throwable.getMessage());
- return new RemoteUserService()
- {
- @Override
- public R<LoginUser> getUserInfo(String username, String source)
- {
- return R.fail("鑾峰彇鐢ㄦ埛澶辫触:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> registerUserInfo(SysUser sysUser, String source)
- {
- return R.fail("娉ㄥ唽鐢ㄦ埛澶辫触:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> recordUserLogin(SysUser sysUser, String source)
- {
- return R.fail("璁板綍鐢ㄦ埛鐧诲綍淇℃伅澶辫触:" + throwable.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
deleted file mode 100644
index ef266a0..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import java.io.Serializable;
-import java.util.Set;
-import com.ruoyi.system.api.domain.SysUser;
-
-/**
- * 鐢ㄦ埛淇℃伅
- *
- * @author ruoyi
- */
-public class LoginUser implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛鍞竴鏍囪瘑
- */
- private String token;
-
- /**
- * 鐢ㄦ埛鍚峣d
- */
- private Long userid;
-
- /**
- * 鐢ㄦ埛鍚�
- */
- private String username;
-
- /**
- * 鐧诲綍鏃堕棿
- */
- private Long loginTime;
-
- /**
- * 杩囨湡鏃堕棿
- */
- private Long expireTime;
-
- /**
- * 鐧诲綍IP鍦板潃
- */
- private String ipaddr;
-
- /**
- * 鏉冮檺鍒楄〃
- */
- private Set<String> permissions;
-
- /**
- * 瑙掕壊鍒楄〃
- */
- private Set<String> roles;
-
- /**
- * 鐢ㄦ埛淇℃伅
- */
- private SysUser sysUser;
-
- public String getToken()
- {
- return token;
- }
-
- public void setToken(String token)
- {
- this.token = token;
- }
-
- public Long getUserid()
- {
- return userid;
- }
-
- public void setUserid(Long userid)
- {
- this.userid = userid;
- }
-
- public String getUsername()
- {
- return username;
- }
-
- public void setUsername(String username)
- {
- this.username = username;
- }
-
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-
- public Long getExpireTime()
- {
- return expireTime;
- }
-
- public void setExpireTime(Long expireTime)
- {
- this.expireTime = expireTime;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public Set<String> getPermissions()
- {
- return permissions;
- }
-
- public void setPermissions(Set<String> permissions)
- {
- this.permissions = permissions;
- }
-
- public Set<String> getRoles()
- {
- return roles;
- }
-
- public void setRoles(Set<String> roles)
- {
- this.roles = roles;
- }
-
- public SysUser getSysUser()
- {
- return sysUser;
- }
-
- public void setSysUser(SysUser sysUser)
- {
- this.sysUser = sysUser;
- }
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 0a60da5..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-com.ruoyi.system.api.factory.RemoteUserFallbackFactory
-com.ruoyi.system.api.factory.RemoteLogFallbackFactory
-com.ruoyi.system.api.factory.RemoteFileFallbackFactory
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
index 1e3a087..a765fe9 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
@@ -3,12 +3,12 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.se.common.security.annotation.EnableRyFeignClients;
/**
* 璁よ瘉鎺堟潈涓績
*
- * @author ruoyi
+ * @author admin
*/
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 9738e47..2b8fae6 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -9,18 +9,18 @@
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.domain.R;
+import com.se.common.core.utils.JwtUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.auth.AuthUtil;
+import com.se.common.security.service.TokenService;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.model.LoginUser;
/**
* token 鎺у埗
*
- * @author ruoyi
+ * @author admin
*/
@RestController
public class TokenController
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
index b12fb31..83b9b07 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
@@ -3,7 +3,7 @@
/**
* 鐢ㄦ埛鐧诲綍瀵硅薄
*
- * @author ruoyi
+ * @author admin
*/
public class LoginBody
{
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
index 9741507..b69aaa4 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
@@ -3,7 +3,7 @@
/**
* 鐢ㄦ埛娉ㄥ唽瀵硅薄
*
- * @author ruoyi
+ * @author admin
*/
public class RegisterBody extends LoginBody
{
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index f265149..89f23be 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -2,27 +2,27 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.domain.R;
+import com.se.common.core.enums.UserStatus;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.text.Convert;
+import com.se.common.core.utils.DateUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.ip.IpUtils;
+import com.se.common.redis.service.RedisService;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.RemoteUserService;
+import com.se.system.api.domain.SysUser;
+import com.se.system.api.model.LoginUser;
/**
* 鐧诲綍鏍￠獙鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class SysLoginService
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
index eb18ea8..f9260c9 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
@@ -3,17 +3,17 @@
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.redis.service.RedisService;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysUser;
/**
* 鐧诲綍瀵嗙爜鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class SysPasswordService
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
index 7ca0f00..03fd29e 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
@@ -2,17 +2,17 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.ip.IpUtils;
+import com.se.system.api.RemoteLogService;
+import com.se.system.api.domain.SysLogininfor;
/**
* 璁板綍鏃ュ織鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class SysRecordLogService
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
deleted file mode 100644
index 1d2510e..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 缂撳瓨甯搁噺淇℃伅
- *
- * @author ruoyi
- */
-public class CacheConstants
-{
- /**
- * 缂撳瓨鏈夋晥鏈燂紝榛樿720锛堝垎閽燂級
- */
- public final static long EXPIRATION = 720;
-
- /**
- * 缂撳瓨鍒锋柊鏃堕棿锛岄粯璁�120锛堝垎閽燂級
- */
- public final static long REFRESH_TIME = 120;
-
- /**
- * 瀵嗙爜鏈�澶ч敊璇鏁�
- */
- public final static int PASSWORD_MAX_RETRY_COUNT = 5;
-
- /**
- * 瀵嗙爜閿佸畾鏃堕棿锛岄粯璁�10锛堝垎閽燂級
- */
- public final static long PASSWORD_LOCK_TIME = 10;
-
- /**
- * 鏉冮檺缂撳瓨鍓嶇紑
- */
- public final static String LOGIN_TOKEN_KEY = "login_tokens:";
-
- /**
- * 楠岃瘉鐮� redis key
- */
- public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
- /**
- * 鍙傛暟绠＄悊 cache key
- */
- public static final String SYS_CONFIG_KEY = "sys_config:";
-
- /**
- * 瀛楀吀绠＄悊 cache key
- */
- public static final String SYS_DICT_KEY = "sys_dict:";
-
- /**
- * 鐧诲綍璐︽埛瀵嗙爜閿欒娆℃暟 redis key
- */
- public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
-
- /**
- * 鐧诲綍IP榛戝悕鍗� cache key
- */
- public static final String SYS_LOGIN_BLACKIPLIST = SYS_CONFIG_KEY + "sys.login.blackIPList";
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
deleted file mode 100644
index 4519734..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 浠ｇ爜鐢熸垚閫氱敤甯搁噺
- *
- * @author ruoyi
- */
-public class GenConstants
-{
- /** 鍗曡〃锛堝鍒犳敼鏌ワ級 */
- public static final String TPL_CRUD = "crud";
-
- /** 鏍戣〃锛堝鍒犳敼鏌ワ級 */
- public static final String TPL_TREE = "tree";
-
- /** 涓诲瓙琛紙澧炲垹鏀规煡锛� */
- public static final String TPL_SUB = "sub";
-
- /** 鏍戠紪鐮佸瓧娈� */
- public static final String TREE_CODE = "treeCode";
-
- /** 鏍戠埗缂栫爜瀛楁 */
- public static final String TREE_PARENT_CODE = "treeParentCode";
-
- /** 鏍戝悕绉板瓧娈� */
- public static final String TREE_NAME = "treeName";
-
- /** 涓婄骇鑿滃崟ID瀛楁 */
- public static final String PARENT_MENU_ID = "parentMenuId";
-
- /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */
- public static final String PARENT_MENU_NAME = "parentMenuName";
-
- /** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
-
- /** 鏁版嵁搴撴枃鏈被鍨� */
- public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
-
- /** 鏁版嵁搴撴椂闂寸被鍨� */
- public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
-
- /** 鏁版嵁搴撴暟瀛楃被鍨� */
- public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
- "bit", "bigint", "float", "double", "decimal" };
-
- /** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈� */
- public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
-
- /** 椤甸潰涓嶉渶瑕佹樉绀虹殑鍒楄〃瀛楁 */
- public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
- "update_time" };
-
- /** 椤甸潰涓嶉渶瑕佹煡璇㈠瓧娈� */
- public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "remark" };
-
- /** Entity鍩虹被瀛楁 */
- public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
-
- /** Tree鍩虹被瀛楁 */
- public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
-
- /** 鏂囨湰妗� */
- public static final String HTML_INPUT = "input";
-
- /** 鏂囨湰鍩� */
- public static final String HTML_TEXTAREA = "textarea";
-
- /** 涓嬫媺妗� */
- public static final String HTML_SELECT = "select";
-
- /** 鍗曢�夋 */
- public static final String HTML_RADIO = "radio";
-
- /** 澶嶉�夋 */
- public static final String HTML_CHECKBOX = "checkbox";
-
- /** 鏃ユ湡鎺т欢 */
- public static final String HTML_DATETIME = "datetime";
-
- /** 鍥剧墖涓婁紶鎺т欢 */
- public static final String HTML_IMAGE_UPLOAD = "imageUpload";
-
- /** 鏂囦欢涓婁紶鎺т欢 */
- public static final String HTML_FILE_UPLOAD = "fileUpload";
-
- /** 瀵屾枃鏈帶浠� */
- public static final String HTML_EDITOR = "editor";
-
- /** 瀛楃涓茬被鍨� */
- public static final String TYPE_STRING = "String";
-
- /** 鏁村瀷 */
- public static final String TYPE_INTEGER = "Integer";
-
- /** 闀挎暣鍨� */
- public static final String TYPE_LONG = "Long";
-
- /** 娴偣鍨� */
- public static final String TYPE_DOUBLE = "Double";
-
- /** 楂樼簿搴﹁绠楃被鍨� */
- public static final String TYPE_BIGDECIMAL = "BigDecimal";
-
- /** 鏃堕棿绫诲瀷 */
- public static final String TYPE_DATE = "Date";
-
- /** 妯＄硦鏌ヨ */
- public static final String QUERY_LIKE = "LIKE";
-
- /** 鐩哥瓑鏌ヨ */
- public static final String QUERY_EQ = "EQ";
-
- /** 闇�瑕� */
- public static final String REQUIRE = "1";
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java
deleted file mode 100644
index 220a21f..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 杩斿洖鐘舵�佺爜
- *
- * @author ruoyi
- */
-public class HttpStatus
-{
- /**
- * 鎿嶄綔鎴愬姛
- */
- public static final int SUCCESS = 200;
-
- /**
- * 瀵硅薄鍒涘缓鎴愬姛
- */
- public static final int CREATED = 201;
-
- /**
- * 璇锋眰宸茬粡琚帴鍙�
- */
- public static final int ACCEPTED = 202;
-
- /**
- * 鎿嶄綔宸茬粡鎵ц鎴愬姛锛屼絾鏄病鏈夎繑鍥炴暟鎹�
- */
- public static final int NO_CONTENT = 204;
-
- /**
- * 璧勬簮宸茶绉婚櫎
- */
- public static final int MOVED_PERM = 301;
-
- /**
- * 閲嶅畾鍚�
- */
- public static final int SEE_OTHER = 303;
-
- /**
- * 璧勬簮娌℃湁琚慨鏀�
- */
- public static final int NOT_MODIFIED = 304;
-
- /**
- * 鍙傛暟鍒楄〃閿欒锛堢己灏戯紝鏍煎紡涓嶅尮閰嶏級
- */
- public static final int BAD_REQUEST = 400;
-
- /**
- * 鏈巿鏉�
- */
- public static final int UNAUTHORIZED = 401;
-
- /**
- * 璁块棶鍙楅檺锛屾巿鏉冭繃鏈�
- */
- public static final int FORBIDDEN = 403;
-
- /**
- * 璧勬簮锛屾湇鍔℃湭鎵惧埌
- */
- public static final int NOT_FOUND = 404;
-
- /**
- * 涓嶅厑璁哥殑http鏂规硶
- */
- public static final int BAD_METHOD = 405;
-
- /**
- * 璧勬簮鍐茬獊锛屾垨鑰呰祫婧愯閿�
- */
- public static final int CONFLICT = 409;
-
- /**
- * 涓嶆敮鎸佺殑鏁版嵁锛屽獟浣撶被鍨�
- */
- public static final int UNSUPPORTED_TYPE = 415;
-
- /**
- * 绯荤粺鍐呴儴閿欒
- */
- public static final int ERROR = 500;
-
- /**
- * 鎺ュ彛鏈疄鐜�
- */
- public static final int NOT_IMPLEMENTED = 501;
-
- /**
- * 绯荤粺璀﹀憡娑堟伅
- */
- public static final int WARN = 601;
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java
deleted file mode 100644
index b264a07..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 浠诲姟璋冨害閫氱敤甯搁噺
- *
- * @author ruoyi
- */
-public class ScheduleConstants
-{
- public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
-
- /** 鎵ц鐩爣key */
- public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
-
- /** 榛樿 */
- public static final String MISFIRE_DEFAULT = "0";
-
- /** 绔嬪嵆瑙﹀彂鎵ц */
- public static final String MISFIRE_IGNORE_MISFIRES = "1";
-
- /** 瑙﹀彂涓�娆℃墽琛� */
- public static final String MISFIRE_FIRE_AND_PROCEED = "2";
-
- /** 涓嶈Е鍙戠珛鍗虫墽琛� */
- public static final String MISFIRE_DO_NOTHING = "3";
-
- public enum Status
- {
- /**
- * 姝ｅ父
- */
- NORMAL("0"),
- /**
- * 鏆傚仠
- */
- PAUSE("1");
-
- private String value;
-
- private Status(String value)
- {
- this.value = value;
- }
-
- public String getValue()
- {
- return value;
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java
deleted file mode 100644
index e1e5c2f..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * Token鐨凨ey甯搁噺
- *
- * @author ruoyi
- */
-public class TokenConstants
-{
- /**
- * 浠ょ墝鑷畾涔夋爣璇�
- */
- public static final String AUTHENTICATION = "Authorization";
-
- /**
- * 浠ょ墝鍓嶇紑
- */
- public static final String PREFIX = "Bearer ";
-
- /**
- * 浠ょ墝绉橀挜
- */
- public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
deleted file mode 100644
index d7e94ec..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.ruoyi.common.core.context;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import com.alibaba.ttl.TransmittableThreadLocal;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般�乀oken绛変俊鎭�
- * 娉ㄦ剰锛� 蹇呴』鍦ㄧ綉鍏抽�氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃�笺�� 鍚﹀垯杩欓噷鏃犳硶鑾峰彇
- *
- * @author ruoyi
- */
-public class SecurityContextHolder
-{
- private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
-
- public static void set(String key, Object value)
- {
- Map<String, Object> map = getLocalMap();
- map.put(key, value == null ? StringUtils.EMPTY : value);
- }
-
- public static String get(String key)
- {
- Map<String, Object> map = getLocalMap();
- return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
- }
-
- public static <T> T get(String key, Class<T> clazz)
- {
- Map<String, Object> map = getLocalMap();
- return StringUtils.cast(map.getOrDefault(key, null));
- }
-
- public static Map<String, Object> getLocalMap()
- {
- Map<String, Object> map = THREAD_LOCAL.get();
- if (map == null)
- {
- map = new ConcurrentHashMap<String, Object>();
- THREAD_LOCAL.set(map);
- }
- return map;
- }
-
- public static void setLocalMap(Map<String, Object> threadLocalMap)
- {
- THREAD_LOCAL.set(threadLocalMap);
- }
-
- public static Long getUserId()
- {
- return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
- }
-
- public static void setUserId(String account)
- {
- set(SecurityConstants.DETAILS_USER_ID, account);
- }
-
- public static String getUserName()
- {
- return get(SecurityConstants.DETAILS_USERNAME);
- }
-
- public static void setUserName(String username)
- {
- set(SecurityConstants.DETAILS_USERNAME, username);
- }
-
- public static String getUserKey()
- {
- return get(SecurityConstants.USER_KEY);
- }
-
- public static void setUserKey(String userKey)
- {
- set(SecurityConstants.USER_KEY, userKey);
- }
-
- public static String getPermission()
- {
- return get(SecurityConstants.ROLE_PERMISSION);
- }
-
- public static void setPermission(String permissions)
- {
- set(SecurityConstants.ROLE_PERMISSION, permissions);
- }
-
- public static void remove()
- {
- THREAD_LOCAL.remove();
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java
deleted file mode 100644
index 6197e98..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 婕旂ず妯″紡寮傚父
- *
- * @author ruoyi
- */
-public class DemoModeException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public DemoModeException()
- {
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java
deleted file mode 100644
index 96f825d..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 鍐呴儴璁よ瘉寮傚父
- *
- * @author ruoyi
- */
-public class InnerAuthException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public InnerAuthException(String message)
- {
- super(message);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java
deleted file mode 100644
index 3d420c4..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 鏉冮檺寮傚父
- *
- * @author ruoyi
- */
-public class PreAuthorizeException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public PreAuthorizeException()
- {
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
deleted file mode 100644
index 18c7be8..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 宸ュ叿绫诲紓甯�
- *
- * @author ruoyi
- */
-public class UtilException extends RuntimeException
-{
- private static final long serialVersionUID = 8247610319171014183L;
-
- public UtilException(Throwable e)
- {
- super(e.getMessage(), e);
- }
-
- public UtilException(String message)
- {
- super(message);
- }
-
- public UtilException(String message, Throwable throwable)
- {
- super(message, throwable);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
deleted file mode 100644
index 01e5771..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.core.exception.auth;
-
-/**
- * 鏈兘閫氳繃鐨勭櫥褰曡璇佸紓甯�
- *
- * @author ruoyi
- */
-public class NotLoginException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- public NotLoginException(String message)
- {
- super(message);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
deleted file mode 100644
index 3d2fa10..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.ruoyi.common.core.exception.base;
-
-/**
- * 鍩虹寮傚父
- *
- * @author ruoyi
- */
-public class BaseException extends RuntimeException
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鎵�灞炴ā鍧�
- */
- private String module;
-
- /**
- * 閿欒鐮�
- */
- private String code;
-
- /**
- * 閿欒鐮佸搴旂殑鍙傛暟
- */
- private Object[] args;
-
- /**
- * 閿欒娑堟伅
- */
- private String defaultMessage;
-
- public BaseException(String module, String code, Object[] args, String defaultMessage)
- {
- this.module = module;
- this.code = code;
- this.args = args;
- this.defaultMessage = defaultMessage;
- }
-
- public BaseException(String module, String code, Object[] args)
- {
- this(module, code, args, null);
- }
-
- public BaseException(String module, String defaultMessage)
- {
- this(module, null, null, defaultMessage);
- }
-
- public BaseException(String code, Object[] args)
- {
- this(null, code, args, null);
- }
-
- public BaseException(String defaultMessage)
- {
- this(null, null, null, defaultMessage);
- }
-
- public String getModule()
- {
- return module;
- }
-
- public String getCode()
- {
- return code;
- }
-
- public Object[] getArgs()
- {
- return args;
- }
-
- public String getDefaultMessage()
- {
- return defaultMessage;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
deleted file mode 100644
index a156b7b..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.common.core.exception.file;
-
-import com.ruoyi.common.core.exception.base.BaseException;
-
-/**
- * 鏂囦欢淇℃伅寮傚父绫�
- *
- * @author ruoyi
- */
-public class FileException extends BaseException
-{
- private static final long serialVersionUID = 1L;
-
- public FileException(String code, Object[] args, String msg)
- {
- super("file", code, args, msg);
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java
deleted file mode 100644
index c0f57cb..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.common.core.exception.file;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * 鏂囦欢涓婁紶寮傚父绫�
- *
- * @author ruoyi
- */
-public class FileUploadException extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- private final Throwable cause;
-
- public FileUploadException()
- {
- this(null, null);
- }
-
- public FileUploadException(final String msg)
- {
- this(msg, null);
- }
-
- public FileUploadException(String msg, Throwable cause)
- {
- super(msg);
- this.cause = cause;
- }
-
- @Override
- public void printStackTrace(PrintStream stream)
- {
- super.printStackTrace(stream);
- if (cause != null)
- {
- stream.println("Caused by:");
- cause.printStackTrace(stream);
- }
- }
-
- @Override
- public void printStackTrace(PrintWriter writer)
- {
- super.printStackTrace(writer);
- if (cause != null)
- {
- writer.println("Caused by:");
- cause.printStackTrace(writer);
- }
- }
-
- @Override
- public Throwable getCause()
- {
- return cause;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
deleted file mode 100644
index 6cc3e58..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ruoyi.common.core.exception.job;
-
-/**
- * 璁″垝绛栫暐寮傚父
- *
- * @author ruoyi
- */
-public class TaskException extends Exception
-{
- private static final long serialVersionUID = 1L;
-
- private Code code;
-
- public TaskException(String msg, Code code)
- {
- this(msg, code, null);
- }
-
- public TaskException(String msg, Code code, Exception nestedEx)
- {
- super(msg, nestedEx);
- this.code = code;
- }
-
- public Code getCode()
- {
- return code;
- }
-
- public enum Code
- {
- TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
- }
-}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
deleted file mode 100644
index 8ae8ea3..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.common.core.exception.user;
-
-import com.ruoyi.common.core.exception.base.BaseException;
-
-/**
- * 鐢ㄦ埛淇℃伅寮傚父绫�
- *
- * @author ruoyi
- */
-public class UserException extends BaseException
-{
- private static final long serialVersionUID = 1L;
-
- public UserException(String code, Object[] args)
- {
- super("user", code, args, null);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
deleted file mode 100644
index 2e1a6b1..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.common.core.exception.user;
-
-/**
- * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被
- *
- * @author ruoyi
- */
-public class UserPasswordNotMatchException extends UserException
-{
- private static final long serialVersionUID = 1L;
-
- public UserPasswordNotMatchException()
- {
- super("user.password.not.match", null);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
deleted file mode 100644
index 06fbcd5..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.ruoyi.common.core.text;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 瀛楃闆嗗伐鍏风被
- *
- * @author ruoyi
- */
-public class CharsetKit
-{
- /** ISO-8859-1 */
- public static final String ISO_8859_1 = "ISO-8859-1";
- /** UTF-8 */
- public static final String UTF_8 = "UTF-8";
- /** GBK */
- public static final String GBK = "GBK";
-
- /** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
- /** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
- /** GBK */
- public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
- /**
- * 杞崲涓篊harset瀵硅薄
- *
- * @param charset 瀛楃闆嗭紝涓虹┖鍒欒繑鍥為粯璁ゅ瓧绗﹂泦
- * @return Charset
- */
- public static Charset charset(String charset)
- {
- return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
- *
- * @param source 瀛楃涓�
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆�
- */
- public static String convert(String source, String srcCharset, String destCharset)
- {
- return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
- }
-
- /**
- * 杞崲瀛楃涓茬殑瀛楃闆嗙紪鐮�
- *
- * @param source 瀛楃涓�
- * @param srcCharset 婧愬瓧绗﹂泦锛岄粯璁SO-8859-1
- * @param destCharset 鐩爣瀛楃闆嗭紝榛樿UTF-8
- * @return 杞崲鍚庣殑瀛楃闆�
- */
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
- srcCharset = StandardCharsets.ISO_8859_1;
- }
-
- if (null == destCharset)
- {
- destCharset = StandardCharsets.UTF_8;
- }
-
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
- return source;
- }
- return new String(source.getBytes(srcCharset), destCharset);
- }
-
- /**
- * @return 绯荤粺瀛楃闆嗙紪鐮�
- */
- public static String systemCharset()
- {
- return Charset.defaultCharset().name();
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
deleted file mode 100644
index d984892..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.ruoyi.common.core.utils;
-
-import java.util.Map;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.text.Convert;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-
-/**
- * Jwt宸ュ叿绫�
- *
- * @author ruoyi
- */
-public class JwtUtils
-{
- public static String secret = TokenConstants.SECRET;
-
- /**
- * 浠庢暟鎹０鏄庣敓鎴愪护鐗�
- *
- * @param claims 鏁版嵁澹版槑
- * @return 浠ょ墝
- */
- public static String createToken(Map<String, Object> claims)
- {
- String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact();
- return token;
- }
-
- /**
- * 浠庝护鐗屼腑鑾峰彇鏁版嵁澹版槑
- *
- * @param token 浠ょ墝
- * @return 鏁版嵁澹版槑
- */
- public static Claims parseToken(String token)
- {
- return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
- }
-
- /**
- * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鏍囪瘑
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛ID
- */
- public static String getUserKey(String token)
- {
- Claims claims = parseToken(token);
- return getValue(claims, SecurityConstants.USER_KEY);
- }
-
- /**
- * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鏍囪瘑
- *
- * @param claims 韬唤淇℃伅
- * @return 鐢ㄦ埛ID
- */
- public static String getUserKey(Claims claims)
- {
- return getValue(claims, SecurityConstants.USER_KEY);
- }
-
- /**
- * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛ID
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛ID
- */
- public static String getUserId(String token)
- {
- Claims claims = parseToken(token);
- return getValue(claims, SecurityConstants.DETAILS_USER_ID);
- }
-
- /**
- * 鏍规嵁韬唤淇℃伅鑾峰彇鐢ㄦ埛ID
- *
- * @param claims 韬唤淇℃伅
- * @return 鐢ㄦ埛ID
- */
- public static String getUserId(Claims claims)
- {
- return getValue(claims, SecurityConstants.DETAILS_USER_ID);
- }
-
- /**
- * 鏍规嵁浠ょ墝鑾峰彇鐢ㄦ埛鍚�
- *
- * @param token 浠ょ墝
- * @return 鐢ㄦ埛鍚�
- */
- public static String getUserName(String token)
- {
- Claims claims = parseToken(token);
- return getValue(claims, SecurityConstants.DETAILS_USERNAME);
- }
-
- /**
- * 鏍规嵁韬唤淇℃伅鑾峰彇鐢ㄦ埛鍚�
- *
- * @param claims 韬唤淇℃伅
- * @return 鐢ㄦ埛鍚�
- */
- public static String getUserName(Claims claims)
- {
- return getValue(claims, SecurityConstants.DETAILS_USERNAME);
- }
-
- /**
- * 鏍规嵁韬唤淇℃伅鑾峰彇閿��
- *
- * @param claims 韬唤淇℃伅
- * @param key 閿�
- * @return 鍊�
- */
- public static String getValue(Claims claims, String key)
- {
- return Convert.toStr(claims.get(key), "");
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
deleted file mode 100644
index 18dccfa..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.common.core.utils.bean;
-
-import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
-
-/**
- * bean瀵硅薄灞炴�ч獙璇�
- *
- * @author ruoyi
- */
-public class BeanValidators
-{
- public static void validateWithException(Validator validator, Object object, Class<?>... groups)
- throws ConstraintViolationException
- {
- Set<ConstraintViolation<Object>> constraintViolations = validator.validate(object, groups);
- if (!constraintViolations.isEmpty())
- {
- throw new ConstraintViolationException(constraintViolations);
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
deleted file mode 100644
index 63385e0..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.common.core.utils.file;
-
-/**
- * 濯掍綋绫诲瀷宸ュ叿绫�
- *
- * @author ruoyi
- */
-public class MimeTypeUtils
-{
- public static final String IMAGE_PNG = "image/png";
-
- public static final String IMAGE_JPG = "image/jpg";
-
- public static final String IMAGE_JPEG = "image/jpeg";
-
- public static final String IMAGE_BMP = "image/bmp";
-
- public static final String IMAGE_GIF = "image/gif";
-
- public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
-
- public static final String[] FLASH_EXTENSION = { "swf", "flv" };
-
- public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
- "asf", "rm", "rmvb" };
-
- public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
-
- public static final String[] DEFAULT_ALLOWED_EXTENSION = {
- // 鍥剧墖
- "bmp", "gif", "jpg", "jpeg", "png",
- // word excel powerpoint
- "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
- // 鍘嬬缉鏂囦欢
- "rar", "zip", "gz", "bz2",
- // 瑙嗛鏍煎紡
- "mp4", "avi", "rmvb",
- // pdf
- "pdf" };
-
- public static String getExtension(String prefix)
- {
- switch (prefix)
- {
- case IMAGE_PNG:
- return "png";
- case IMAGE_JPG:
- return "jpg";
- case IMAGE_JPEG:
- return "jpeg";
- case IMAGE_BMP:
- return "bmp";
- case IMAGE_GIF:
- return "gif";
- default:
- return "";
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
deleted file mode 100644
index e4f8696..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ /dev/null
@@ -1,1539 +0,0 @@
-package com.ruoyi.common.core.utils.poi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.annotation.Excels;
-import com.ruoyi.common.core.exception.UtilException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
-import com.ruoyi.common.core.utils.file.ImageUtils;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
-
-/**
- * Excel鐩稿叧澶勭悊
- *
- * @author ruoyi
- */
-public class ExcelUtil<T>
-{
- private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
-
- public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
-
- public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
-
- /**
- * Excel sheet鏈�澶ц鏁帮紝榛樿65536
- */
- public static final int sheetSize = 65536;
-
- /**
- * 宸ヤ綔琛ㄥ悕绉�
- */
- private String sheetName;
-
- /**
- * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級
- */
- private Type type;
-
- /**
- * 宸ヤ綔钖勫璞�
- */
- private Workbook wb;
-
- /**
- * 宸ヤ綔琛ㄥ璞�
- */
- private Sheet sheet;
-
- /**
- * 鏍峰紡鍒楄〃
- */
- private Map<String, CellStyle> styles;
-
- /**
- * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃
- */
- private List<T> list;
-
- /**
- * 娉ㄨВ鍒楄〃
- */
- private List<Object[]> fields;
-
- /**
- * 褰撳墠琛屽彿
- */
- private int rownum;
-
- /**
- * 鏍囬
- */
- private String title;
-
- /**
- * 鏈�澶ч珮搴�
- */
- private short maxHeight;
-
- /**
- * 鍚堝苟鍚庢渶鍚庤鏁�
- */
- private int subMergedLastRowNum = 0;
-
- /**
- * 鍚堝苟鍚庡紑濮嬭鏁�
- */
- private int subMergedFirstRowNum = 1;
-
- /**
- * 瀵硅薄鐨勫瓙鍒楄〃鏂规硶
- */
- private Method subMethod;
-
- /**
- * 瀵硅薄鐨勫瓙鍒楄〃灞炴��
- */
- private List<Field> subFields;
-
- /**
- * 缁熻鍒楄〃
- */
- private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
-
- /**
- * 鏁板瓧鏍煎紡
- */
- private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
-
- /**
- * 瀹炰綋瀵硅薄
- */
- public Class<T> clazz;
-
- /**
- * 闇�瑕佹帓闄ゅ垪灞炴��
- */
- public String[] excludeFields;
-
- public ExcelUtil(Class<T> clazz)
- {
- this.clazz = clazz;
- }
-
- /**
- * 闅愯棌Excel涓垪灞炴��
- *
- * @param fields 鍒楀睘鎬у悕 绀轰緥[鍗曚釜"name"/澶氫釜"id","name"]
- * @throws Exception
- */
- public void hideColumn(String... fields)
- {
- this.excludeFields = fields;
- }
-
- public void init(List<T> list, String sheetName, String title, Type type)
- {
- if (list == null)
- {
- list = new ArrayList<T>();
- }
- this.list = list;
- this.sheetName = sheetName;
- this.type = type;
- this.title = title;
- createExcelField();
- createWorkbook();
- createTitle();
- createSubHead();
- }
-
- /**
- * 鍒涘缓excel绗竴琛屾爣棰�
- */
- public void createTitle()
- {
- if (StringUtils.isNotEmpty(title))
- {
- subMergedFirstRowNum++;
- subMergedLastRowNum++;
- int titleLastCol = this.fields.size() - 1;
- if (isSubList())
- {
- titleLastCol = titleLastCol + subFields.size() - 1;
- }
- Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
- titleRow.setHeightInPoints(30);
- Cell titleCell = titleRow.createCell(0);
- titleCell.setCellStyle(styles.get("title"));
- titleCell.setCellValue(title);
- sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
- }
- }
-
- /**
- * 鍒涘缓瀵硅薄鐨勫瓙鍒楄〃鍚嶇О
- */
- public void createSubHead()
- {
- if (isSubList())
- {
- subMergedFirstRowNum++;
- subMergedLastRowNum++;
- Row subRow = sheet.createRow(rownum);
- int excelNum = 0;
- for (Object[] objects : fields)
- {
- Excel attr = (Excel) objects[1];
- Cell headCell1 = subRow.createCell(excelNum);
- headCell1.setCellValue(attr.name());
- headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- excelNum++;
- }
- int headFirstRow = excelNum - 1;
- int headLastRow = headFirstRow + subFields.size() - 1;
- if (headLastRow > headFirstRow)
- {
- sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
- }
- rownum++;
- }
- }
-
- /**
- * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
- *
- * @param is 杈撳叆娴�
- * @return 杞崲鍚庨泦鍚�
- */
- public List<T> importExcel(InputStream is)
- {
- List<T> list = null;
- try
- {
- list = importExcel(is, 0);
- }
- catch (Exception e)
- {
- log.error("瀵煎叆Excel寮傚父{}", e.getMessage());
- throw new UtilException(e.getMessage());
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
- return list;
- }
-
- /**
- * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
- *
- * @param is 杈撳叆娴�
- * @param titleNum 鏍囬鍗犵敤琛屾暟
- * @return 杞崲鍚庨泦鍚�
- */
- public List<T> importExcel(InputStream is, int titleNum) throws Exception
- {
- return importExcel(StringUtils.EMPTY, is, titleNum);
- }
-
- /**
- * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list
- *
- * @param sheetName 琛ㄦ牸绱㈠紩鍚�
- * @param titleNum 鏍囬鍗犵敤琛屾暟
- * @param is 杈撳叆娴�
- * @return 杞崲鍚庨泦鍚�
- */
- public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception
- {
- this.type = Type.IMPORT;
- this.wb = WorkbookFactory.create(is);
- List<T> list = new ArrayList<T>();
- // 濡傛灉鎸囧畾sheet鍚�,鍒欏彇鎸囧畾sheet涓殑鍐呭 鍚﹀垯榛樿鎸囧悜绗�1涓猻heet
- Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
- if (sheet == null)
- {
- throw new IOException("鏂囦欢sheet涓嶅瓨鍦�");
- }
-
- // 鑾峰彇鏈�鍚庝竴涓潪绌鸿鐨勮涓嬫爣锛屾瘮濡傛�昏鏁颁负n锛屽垯杩斿洖鐨勪负n-1
- int rows = sheet.getLastRowNum();
- if (rows > 0)
- {
- // 瀹氫箟涓�涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield.
- Map<String, Integer> cellMap = new HashMap<String, Integer>();
- // 鑾峰彇琛ㄥご
- Row heard = sheet.getRow(titleNum);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
- {
- Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell))
- {
- String value = this.getCellValue(heard, i).toString();
- cellMap.put(value, i);
- }
- else
- {
- cellMap.put(null, i);
- }
- }
- // 鏈夋暟鎹椂鎵嶅鐞� 寰楀埌绫荤殑鎵�鏈塮ield.
- List<Object[]> fields = this.getFields();
- Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
- for (Object[] objects : fields)
- {
- Excel attr = (Excel) objects[1];
- Integer column = cellMap.get(attr.name());
- if (column != null)
- {
- fieldsMap.put(column, objects);
- }
- }
- for (int i = titleNum + 1; i <= rows; i++)
- {
- // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご.
- Row row = sheet.getRow(i);
- // 鍒ゆ柇褰撳墠琛屾槸鍚︽槸绌鸿
- if (isRowEmpty(row))
- {
- continue;
- }
- T entity = null;
- for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
- {
- Object val = this.getCellValue(row, entry.getKey());
-
- // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓.
- entity = (entity == null ? clazz.newInstance() : entity);
- // 浠巑ap涓緱鍒板搴斿垪鐨刦ield.
- Field field = (Field) entry.getValue()[0];
- Excel attr = (Excel) entry.getValue()[1];
- // 鍙栧緱绫诲瀷,骞舵牴鎹璞＄被鍨嬭缃��.
- Class<?> fieldType = field.getType();
- if (String.class == fieldType)
- {
- String s = Convert.toStr(val);
- if (StringUtils.endsWith(s, ".0"))
- {
- val = StringUtils.substringBefore(s, ".0");
- }
- else
- {
- String dateFormat = field.getAnnotation(Excel.class).dateFormat();
- if (StringUtils.isNotEmpty(dateFormat))
- {
- val = parseDateToStr(dateFormat, val);
- }
- else
- {
- val = Convert.toStr(val);
- }
- }
- }
- else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
- {
- val = Convert.toInt(val);
- }
- else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
- {
- val = Convert.toLong(val);
- }
- else if (Double.TYPE == fieldType || Double.class == fieldType)
- {
- val = Convert.toDouble(val);
- }
- else if (Float.TYPE == fieldType || Float.class == fieldType)
- {
- val = Convert.toFloat(val);
- }
- else if (BigDecimal.class == fieldType)
- {
- val = Convert.toBigDecimal(val);
- }
- else if (Date.class == fieldType)
- {
- if (val instanceof String)
- {
- val = DateUtils.parseDate(val);
- }
- else if (val instanceof Double)
- {
- val = DateUtil.getJavaDate((Double) val);
- }
- }
- else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
- {
- val = Convert.toBool(val, false);
- }
- if (StringUtils.isNotNull(fieldType))
- {
- String propertyName = field.getName();
- if (StringUtils.isNotEmpty(attr.targetAttr()))
- {
- propertyName = field.getName() + "." + attr.targetAttr();
- }
- if (StringUtils.isNotEmpty(attr.readConverterExp()))
- {
- val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
- val = dataFormatHandlerAdapter(val, attr, null);
- }
- ReflectUtils.invokeSetter(entity, propertyName, val);
- }
- }
- list.add(entity);
- }
- }
- return list;
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param response 杩斿洖鏁版嵁
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @return 缁撴灉
- */
- public void exportExcel(HttpServletResponse response, List<T> list, String sheetName)
- {
- exportExcel(response, list, sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param response 杩斿洖鏁版嵁
- * @param list 瀵煎嚭鏁版嵁闆嗗悎
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
- * @return 缁撴灉
- */
- public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title)
- {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding("utf-8");
- this.init(list, sheetName, title, Type.EXPORT);
- exportExcel(response);
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @return 缁撴灉
- */
- public void importTemplateExcel(HttpServletResponse response, String sheetName)
- {
- importTemplateExcel(response, sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
- * @param title 鏍囬
- * @return 缁撴灉
- */
- public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
- {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding("utf-8");
- this.init(null, sheetName, title, Type.IMPORT);
- exportExcel(response);
- }
-
- /**
- * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
- *
- * @return 缁撴灉
- */
- public void exportExcel(HttpServletResponse response)
- {
- try
- {
- writeSheet();
- wb.write(response.getOutputStream());
- }
- catch (Exception e)
- {
- log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
- }
- finally
- {
- IOUtils.closeQuietly(wb);
- }
- }
-
- /**
- * 鍒涘缓鍐欏叆鏁版嵁鍒癝heet
- */
- public void writeSheet()
- {
- // 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
- int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
- for (int index = 0; index < sheetNo; index++)
- {
- createSheet(sheetNo, index);
-
- // 浜х敓涓�琛�
- Row row = sheet.createRow(rownum);
- int column = 0;
- // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- for (Field subField : subFields)
- {
- Excel subExcel = subField.getAnnotation(Excel.class);
- this.createHeadCell(subExcel, row, column++);
- }
- }
- else
- {
- this.createHeadCell(excel, row, column++);
- }
- }
- if (Type.EXPORT.equals(type))
- {
- fillExcelData(index, row);
- addStatisticsRow();
- }
- }
- }
-
- /**
- * 濉厖excel鏁版嵁
- *
- * @param index 搴忓彿
- * @param row 鍗曞厓鏍艰
- */
- @SuppressWarnings("unchecked")
- public void fillExcelData(int index, Row row)
- {
- int startNo = index * sheetSize;
- int endNo = Math.min(startNo + sheetSize, list.size());
- int rowNo = (1 + rownum) - startNo;
- for (int i = startNo; i < endNo; i++)
- {
- rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
- row = sheet.createRow(rowNo);
- // 寰楀埌瀵煎嚭瀵硅薄.
- T vo = (T) list.get(i);
- Collection<?> subList = null;
- if (isSubList())
- {
- if (isSubListValue(vo))
- {
- subList = getListCellValue(vo);
- subMergedLastRowNum = subMergedLastRowNum + subList.size();
- }
- else
- {
- subMergedFirstRowNum++;
- subMergedLastRowNum++;
- }
- }
- int column = 0;
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
- {
- boolean subFirst = false;
- for (Object obj : subList)
- {
- if (subFirst)
- {
- rowNo++;
- row = sheet.createRow(rowNo);
- }
- List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
- int subIndex = 0;
- for (Field subField : subFields)
- {
- if (subField.isAnnotationPresent(Excel.class))
- {
- subField.setAccessible(true);
- Excel attr = subField.getAnnotation(Excel.class);
- this.addCell(attr, row, (T) obj, subField, column + subIndex);
- }
- subIndex++;
- }
- subFirst = true;
- }
- this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
- }
- else
- {
- this.addCell(excel, row, vo, field, column++);
- }
- }
- }
- }
-
- /**
- * 鍒涘缓琛ㄦ牸鏍峰紡
- *
- * @param wb 宸ヤ綔钖勫璞�
- * @return 鏍峰紡鍒楄〃
- */
- private Map<String, CellStyle> createStyles(Workbook wb)
- {
- // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛�
- Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
- CellStyle style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- Font titleFont = wb.createFont();
- titleFont.setFontName("Arial");
- titleFont.setFontHeightInPoints((short) 16);
- titleFont.setBold(true);
- style.setFont(titleFont);
- DataFormat dataFormat = wb.createDataFormat();
- style.setDataFormat(dataFormat.getFormat("@"));
- styles.put("title", style);
-
- style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setBorderRight(BorderStyle.THIN);
- style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderLeft(BorderStyle.THIN);
- style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderTop(BorderStyle.THIN);
- style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderBottom(BorderStyle.THIN);
- style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- Font dataFont = wb.createFont();
- dataFont.setFontName("Arial");
- dataFont.setFontHeightInPoints((short) 10);
- style.setFont(dataFont);
- styles.put("data", style);
-
- style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- Font totalFont = wb.createFont();
- totalFont.setFontName("Arial");
- totalFont.setFontHeightInPoints((short) 10);
- style.setFont(totalFont);
- styles.put("total", style);
-
- styles.putAll(annotationHeaderStyles(wb, styles));
-
- styles.putAll(annotationDataStyles(wb));
-
- return styles;
- }
-
- /**
- * 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸澶存牱寮�
- *
- * @param wb 宸ヤ綔钖勫璞�
- * @return 鑷畾涔夋牱寮忓垪琛�
- */
- private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles)
- {
- Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
- for (Object[] os : fields)
- {
- Excel excel = (Excel) os[1];
- String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
- if (!headerStyles.containsKey(key))
- {
- CellStyle style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setFillForegroundColor(excel.headerBackgroundColor().index);
- style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- Font headerFont = wb.createFont();
- headerFont.setFontName("Arial");
- headerFont.setFontHeightInPoints((short) 10);
- headerFont.setBold(true);
- headerFont.setColor(excel.headerColor().index);
- style.setFont(headerFont);
- // 璁剧疆琛ㄦ牸澶村崟鍏冩牸鏂囨湰褰㈠紡
- DataFormat dataFormat = wb.createDataFormat();
- style.setDataFormat(dataFormat.getFormat("@"));
- headerStyles.put(key, style);
- }
- }
- return headerStyles;
- }
-
- /**
- * 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸鍒楁牱寮�
- *
- * @param wb 宸ヤ綔钖勫璞�
- * @return 鑷畾涔夋牱寮忓垪琛�
- */
- private Map<String, CellStyle> annotationDataStyles(Workbook wb)
- {
- Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- ParameterizedType pt = (ParameterizedType) field.getGenericType();
- Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
- List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
- for (Field subField : subFields)
- {
- Excel subExcel = subField.getAnnotation(Excel.class);
- annotationDataStyles(styles, subField, subExcel);
- }
- }
- else
- {
- annotationDataStyles(styles, field, excel);
- }
- }
- return styles;
- }
-
- /**
- * 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸鍒楁牱寮�
- *
- * @param styles 鑷畾涔夋牱寮忓垪琛�
- * @param field 灞炴�у垪淇℃伅
- * @param excel 娉ㄨВ淇℃伅
- */
- public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel)
- {
- String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());
- if (!styles.containsKey(key))
- {
- CellStyle style = wb.createCellStyle();
- style.setAlignment(excel.align());
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setBorderRight(BorderStyle.THIN);
- style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderLeft(BorderStyle.THIN);
- style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderTop(BorderStyle.THIN);
- style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderBottom(BorderStyle.THIN);
- style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- style.setFillForegroundColor(excel.backgroundColor().getIndex());
- Font dataFont = wb.createFont();
- dataFont.setFontName("Arial");
- dataFont.setFontHeightInPoints((short) 10);
- dataFont.setColor(excel.color().index);
- style.setFont(dataFont);
- if (ColumnType.TEXT == excel.cellType())
- {
- DataFormat dataFormat = wb.createDataFormat();
- style.setDataFormat(dataFormat.getFormat("@"));
- }
- styles.put(key, style);
- }
- }
-
- /**
- * 鍒涘缓鍗曞厓鏍�
- */
- public Cell createHeadCell(Excel attr, Row row, int column)
- {
- // 鍒涘缓鍒�
- Cell cell = row.createCell(column);
- // 鍐欏叆鍒椾俊鎭�
- cell.setCellValue(attr.name());
- setDataValidation(attr, row, column);
- cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- if (isSubList())
- {
- // 濉厖榛樿鏍峰紡锛岄槻姝㈠悎骞跺崟鍏冩牸鏍峰紡澶辨晥
- sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
- if (attr.needMerge())
- {
- sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
- }
- }
- return cell;
- }
-
- /**
- * 璁剧疆鍗曞厓鏍间俊鎭�
- *
- * @param value 鍗曞厓鏍煎��
- * @param attr 娉ㄨВ鐩稿叧
- * @param cell 鍗曞厓鏍间俊鎭�
- */
- public void setCellVo(Object value, Excel attr, Cell cell)
- {
- if (ColumnType.STRING == attr.cellType() || ColumnType.TEXT == attr.cellType())
- {
- String cellValue = Convert.toStr(value);
- // 瀵逛簬浠讳綍浠ヨ〃杈惧紡瑙﹀彂瀛楃 =-+@寮�澶寸殑鍗曞厓鏍硷紝鐩存帴浣跨敤tab瀛楃浣滀负鍓嶇紑锛岄槻姝SV娉ㄥ叆銆�
- if (StringUtils.startsWithAny(cellValue, FORMULA_STR))
- {
- cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
- }
- if (value instanceof Collection && StringUtils.equals("[]", cellValue))
- {
- cellValue = StringUtils.EMPTY;
- }
- cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
- }
- else if (ColumnType.NUMERIC == attr.cellType())
- {
- if (StringUtils.isNotNull(value))
- {
- cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
- }
- }
- else if (ColumnType.IMAGE == attr.cellType())
- {
- ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
- String imagePath = Convert.toStr(value);
- if (StringUtils.isNotEmpty(imagePath))
- {
- byte[] data = ImageUtils.getImage(imagePath);
- getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
- cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
- }
- }
- }
-
- /**
- * 鑾峰彇鐢诲竷
- */
- public static Drawing<?> getDrawingPatriarch(Sheet sheet)
- {
- if (sheet.getDrawingPatriarch() == null)
- {
- sheet.createDrawingPatriarch();
- }
- return sheet.getDrawingPatriarch();
- }
-
- /**
- * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷
- */
- public int getImageType(byte[] value)
- {
- String type = FileTypeUtils.getFileExtendName(value);
- if ("JPG".equalsIgnoreCase(type))
- {
- return Workbook.PICTURE_TYPE_JPEG;
- }
- else if ("PNG".equalsIgnoreCase(type))
- {
- return Workbook.PICTURE_TYPE_PNG;
- }
- return Workbook.PICTURE_TYPE_JPEG;
- }
-
- /**
- * 鍒涘缓琛ㄦ牸鏍峰紡
- */
- public void setDataValidation(Excel attr, Row row, int column)
- {
- if (attr.name().indexOf("娉細") >= 0)
- {
- sheet.setColumnWidth(column, 6000);
- }
- else
- {
- // 璁剧疆鍒楀
- sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
- }
- if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
- {
- if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
- {
- // 濡傛灉涓嬫媺鏁板ぇ浜�15鎴栧瓧绗︿覆闀垮害澶т簬255锛屽垯浣跨敤涓�涓柊sheet瀛樺偍锛岄伩鍏嶇敓鎴愮殑妯℃澘涓嬫媺鍊艰幏鍙栦笉鍒�
- setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
- }
- else
- {
- // 鎻愮ず淇℃伅鎴栧彧鑳介�夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭.
- setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
- }
- }
- }
-
- /**
- * 娣诲姞鍗曞厓鏍�
- */
- public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
- {
- Cell cell = null;
- try
- {
- // 璁剧疆琛岄珮
- row.setHeight(maxHeight);
- // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
- if (attr.isExport())
- {
- // 鍒涘缓cell
- cell = row.createCell(column);
- if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
- {
- CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
- sheet.addMergedRegion(cellAddress);
- }
- cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
-
- // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴��
- Object value = getTargetValue(vo, field, attr);
- String dateFormat = attr.dateFormat();
- String readConverterExp = attr.readConverterExp();
- String separator = attr.separator();
- if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(parseDateToStr(dateFormat, value));
- }
- else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
- }
- else if (value instanceof BigDecimal && -1 != attr.scale())
- {
- cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
- cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));
- }
- else
- {
- // 璁剧疆鍒楃被鍨�
- setCellVo(value, attr, cell);
- }
- addStatisticsData(column, Convert.toStr(value), attr);
- }
- }
- catch (Exception e)
- {
- log.error("瀵煎嚭Excel澶辫触{}", e);
- }
- return cell;
- }
-
- /**
- * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀烘垨閫夋嫨妗�
- *
- * @param sheet 琛ㄥ崟
- * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
- * @param promptContent 鎻愮ず鍐呭
- * @param firstRow 寮�濮嬭
- * @param endRow 缁撴潫琛�
- * @param firstCol 寮�濮嬪垪
- * @param endCol 缁撴潫鍒�
- */
- public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
- int firstCol, int endCol)
- {
- DataValidationHelper helper = sheet.getDataValidationHelper();
- DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
- // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
- dataValidation.createPromptBox("", promptContent);
- dataValidation.setShowPromptBox(true);
- }
- // 澶勭悊Excel鍏煎鎬ч棶棰�
- if (dataValidation instanceof XSSFDataValidation)
- {
- dataValidation.setSuppressDropDownArrow(true);
- dataValidation.setShowErrorBox(true);
- }
- else
- {
- dataValidation.setSuppressDropDownArrow(false);
- }
- sheet.addValidationData(dataValidation);
- }
-
- /**
- * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗嗭紙鍏煎瓒呭嚭涓�瀹氭暟閲忕殑涓嬫媺妗嗭級.
- *
- * @param sheet 瑕佽缃殑sheet.
- * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
- * @param promptContent 鎻愮ず鍐呭
- * @param firstRow 寮�濮嬭
- * @param endRow 缁撴潫琛�
- * @param firstCol 寮�濮嬪垪
- * @param endCol 缁撴潫鍒�
- */
- public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
- {
- String hideSheetName = "combo_" + firstCol + "_" + endCol;
- Sheet hideSheet = wb.createSheet(hideSheetName); // 鐢ㄤ簬瀛樺偍 涓嬫媺鑿滃崟鏁版嵁
- for (int i = 0; i < textlist.length; i++)
- {
- hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
- }
- // 鍒涘缓鍚嶇О锛屽彲琚叾浠栧崟鍏冩牸寮曠敤
- Name name = wb.createName();
- name.setNameName(hideSheetName + "_data");
- name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
- DataValidationHelper helper = sheet.getDataValidationHelper();
- // 鍔犺浇涓嬫媺鍒楄〃鍐呭
- DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");
- // 璁剧疆鏁版嵁鏈夋晥鎬у姞杞藉湪鍝釜鍗曞厓鏍间笂,鍥涗釜鍙傛暟鍒嗗埆鏄細璧峰琛屻�佺粓姝㈣銆佽捣濮嬪垪銆佺粓姝㈠垪
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- // 鏁版嵁鏈夋晥鎬у璞�
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
- // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
- dataValidation.createPromptBox("", promptContent);
- dataValidation.setShowPromptBox(true);
- }
- // 澶勭悊Excel鍏煎鎬ч棶棰�
- if (dataValidation instanceof XSSFDataValidation)
- {
- dataValidation.setSuppressDropDownArrow(true);
- dataValidation.setShowErrorBox(true);
- }
- else
- {
- dataValidation.setSuppressDropDownArrow(false);
- }
-
- sheet.addValidationData(dataValidation);
- // 璁剧疆hiddenSheet闅愯棌
- wb.setSheetHidden(wb.getSheetIndex(hideSheet), true);
- }
-
- /**
- * 瑙ｆ瀽瀵煎嚭鍊� 0=鐢�,1=濂�,2=鏈煡
- *
- * @param propertyValue 鍙傛暟鍊�
- * @param converterExp 缈昏瘧娉ㄨВ
- * @param separator 鍒嗛殧绗�
- * @return 瑙ｆ瀽鍚庡��
- */
- public static String convertByExp(String propertyValue, String converterExp, String separator)
- {
- StringBuilder propertyString = new StringBuilder();
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[0].equals(value))
- {
- propertyString.append(itemArray[1] + separator);
- break;
- }
- }
- }
- else
- {
- if (itemArray[0].equals(propertyValue))
- {
- return itemArray[1];
- }
- }
- }
- return StringUtils.stripEnd(propertyString.toString(), separator);
- }
-
- /**
- * 鍙嶅悜瑙ｆ瀽鍊� 鐢�=0,濂�=1,鏈煡=2
- *
- * @param propertyValue 鍙傛暟鍊�
- * @param converterExp 缈昏瘧娉ㄨВ
- * @param separator 鍒嗛殧绗�
- * @return 瑙ｆ瀽鍚庡��
- */
- public static String reverseByExp(String propertyValue, String converterExp, String separator)
- {
- StringBuilder propertyString = new StringBuilder();
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[1].equals(value))
- {
- propertyString.append(itemArray[0] + separator);
- break;
- }
- }
- }
- else
- {
- if (itemArray[1].equals(propertyValue))
- {
- return itemArray[0];
- }
- }
- }
- return StringUtils.stripEnd(propertyString.toString(), separator);
- }
-
- /**
- * 鏁版嵁澶勭悊鍣�
- *
- * @param value 鏁版嵁鍊�
- * @param excel 鏁版嵁娉ㄨВ
- * @return
- */
- public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell)
- {
- try
- {
- Object instance = excel.handler().newInstance();
- Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });
- value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
- }
- catch (Exception e)
- {
- log.error("涓嶈兘鏍煎紡鍖栨暟鎹� " + excel.handler(), e.getMessage());
- }
- return Convert.toStr(value);
- }
-
- /**
- * 鍚堣缁熻淇℃伅
- */
- private void addStatisticsData(Integer index, String text, Excel entity)
- {
- if (entity != null && entity.isStatistics())
- {
- Double temp = 0D;
- if (!statistics.containsKey(index))
- {
- statistics.put(index, temp);
- }
- try
- {
- temp = Double.valueOf(text);
- }
- catch (NumberFormatException e)
- {
- }
- statistics.put(index, statistics.get(index) + temp);
- }
- }
-
- /**
- * 鍒涘缓缁熻琛�
- */
- public void addStatisticsRow()
- {
- if (statistics.size() > 0)
- {
- Row row = sheet.createRow(sheet.getLastRowNum() + 1);
- Set<Integer> keys = statistics.keySet();
- Cell cell = row.createCell(0);
- cell.setCellStyle(styles.get("total"));
- cell.setCellValue("鍚堣");
-
- for (Integer key : keys)
- {
- cell = row.createCell(key);
- cell.setCellStyle(styles.get("total"));
- cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
- }
- statistics.clear();
- }
- }
-
- /**
- * 鑾峰彇bean涓殑灞炴�у��
- *
- * @param vo 瀹炰綋瀵硅薄
- * @param field 瀛楁
- * @param excel 娉ㄨВ
- * @return 鏈�缁堢殑灞炴�у��
- * @throws Exception
- */
- private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
- {
- Object o = field.get(vo);
- if (StringUtils.isNotEmpty(excel.targetAttr()))
- {
- String target = excel.targetAttr();
- if (target.contains("."))
- {
- String[] targets = target.split("[.]");
- for (String name : targets)
- {
- o = getValue(o, name);
- }
- }
- else
- {
- o = getValue(o, target);
- }
- }
- return o;
- }
-
- /**
- * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊�
- *
- * @param o
- * @param name
- * @return value
- * @throws Exception
- */
- private Object getValue(Object o, String name) throws Exception
- {
- if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
- {
- Class<?> clazz = o.getClass();
- Field field = clazz.getDeclaredField(name);
- field.setAccessible(true);
- o = field.get(o);
- }
- return o;
- }
-
- /**
- * 寰楀埌鎵�鏈夊畾涔夊瓧娈�
- */
- private void createExcelField()
- {
- this.fields = getFields();
- this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
- this.maxHeight = getRowHeight();
- }
-
- /**
- * 鑾峰彇瀛楁娉ㄨВ淇℃伅
- */
- public List<Object[]> getFields()
- {
- List<Object[]> fields = new ArrayList<Object[]>();
- List<Field> tempFields = new ArrayList<>();
- tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
- tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- for (Field field : tempFields)
- {
- if (!ArrayUtils.contains(this.excludeFields, field.getName()))
- {
- // 鍗曟敞瑙�
- if (field.isAnnotationPresent(Excel.class))
- {
- Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- field.setAccessible(true);
- fields.add(new Object[] { field, attr });
- }
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- subMethod = getSubMethod(field.getName(), clazz);
- ParameterizedType pt = (ParameterizedType) field.getGenericType();
- Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
- this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
- }
- }
-
- // 澶氭敞瑙�
- if (field.isAnnotationPresent(Excels.class))
- {
- Excels attrs = field.getAnnotation(Excels.class);
- Excel[] excels = attrs.value();
- for (Excel attr : excels)
- {
- if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
- && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
- {
- field.setAccessible(true);
- fields.add(new Object[] { field, attr });
- }
- }
- }
- }
- }
- return fields;
- }
-
- /**
- * 鏍规嵁娉ㄨВ鑾峰彇鏈�澶ц楂�
- */
- public short getRowHeight()
- {
- double maxHeight = 0;
- for (Object[] os : this.fields)
- {
- Excel excel = (Excel) os[1];
- maxHeight = Math.max(maxHeight, excel.height());
- }
- return (short) (maxHeight * 20);
- }
-
- /**
- * 鍒涘缓涓�涓伐浣滅翱
- */
- public void createWorkbook()
- {
- this.wb = new SXSSFWorkbook(500);
- this.sheet = wb.createSheet();
- wb.setSheetName(0, sheetName);
- this.styles = createStyles(wb);
- }
-
- /**
- * 鍒涘缓宸ヤ綔琛�
- *
- * @param sheetNo sheet鏁伴噺
- * @param index 搴忓彿
- */
- public void createSheet(int sheetNo, int index)
- {
- // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О.
- if (sheetNo > 1 && index > 0)
- {
- this.sheet = wb.createSheet();
- this.createTitle();
- wb.setSheetName(index, sheetName + index);
- }
- }
-
- /**
- * 鑾峰彇鍗曞厓鏍煎��
- *
- * @param row 鑾峰彇鐨勮
- * @param column 鑾峰彇鍗曞厓鏍煎垪鍙�
- * @return 鍗曞厓鏍煎��
- */
- public Object getCellValue(Row row, int column)
- {
- if (row == null)
- {
- return row;
- }
- Object val = "";
- try
- {
- Cell cell = row.getCell(column);
- if (StringUtils.isNotNull(cell))
- {
- if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
- {
- val = cell.getNumericCellValue();
- if (DateUtil.isCellDateFormatted(cell))
- {
- val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲
- }
- else
- {
- if ((Double) val % 1 != 0)
- {
- val = new BigDecimal(val.toString());
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }
- }
- }
- else if (cell.getCellType() == CellType.STRING)
- {
- val = cell.getStringCellValue();
- }
- else if (cell.getCellType() == CellType.BOOLEAN)
- {
- val = cell.getBooleanCellValue();
- }
- else if (cell.getCellType() == CellType.ERROR)
- {
- val = cell.getErrorCellValue();
- }
-
- }
- }
- catch (Exception e)
- {
- return val;
- }
- return val;
- }
-
- /**
- * 鍒ゆ柇鏄惁鏄┖琛�
- *
- * @param row 鍒ゆ柇鐨勮
- * @return
- */
- private boolean isRowEmpty(Row row)
- {
- if (row == null)
- {
- return true;
- }
- for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
- {
- Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
- {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄
- *
- * @param dateFormat 鏃ユ湡鏍煎紡
- * @param val 琚牸寮忓寲鐨勬棩鏈熷璞�
- * @return 鏍煎紡鍖栧悗鐨勬棩鏈熷瓧绗�
- */
- public String parseDateToStr(String dateFormat, Object val)
- {
- if (val == null)
- {
- return "";
- }
- String str;
- if (val instanceof Date)
- {
- str = DateUtils.parseDateToStr(dateFormat, (Date) val);
- }
- else if (val instanceof LocalDateTime)
- {
- str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
- }
- else if (val instanceof LocalDate)
- {
- str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
- }
- else
- {
- str = val.toString();
- }
- return str;
- }
-
- /**
- * 鏄惁鏈夊璞＄殑瀛愬垪琛�
- */
- public boolean isSubList()
- {
- return StringUtils.isNotNull(subFields) && subFields.size() > 0;
- }
-
- /**
- * 鏄惁鏈夊璞＄殑瀛愬垪琛紝闆嗗悎涓嶄负绌�
- */
- public boolean isSubListValue(T vo)
- {
- return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
- }
-
- /**
- * 鑾峰彇闆嗗悎鐨勫��
- */
- public Collection<?> getListCellValue(Object obj)
- {
- Object value;
- try
- {
- value = subMethod.invoke(obj, new Object[] {});
- }
- catch (Exception e)
- {
- return new ArrayList<Object>();
- }
- return (Collection<?>) value;
- }
-
- /**
- * 鑾峰彇瀵硅薄鐨勫瓙鍒楄〃鏂规硶
- *
- * @param name 鍚嶇О
- * @param pojoClass 绫诲璞�
- * @return 瀛愬垪琛ㄦ柟娉�
- */
- public Method getSubMethod(String name, Class<?> pojoClass)
- {
- StringBuffer getMethodName = new StringBuffer("get");
- getMethodName.append(name.substring(0, 1).toUpperCase());
- getMethodName.append(name.substring(1));
- Method method = null;
- try
- {
- method = pojoClass.getMethod(getMethodName.toString(), new Class[] {});
- }
- catch (Exception e)
- {
- log.error("鑾峰彇瀵硅薄寮傚父{}", e.getMessage());
- }
- return method;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
deleted file mode 100644
index 5f1979b..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package com.ruoyi.common.core.utils.reflect;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
-
-/**
- * 鍙嶅皠宸ュ叿绫�. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟.
- *
- * @author ruoyi
- */
-@SuppressWarnings("rawtypes")
-public class ReflectUtils
-{
- private static final String SETTER_PREFIX = "set";
-
- private static final String GETTER_PREFIX = "get";
-
- private static final String CGLIB_CLASS_SEPARATOR = "$$";
-
- private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
- /**
- * 璋冪敤Getter鏂规硶.
- * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚�.鏂规硶
- */
- @SuppressWarnings("unchecked")
- public static <E> E invokeGetter(Object obj, String propertyName)
- {
- Object object = obj;
- for (String name : StringUtils.split(propertyName, "."))
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- return (E) object;
- }
-
- /**
- * 璋冪敤Setter鏂规硶, 浠呭尮閰嶆柟娉曞悕銆�
- * 鏀寔澶氱骇锛屽锛氬璞″悕.瀵硅薄鍚�.鏂规硶
- */
- public static <E> void invokeSetter(Object obj, String propertyName, E value)
- {
- Object object = obj;
- String[] names = StringUtils.split(propertyName, ".");
- for (int i = 0; i < names.length; i++)
- {
- if (i < names.length - 1)
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- else
- {
- String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
- invokeMethodByName(object, setterMethodName, new Object[] { value });
- }
- }
- }
-
- /**
- * 鐩存帴璇诲彇瀵硅薄灞炴�у��, 鏃犺private/protected淇グ绗�, 涓嶇粡杩噂etter鍑芥暟.
- */
- @SuppressWarnings("unchecked")
- public static <E> E getFieldValue(final Object obj, final String fieldName)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- logger.debug("鍦� [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- return null;
- }
- E result = null;
- try
- {
- result = (E) field.get(obj);
- }
- catch (IllegalAccessException e)
- {
- logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父{}", e.getMessage());
- }
- return result;
- }
-
- /**
- * 鐩存帴璁剧疆瀵硅薄灞炴�у��, 鏃犺private/protected淇グ绗�, 涓嶇粡杩噑etter鍑芥暟.
- */
- public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- // throw new IllegalArgumentException("鍦� [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- logger.debug("鍦� [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + fieldName + "] 瀛楁 ");
- return;
- }
- try
- {
- field.set(obj, value);
- }
- catch (IllegalAccessException e)
- {
- logger.error("涓嶅彲鑳芥姏鍑虹殑寮傚父: {}", e.getMessage());
- }
- }
-
- /**
- * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗�.
- * 鐢ㄤ簬涓�娆℃�ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethod()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢�.
- * 鍚屾椂鍖归厤鏂规硶鍚�+鍙傛暟绫诲瀷锛�
- */
- @SuppressWarnings("unchecked")
- public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
- final Object[] args)
- {
- if (obj == null || methodName == null)
- {
- return null;
- }
- Method method = getAccessibleMethod(obj, methodName, parameterTypes);
- if (method == null)
- {
- logger.debug("鍦� [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 ");
- return null;
- }
- try
- {
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 鐩存帴璋冪敤瀵硅薄鏂规硶, 鏃犺private/protected淇グ绗︼紝
- * 鐢ㄤ簬涓�娆℃�ц皟鐢ㄧ殑鎯呭喌锛屽惁鍒欏簲浣跨敤getAccessibleMethodByName()鍑芥暟鑾峰緱Method鍚庡弽澶嶈皟鐢�.
- * 鍙尮閰嶅嚱鏁板悕锛屽鏋滄湁澶氫釜鍚屽悕鍑芥暟璋冪敤绗竴涓��
- */
- @SuppressWarnings("unchecked")
- public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
- {
- Method method = getAccessibleMethodByName(obj, methodName, args.length);
- if (method == null)
- {
- // 濡傛灉涓虹┖涓嶆姤閿欙紝鐩存帴杩斿洖绌恒��
- logger.debug("鍦� [" + obj.getClass() + "] 涓紝娌℃湁鎵惧埌 [" + methodName + "] 鏂规硶 ");
- return null;
- }
- try
- {
- // 绫诲瀷杞崲锛堝皢鍙傛暟鏁版嵁绫诲瀷杞崲涓虹洰鏍囨柟娉曞弬鏁扮被鍨嬶級
- Class<?>[] cs = method.getParameterTypes();
- for (int i = 0; i < cs.length; i++)
- {
- if (args[i] != null && !args[i].getClass().equals(cs[i]))
- {
- if (cs[i] == String.class)
- {
- args[i] = Convert.toStr(args[i]);
- if (StringUtils.endsWith((String) args[i], ".0"))
- {
- args[i] = StringUtils.substringBefore((String) args[i], ".0");
- }
- }
- else if (cs[i] == Integer.class)
- {
- args[i] = Convert.toInt(args[i]);
- }
- else if (cs[i] == Long.class)
- {
- args[i] = Convert.toLong(args[i]);
- }
- else if (cs[i] == Double.class)
- {
- args[i] = Convert.toDouble(args[i]);
- }
- else if (cs[i] == Float.class)
- {
- args[i] = Convert.toFloat(args[i]);
- }
- else if (cs[i] == Date.class)
- {
- if (args[i] instanceof String)
- {
- args[i] = DateUtils.parseDate(args[i]);
- }
- else
- {
- args[i] = DateUtil.getJavaDate((Double) args[i]);
- }
- }
- else if (cs[i] == boolean.class || cs[i] == Boolean.class)
- {
- args[i] = Convert.toBool(args[i]);
- }
- }
- }
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredField, 骞跺己鍒惰缃负鍙闂�.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒�, 杩斿洖null.
- */
- public static Field getAccessibleField(final Object obj, final String fieldName)
- {
- // 涓虹┖涓嶆姤閿欍�傜洿鎺ヨ繑鍥� null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(fieldName, "fieldName can't be blank");
- for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
- {
- try
- {
- Field field = superClass.getDeclaredField(fieldName);
- makeAccessible(field);
- return field;
- }
- catch (NoSuchFieldException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂�.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒�, 杩斿洖null.
- * 鍖归厤鍑芥暟鍚�+鍙傛暟绫诲瀷銆�
- * 鐢ㄤ簬鏂规硶闇�瑕佽澶氭璋冪敤鐨勬儏鍐�. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethod(final Object obj, final String methodName,
- final Class<?>... parameterTypes)
- {
- // 涓虹┖涓嶆姤閿欍�傜洿鎺ヨ繑鍥� null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- try
- {
- Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
- makeAccessible(method);
- return method;
- }
- catch (NoSuchMethodException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 寰幆鍚戜笂杞瀷, 鑾峰彇瀵硅薄鐨凞eclaredMethod,骞跺己鍒惰缃负鍙闂�.
- * 濡傚悜涓婅浆鍨嬪埌Object浠嶆棤娉曟壘鍒�, 杩斿洖null.
- * 鍙尮閰嶅嚱鏁板悕銆�
- * 鐢ㄤ簬鏂规硶闇�瑕佽澶氭璋冪敤鐨勬儏鍐�. 鍏堜娇鐢ㄦ湰鍑芥暟鍏堝彇寰桵ethod,鐒跺悗璋冪敤Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
- {
- // 涓虹┖涓嶆姤閿欍�傜洿鎺ヨ繑鍥� null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- Method[] methods = searchType.getDeclaredMethods();
- for (Method method : methods)
- {
- if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
- {
- makeAccessible(method);
- return method;
- }
- }
- }
- return null;
- }
-
- /**
- * 鏀瑰彉private/protected鐨勬柟娉曚负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨�ㄣ��
- */
- public static void makeAccessible(Method method)
- {
- if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
- && !method.isAccessible())
- {
- method.setAccessible(true);
- }
- }
-
- /**
- * 鏀瑰彉private/protected鐨勬垚鍛樺彉閲忎负public锛屽敖閲忎笉璋冪敤瀹為檯鏀瑰姩鐨勮鍙ワ紝閬垮厤JDK鐨凷ecurityManager鎶辨�ㄣ��
- */
- public static void makeAccessible(Field field)
- {
- if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
- || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
- {
- field.setAccessible(true);
- }
- }
-
- /**
- * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑娉涘瀷鍙傛暟鐨勭被鍨�, 娉ㄦ剰娉涘瀷蹇呴』瀹氫箟鍦ㄧ埗绫诲
- * 濡傛棤娉曟壘鍒�, 杩斿洖Object.class.
- */
- @SuppressWarnings("unchecked")
- public static <T> Class<T> getClassGenricType(final Class clazz)
- {
- return getClassGenricType(clazz, 0);
- }
-
- /**
- * 閫氳繃鍙嶅皠, 鑾峰緱Class瀹氫箟涓０鏄庣殑鐖剁被鐨勬硾鍨嬪弬鏁扮殑绫诲瀷.
- * 濡傛棤娉曟壘鍒�, 杩斿洖Object.class.
- */
- public static Class getClassGenricType(final Class clazz, final int index)
- {
- Type genType = clazz.getGenericSuperclass();
-
- if (!(genType instanceof ParameterizedType))
- {
- logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
- return Object.class;
- }
-
- Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
-
- if (index >= params.length || index < 0)
- {
- logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
- + params.length);
- return Object.class;
- }
- if (!(params[index] instanceof Class))
- {
- logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
- return Object.class;
- }
-
- return (Class) params[index];
- }
-
- public static Class<?> getUserClass(Object instance)
- {
- if (instance == null)
- {
- throw new RuntimeException("Instance must not be null");
- }
- Class clazz = instance.getClass();
- if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
- {
- Class<?> superClass = clazz.getSuperclass();
- if (superClass != null && !Object.class.equals(superClass))
- {
- return superClass;
- }
- }
- return clazz;
-
- }
-
- /**
- * 灏嗗弽灏勬椂鐨刢hecked exception杞崲涓簎nchecked exception.
- */
- public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
- {
- if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
- || e instanceof NoSuchMethodException)
- {
- return new IllegalArgumentException(msg, e);
- }
- else if (e instanceof InvocationTargetException)
- {
- return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
- }
- return new RuntimeException(msg, e);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java
deleted file mode 100644
index 7599bc0..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.ruoyi.common.core.utils.sign;
-
-/**
- * Base64宸ュ叿绫�
- *
- * @author ruoyi
- */
-public final class Base64
-{
- static private final int BASELENGTH = 128;
- static private final int LOOKUPLENGTH = 64;
- static private final int TWENTYFOURBITGROUP = 24;
- static private final int EIGHTBIT = 8;
- static private final int SIXTEENBIT = 16;
- static private final int FOURBYTE = 4;
- static private final int SIGN = -128;
- static private final char PAD = '=';
- static final private byte[] base64Alphabet = new byte[BASELENGTH];
- static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
- static
- {
- for (int i = 0; i < BASELENGTH; ++i)
- {
- base64Alphabet[i] = -1;
- }
- for (int i = 'Z'; i >= 'A'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'A');
- }
- for (int i = 'z'; i >= 'a'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'a' + 26);
- }
-
- for (int i = '9'; i >= '0'; i--)
- {
- base64Alphabet[i] = (byte) (i - '0' + 52);
- }
-
- base64Alphabet['+'] = 62;
- base64Alphabet['/'] = 63;
-
- for (int i = 0; i <= 25; i++)
- {
- lookUpBase64Alphabet[i] = (char) ('A' + i);
- }
-
- for (int i = 26, j = 0; i <= 51; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('a' + j);
- }
-
- for (int i = 52, j = 0; i <= 61; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('0' + j);
- }
- lookUpBase64Alphabet[62] = (char) '+';
- lookUpBase64Alphabet[63] = (char) '/';
- }
-
- private static boolean isWhiteSpace(char octect)
- {
- return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
- }
-
- private static boolean isPad(char octect)
- {
- return (octect == PAD);
- }
-
- private static boolean isData(char octect)
- {
- return (octect < BASELENGTH && base64Alphabet[octect] != -1);
- }
-
- /**
- * Encodes hex octects into Base64
- *
- * @param binaryData Array containing binaryData
- * @return Encoded Base64 array
- */
- public static String encode(byte[] binaryData)
- {
- if (binaryData == null)
- {
- return null;
- }
-
- int lengthDataBits = binaryData.length * EIGHTBIT;
- if (lengthDataBits == 0)
- {
- return "";
- }
-
- int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
- int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
- int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
- char encodedData[] = null;
-
- encodedData = new char[numberQuartet * 4];
-
- byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
-
- int encodedIndex = 0;
- int dataIndex = 0;
-
- for (int i = 0; i < numberTriplets; i++)
- {
- b1 = binaryData[dataIndex++];
- b2 = binaryData[dataIndex++];
- b3 = binaryData[dataIndex++];
-
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
- byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
- }
-
- // form integral number of 6-bit groups
- if (fewerThan24bits == EIGHTBIT)
- {
- b1 = binaryData[dataIndex];
- k = (byte) (b1 & 0x03);
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
- encodedData[encodedIndex++] = PAD;
- encodedData[encodedIndex++] = PAD;
- }
- else if (fewerThan24bits == SIXTEENBIT)
- {
- b1 = binaryData[dataIndex];
- b2 = binaryData[dataIndex + 1];
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
- encodedData[encodedIndex++] = PAD;
- }
- return new String(encodedData);
- }
-
- /**
- * Decodes Base64 data into octects
- *
- * @param encoded string containing Base64 data
- * @return Array containind decoded data.
- */
- public static byte[] decode(String encoded)
- {
- if (encoded == null)
- {
- return null;
- }
-
- char[] base64Data = encoded.toCharArray();
- // remove white spaces
- int len = removeWhiteSpace(base64Data);
-
- if (len % FOURBYTE != 0)
- {
- return null;// should be divisible by four
- }
-
- int numberQuadruple = (len / FOURBYTE);
-
- if (numberQuadruple == 0)
- {
- return new byte[0];
- }
-
- byte decodedData[] = null;
- byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
- char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
-
- int i = 0;
- int encodedIndex = 0;
- int dataIndex = 0;
- decodedData = new byte[(numberQuadruple) * 3];
-
- for (; i < numberQuadruple - 1; i++)
- {
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
- || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
- {
- return null;
- } // if found "no data" just return null
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
-
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
- }
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
- {
- return null;// if found "no data" just return null
- }
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
-
- d3 = base64Data[dataIndex++];
- d4 = base64Data[dataIndex++];
- if (!isData((d3)) || !isData((d4)))
- {// Check if they are PAD characters
- if (isPad(d3) && isPad(d4))
- {
- if ((b2 & 0xf) != 0)// last 4 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 1];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
- return tmp;
- }
- else if (!isPad(d3) && isPad(d4))
- {
- b3 = base64Alphabet[d3];
- if ((b3 & 0x3) != 0)// last 2 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 2];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- return tmp;
- }
- else
- {
- return null;
- }
- }
- else
- { // No PAD e.g 3cQl
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-
- }
- return decodedData;
- }
-
- /**
- * remove WhiteSpace from MIME containing encoded Base64 data.
- *
- * @param data the byte array of base64 data (with WS)
- * @return the new length
- */
- private static int removeWhiteSpace(char[] data)
- {
- if (data == null)
- {
- return 0;
- }
-
- // count characters that's not whitespace
- int newSize = 0;
- int len = data.length;
- for (int i = 0; i < len; i++)
- {
- if (!isWhiteSpace(data[i]))
- {
- data[newSize++] = data[i];
- }
- }
- return newSize;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
deleted file mode 100644
index 15caa7a..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ruoyi.common.core.utils.sql;
-
-import com.ruoyi.common.core.exception.UtilException;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * sql鎿嶄綔宸ュ叿绫�
- *
- * @author ruoyi
- */
-public class SqlUtil
-{
- /**
- * 瀹氫箟甯哥敤鐨� sql鍏抽敭瀛�
- */
- public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()";
-
- /**
- * 浠呮敮鎸佸瓧姣嶃�佹暟瀛椼�佷笅鍒掔嚎銆佺┖鏍笺�侀�楀彿銆佸皬鏁扮偣锛堟敮鎸佸涓瓧娈垫帓搴忥級
- */
- public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
-
- /**
- * 闄愬埗orderBy鏈�澶ч暱搴�
- */
- private static final int ORDER_BY_MAX_LENGTH = 500;
-
- /**
- * 妫�鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃
- */
- public static String escapeOrderBySql(String value)
- {
- if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
- {
- throw new UtilException("鍙傛暟涓嶇鍚堣鑼冿紝涓嶈兘杩涜鏌ヨ");
- }
- if (StringUtils.length(value) > ORDER_BY_MAX_LENGTH)
- {
- throw new UtilException("鍙傛暟宸茶秴杩囨渶澶ч檺鍒讹紝涓嶈兘杩涜鏌ヨ");
- }
- return value;
- }
-
- /**
- * 楠岃瘉 order by 璇硶鏄惁绗﹀悎瑙勮寖
- */
- public static boolean isValidOrderBySql(String value)
- {
- return value.matches(SQL_PATTERN);
- }
-
- /**
- * SQL鍏抽敭瀛楁鏌�
- */
- public static void filterKeyword(String value)
- {
- if (StringUtils.isEmpty(value))
- {
- return;
- }
- String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
- for (String sqlKeyword : sqlKeywords)
- {
- if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1)
- {
- throw new UtilException("鍙傛暟瀛樺湪SQL娉ㄥ叆椋庨櫓");
- }
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
deleted file mode 100644
index 28fc30b..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.common.core.xss;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鑷畾涔墄ss鏍￠獙娉ㄨВ
- *
- * @author ruoyi
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })
-@Constraint(validatedBy = { XssValidator.class })
-public @interface Xss
-{
- String message()
-
- default "涓嶅厑璁镐换浣曡剼鏈繍琛�";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
deleted file mode 100644
index 57603fb..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.common.core.xss;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 鑷畾涔墄ss鏍￠獙娉ㄨВ瀹炵幇
- *
- * @author ruoyi
- */
-public class XssValidator implements ConstraintValidator<Xss, String>
-{
- private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />";
-
- @Override
- public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext)
- {
- if (StringUtils.isBlank(value))
- {
- return true;
- }
- return !containsHtml(value);
- }
-
- public static boolean containsHtml(String value)
- {
- StringBuilder sHtml = new StringBuilder();
- Pattern pattern = Pattern.compile(HTML_PATTERN);
- Matcher matcher = pattern.matcher(value);
- while (matcher.find())
- {
- sHtml.append(matcher.group());
- }
- return pattern.matcher(sHtml).matches();
- }
-}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
deleted file mode 100644
index 677b3cf..0000000
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.ruoyi.common.datascope.aspect;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.context.SecurityContextHolder;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * 鏁版嵁杩囨护澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class DataScopeAspect
-{
- /**
- * 鍏ㄩ儴鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_ALL = "1";
-
- /**
- * 鑷畾鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_CUSTOM = "2";
-
- /**
- * 閮ㄩ棬鏁版嵁鏉冮檺
- */
- public static final String DATA_SCOPE_DEPT = "3";
-
- /**
- * 閮ㄩ棬鍙婁互涓嬫暟鎹潈闄�
- */
- public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
- /**
- * 浠呮湰浜烘暟鎹潈闄�
- */
- public static final String DATA_SCOPE_SELF = "5";
-
- /**
- * 鏁版嵁鏉冮檺杩囨护鍏抽敭瀛�
- */
- public static final String DATA_SCOPE = "dataScope";
-
- @Before("@annotation(controllerDataScope)")
- public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
- {
- clearDataScope(point);
- handleDataScope(point, controllerDataScope);
- }
-
- protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
- {
- // 鑾峰彇褰撳墠鐨勭敤鎴�
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNotNull(loginUser))
- {
- SysUser currentUser = loginUser.getSysUser();
- // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
- if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
- {
- String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
- dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
- controllerDataScope.userAlias(), permission);
- }
- }
- }
-
- /**
- * 鏁版嵁鑼冨洿杩囨护
- *
- * @param joinPoint 鍒囩偣
- * @param user 鐢ㄦ埛
- * @param deptAlias 閮ㄩ棬鍒悕
- * @param userAlias 鐢ㄦ埛鍒悕
- * @param permission 鏉冮檺瀛楃
- */
- public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
- {
- StringBuilder sqlString = new StringBuilder();
- List<String> conditions = new ArrayList<String>();
- List<String> scopeCustomIds = new ArrayList<String>();
- user.getRoles().forEach(role -> {
- if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
- {
- scopeCustomIds.add(Convert.toStr(role.getRoleId()));
- }
- });
-
- for (SysRole role : user.getRoles())
- {
- String dataScope = role.getDataScope();
- if (conditions.contains(dataScope))
- {
- continue;
- }
- if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
- {
- continue;
- }
- if (DATA_SCOPE_ALL.equals(dataScope))
- {
- sqlString = new StringBuilder();
- conditions.add(dataScope);
- break;
- }
- else if (DATA_SCOPE_CUSTOM.equals(dataScope))
- {
- if (scopeCustomIds.size() > 1)
- {
- // 澶氫釜鑷畾鏁版嵁鏉冮檺浣跨敤in鏌ヨ锛岄伩鍏嶅娆℃嫾鎺ャ��
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
- }
- else
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
- }
- }
- else if (DATA_SCOPE_DEPT.equals(dataScope))
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
- }
- else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
- }
- else if (DATA_SCOPE_SELF.equals(dataScope))
- {
- if (StringUtils.isNotBlank(userAlias))
- {
- sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
- }
- else
- {
- // 鏁版嵁鏉冮檺涓轰粎鏈汉涓旀病鏈塽serAlias鍒悕涓嶆煡璇换浣曟暟鎹�
- sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
- }
- }
- conditions.add(dataScope);
- }
-
- // 瑙掕壊閮戒笉鍖呭惈浼犻�掕繃鏉ョ殑鏉冮檺瀛楃锛岃繖涓椂鍊檚qlString涔熶細涓虹┖锛屾墍浠ヨ闄愬埗涓�涓�,涓嶆煡璇换浣曟暟鎹�
- if (StringUtils.isEmpty(conditions))
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
- }
-
- if (StringUtils.isNotBlank(sqlString.toString()))
- {
- Object params = joinPoint.getArgs()[0];
- if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
- {
- BaseEntity baseEntity = (BaseEntity) params;
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
- }
- }
- }
-
- /**
- * 鎷兼帴鏉冮檺sql鍓嶅厛娓呯┖params.dataScope鍙傛暟闃叉娉ㄥ叆
- */
- private void clearDataScope(final JoinPoint joinPoint)
- {
- Object params = joinPoint.getArgs()[0];
- if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
- {
- BaseEntity baseEntity = (BaseEntity) params;
- baseEntity.getParams().put(DATA_SCOPE, "");
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
deleted file mode 100644
index 2667c50..0000000
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ruoyi-common-datasource</artifactId>
-
- <description>
- ruoyi-common-datasource澶氭暟鎹簮
- </description>
-
- <dependencies>
-
- <!-- Druid -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
- <!-- Dynamic DataSource -->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${dynamic-ds.version}</version>
- </dependency>
-
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java
deleted file mode 100644
index c71c105..0000000
--- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.common.datasource.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import com.baomidou.dynamic.datasource.annotation.DS;
-
-/**
- * 涓诲簱鏁版嵁婧�
- *
- * @author ruoyi
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@DS("master")
-public @interface Master
-{
-
-}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
deleted file mode 100644
index 4497ce6..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.common.log.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.log.enums.OperatorType;
-
-/**
- * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙�
- *
- * @author ruoyi
- *
- */
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Log
-{
- /**
- * 妯″潡
- */
- public String title() default "";
-
- /**
- * 鍔熻兘
- */
- public BusinessType businessType() default BusinessType.OTHER;
-
- /**
- * 鎿嶄綔浜虹被鍒�
- */
- public OperatorType operatorType() default OperatorType.MANAGE;
-
- /**
- * 鏄惁淇濆瓨璇锋眰鐨勫弬鏁�
- */
- public boolean isSaveRequestData() default true;
-
- /**
- * 鏄惁淇濆瓨鍝嶅簲鐨勫弬鏁�
- */
- public boolean isSaveResponseData() default true;
-
- /**
- * 鎺掗櫎鎸囧畾鐨勮姹傚弬鏁�
- */
- public String[] excludeParamNames() default {};
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
deleted file mode 100644
index e4f2dd0..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.ruoyi.common.log.aspect;
-
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.http.HttpMethod;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.multipart.MultipartFile;
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessStatus;
-import com.ruoyi.common.log.filter.PropertyPreExcludeFilter;
-import com.ruoyi.common.log.service.AsyncLogService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysOperLog;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class LogAspect
-{
- private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
-
- /** 鎺掗櫎鏁忔劅灞炴�у瓧娈� */
- public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
-
- /** 璁＄畻鎿嶄綔娑堣�楁椂闂� */
- private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
-
- @Autowired
- private AsyncLogService asyncLogService;
-
- /**
- * 澶勭悊璇锋眰鍓嶆墽琛�
- */
- @Before(value = "@annotation(controllerLog)")
- public void boBefore(JoinPoint joinPoint, Log controllerLog)
- {
- TIME_THREADLOCAL.set(System.currentTimeMillis());
- }
-
- /**
- * 澶勭悊瀹岃姹傚悗鎵ц
- *
- * @param joinPoint 鍒囩偣
- */
- @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
- public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)
- {
- handleLog(joinPoint, controllerLog, null, jsonResult);
- }
-
- /**
- * 鎷︽埅寮傚父鎿嶄綔
- *
- * @param joinPoint 鍒囩偣
- * @param e 寮傚父
- */
- @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
- public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)
- {
- handleLog(joinPoint, controllerLog, e, null);
- }
-
- protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
- {
- try
- {
- // *========鏁版嵁搴撴棩蹇�=========*//
- SysOperLog operLog = new SysOperLog();
- operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
- // 璇锋眰鐨勫湴鍧�
- String ip = IpUtils.getIpAddr();
- operLog.setOperIp(ip);
- operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
- String username = SecurityUtils.getUsername();
- if (StringUtils.isNotBlank(username))
- {
- operLog.setOperName(username);
- }
-
- if (e != null)
- {
- operLog.setStatus(BusinessStatus.FAIL.ordinal());
- operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
- }
- // 璁剧疆鏂规硶鍚嶇О
- String className = joinPoint.getTarget().getClass().getName();
- String methodName = joinPoint.getSignature().getName();
- operLog.setMethod(className + "." + methodName + "()");
- // 璁剧疆璇锋眰鏂瑰紡
- operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
- // 澶勭悊璁剧疆娉ㄨВ涓婄殑鍙傛暟
- getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
- // 璁剧疆娑堣�楁椂闂�
- operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());
- // 淇濆瓨鏁版嵁搴�
- asyncLogService.saveSysLog(operLog);
- }
- catch (Exception exp)
- {
- // 璁板綍鏈湴寮傚父鏃ュ織
- log.error("寮傚父淇℃伅:{}", exp.getMessage());
- exp.printStackTrace();
- }
- finally
- {
- TIME_THREADLOCAL.remove();
- }
- }
-
- /**
- * 鑾峰彇娉ㄨВ涓鏂规硶鐨勬弿杩颁俊鎭� 鐢ㄤ簬Controller灞傛敞瑙�
- *
- * @param log 鏃ュ織
- * @param operLog 鎿嶄綔鏃ュ織
- * @throws Exception
- */
- public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
- {
- // 璁剧疆action鍔ㄤ綔
- operLog.setBusinessType(log.businessType().ordinal());
- // 璁剧疆鏍囬
- operLog.setTitle(log.title());
- // 璁剧疆鎿嶄綔浜虹被鍒�
- operLog.setOperatorType(log.operatorType().ordinal());
- // 鏄惁闇�瑕佷繚瀛榬equest锛屽弬鏁板拰鍊�
- if (log.isSaveRequestData())
- {
- // 鑾峰彇鍙傛暟鐨勪俊鎭紝浼犲叆鍒版暟鎹簱涓��
- setRequestValue(joinPoint, operLog, log.excludeParamNames());
- }
- // 鏄惁闇�瑕佷繚瀛榬esponse锛屽弬鏁板拰鍊�
- if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
- {
- operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
- }
- }
-
- /**
- * 鑾峰彇璇锋眰鐨勫弬鏁帮紝鏀惧埌log涓�
- *
- * @param operLog 鎿嶄綔鏃ュ織
- * @throws Exception 寮傚父
- */
- private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
- {
- String requestMethod = operLog.getRequestMethod();
- Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
- if (StringUtils.isEmpty(paramsMap)
- && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)))
- {
- String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
- operLog.setOperParam(StringUtils.substring(params, 0, 2000));
- }
- else
- {
- operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));
- }
- }
-
- /**
- * 鍙傛暟鎷艰
- */
- private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
- {
- String params = "";
- if (paramsArray != null && paramsArray.length > 0)
- {
- for (Object o : paramsArray)
- {
- if (StringUtils.isNotNull(o) && !isFilterObject(o))
- {
- try
- {
- String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
- params += jsonObj.toString() + " ";
- }
- catch (Exception e)
- {
- }
- }
- }
- }
- return params.trim();
- }
-
- /**
- * 蹇界暐鏁忔劅灞炴��
- */
- public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames)
- {
- return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames));
- }
-
- /**
- * 鍒ゆ柇鏄惁闇�瑕佽繃婊ょ殑瀵硅薄銆�
- *
- * @param o 瀵硅薄淇℃伅銆�
- * @return 濡傛灉鏄渶瑕佽繃婊ょ殑瀵硅薄锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse銆�
- */
- @SuppressWarnings("rawtypes")
- public boolean isFilterObject(final Object o)
- {
- Class<?> clazz = o.getClass();
- if (clazz.isArray())
- {
- return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
- }
- else if (Collection.class.isAssignableFrom(clazz))
- {
- Collection collection = (Collection) o;
- for (Object value : collection)
- {
- return value instanceof MultipartFile;
- }
- }
- else if (Map.class.isAssignableFrom(clazz))
- {
- Map map = (Map) o;
- for (Object value : map.entrySet())
- {
- Map.Entry entry = (Map.Entry) value;
- return entry.getValue() instanceof MultipartFile;
- }
- }
- return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
- || o instanceof BindingResult;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java
deleted file mode 100644
index a2a3926..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.common.log.enums;
-
-/**
- * 鎿嶄綔鐘舵��
- *
- * @author ruoyi
- *
- */
-public enum BusinessStatus
-{
- /**
- * 鎴愬姛
- */
- SUCCESS,
-
- /**
- * 澶辫触
- */
- FAIL,
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
deleted file mode 100644
index 0b18de8..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.common.log.enums;
-
-/**
- * 涓氬姟鎿嶄綔绫诲瀷
- *
- * @author ruoyi
- */
-public enum BusinessType
-{
- /**
- * 鍏跺畠
- */
- OTHER,
-
- /**
- * 鏂板
- */
- INSERT,
-
- /**
- * 淇敼
- */
- UPDATE,
-
- /**
- * 鍒犻櫎
- */
- DELETE,
-
- /**
- * 鎺堟潈
- */
- GRANT,
-
- /**
- * 瀵煎嚭
- */
- EXPORT,
-
- /**
- * 瀵煎叆
- */
- IMPORT,
-
- /**
- * 寮洪��
- */
- FORCE,
-
- /**
- * 鐢熸垚浠ｇ爜
- */
- GENCODE,
-
- /**
- * 娓呯┖鏁版嵁
- */
- CLEAN,
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java
deleted file mode 100644
index 2a041a0..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.common.log.enums;
-
-/**
- * 鎿嶄綔浜虹被鍒�
- *
- * @author ruoyi
- */
-public enum OperatorType
-{
- /**
- * 鍏跺畠
- */
- OTHER,
-
- /**
- * 鍚庡彴鐢ㄦ埛
- */
- MANAGE,
-
- /**
- * 鎵嬫満绔敤鎴�
- */
- MOBILE
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
deleted file mode 100644
index 83f2ef6..0000000
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.common.log.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysOperLog;
-
-/**
- * 寮傛璋冪敤鏃ュ織鏈嶅姟
- *
- * @author ruoyi
- */
-@Service
-public class AsyncLogService
-{
- @Autowired
- private RemoteLogService remoteLogService;
-
- /**
- * 淇濆瓨绯荤粺鏃ュ織璁板綍
- */
- @Async
- public void saveSysLog(SysOperLog sysOperLog) throws Exception
- {
- remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
- }
-}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 9ff60df..0000000
--- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-com.ruoyi.common.redis.configure.RedisConfig
-com.ruoyi.common.redis.service.RedisService
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
deleted file mode 100644
index 006fb5d..0000000
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ruoyi-common-seata</artifactId>
-
- <description>
- ruoyi-common-seata鍒嗗竷寮忎簨鍔�
- </description>
-
- <dependencies>
-
- <!-- SpringBoot Seata -->
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
- </dependency>
-
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java
deleted file mode 100644
index 6eada07..0000000
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.common.security.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 鍐呴儴璁よ瘉娉ㄨВ
- *
- * @author ruoyi
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface InnerAuth
-{
- /**
- * 鏄惁鏍￠獙鐢ㄦ埛淇℃伅
- */
- boolean isUser() default false;
-}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java
deleted file mode 100644
index 82d8b03..0000000
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.common.security.aspect;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.core.Ordered;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.exception.InnerAuthException;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.annotation.InnerAuth;
-
-/**
- * 鍐呴儴鏈嶅姟璋冪敤楠岃瘉澶勭悊
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class InnerAuthAspect implements Ordered
-{
- @Around("@annotation(innerAuth)")
- public Object innerAround(ProceedingJoinPoint point, InnerAuth innerAuth) throws Throwable
- {
- String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE);
- // 鍐呴儴璇锋眰楠岃瘉
- if (!StringUtils.equals(SecurityConstants.INNER, source))
- {
- throw new InnerAuthException("娌℃湁鍐呴儴璁块棶鏉冮檺锛屼笉鍏佽璁块棶");
- }
-
- String userid = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USER_ID);
- String username = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USERNAME);
- // 鐢ㄦ埛淇℃伅楠岃瘉
- if (innerAuth.isUser() && (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)))
- {
- throw new InnerAuthException("娌℃湁璁剧疆鐢ㄦ埛淇℃伅锛屼笉鍏佽璁块棶 ");
- }
- return point.proceed();
- }
-
- /**
- * 纭繚鍦ㄦ潈闄愯璇乤op鎵ц鍓嶆墽琛�
- */
- @Override
- public int getOrder()
- {
- return Ordered.HIGHEST_PRECEDENCE + 1;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
deleted file mode 100644
index 5a9ae98..0000000
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.ruoyi.common.security.handler;
-
-import javax.servlet.http.HttpServletRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.BindException;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingPathVariableException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.exception.DemoModeException;
-import com.ruoyi.common.core.exception.InnerAuthException;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.exception.auth.NotPermissionException;
-import com.ruoyi.common.core.exception.auth.NotRoleException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.html.EscapeUtil;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-
-/**
- * 鍏ㄥ眬寮傚父澶勭悊鍣�
- *
- * @author ruoyi
- */
-@RestControllerAdvice
-public class GlobalExceptionHandler
-{
- private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
- /**
- * 鏉冮檺鐮佸紓甯�
- */
- @ExceptionHandler(NotPermissionException.class)
- public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',鏉冮檺鐮佹牎楠屽け璐�'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
- }
-
- /**
- * 瑙掕壊鏉冮檺寮傚父
- */
- @ExceptionHandler(NotRoleException.class)
- public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',瑙掕壊鏉冮檺鏍￠獙澶辫触'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.FORBIDDEN, "娌℃湁璁块棶鏉冮檺锛岃鑱旂郴绠＄悊鍛樻巿鏉�");
- }
-
- /**
- * 璇锋眰鏂瑰紡涓嶆敮鎸�
- */
- @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
- public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',涓嶆敮鎸�'{}'璇锋眰", requestURI, e.getMethod());
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 涓氬姟寮傚父
- */
- @ExceptionHandler(ServiceException.class)
- public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request)
- {
- log.error(e.getMessage(), e);
- Integer code = e.getCode();
- return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
- }
-
- /**
- * 璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�
- */
- @ExceptionHandler(MissingPathVariableException.class)
- public AjaxResult handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲�'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return AjaxResult.error(String.format("璇锋眰璺緞涓己灏戝繀闇�鐨勮矾寰勫彉閲廩%s]", e.getVariableName()));
- }
-
- /**
- * 璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�
- */
- @ExceptionHandler(MethodArgumentTypeMismatchException.class)
- public AjaxResult handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- String value = Convert.toStr(e.getValue());
- if (StringUtils.isNotEmpty(value))
- {
- value = EscapeUtil.clean(value);
- }
- log.error("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰�'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return AjaxResult.error(String.format("璇锋眰鍙傛暟绫诲瀷涓嶅尮閰嶏紝鍙傛暟[%s]瑕佹眰绫诲瀷涓猴細'%s'锛屼絾杈撳叆鍊间负锛�'%s'", e.getName(), e.getRequiredType().getName(), value));
- }
-
- /**
- * 鎷︽埅鏈煡鐨勮繍琛屾椂寮傚父
- */
- @ExceptionHandler(RuntimeException.class)
- public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',鍙戠敓鏈煡寮傚父.", requestURI, e);
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 绯荤粺寮傚父
- */
- @ExceptionHandler(Exception.class)
- public AjaxResult handleException(Exception e, HttpServletRequest request)
- {
- String requestURI = request.getRequestURI();
- log.error("璇锋眰鍦板潃'{}',鍙戠敓绯荤粺寮傚父.", requestURI, e);
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 鑷畾涔夐獙璇佸紓甯�
- */
- @ExceptionHandler(BindException.class)
- public AjaxResult handleBindException(BindException e)
- {
- log.error(e.getMessage(), e);
- String message = e.getAllErrors().get(0).getDefaultMessage();
- return AjaxResult.error(message);
- }
-
- /**
- * 鑷畾涔夐獙璇佸紓甯�
- */
- @ExceptionHandler(MethodArgumentNotValidException.class)
- public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e)
- {
- log.error(e.getMessage(), e);
- String message = e.getBindingResult().getFieldError().getDefaultMessage();
- return AjaxResult.error(message);
- }
-
- /**
- * 鍐呴儴璁よ瘉寮傚父
- */
- @ExceptionHandler(InnerAuthException.class)
- public AjaxResult handleInnerAuthException(InnerAuthException e)
- {
- return AjaxResult.error(e.getMessage());
- }
-
- /**
- * 婕旂ず妯″紡寮傚父
- */
- @ExceptionHandler(DemoModeException.class)
- public AjaxResult handleDemoModeException(DemoModeException e)
- {
- return AjaxResult.error("婕旂ず妯″紡锛屼笉鍏佽鎿嶄綔");
- }
-}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
deleted file mode 100644
index 8282fdc..0000000
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.ruoyi.common.security.utils;
-
-import java.util.Collection;
-import java.util.List;
-import com.alibaba.fastjson2.JSONArray;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.system.api.domain.SysDictData;
-
-/**
- * 瀛楀吀宸ュ叿绫�
- *
- * @author ruoyi
- */
-public class DictUtils
-{
- /**
- * 璁剧疆瀛楀吀缂撳瓨
- *
- * @param key 鍙傛暟閿�
- * @param dictDatas 瀛楀吀鏁版嵁鍒楄〃
- */
- public static void setDictCache(String key, List<SysDictData> dictDatas)
- {
- SpringUtils.getBean(RedisService.class).setCacheObject(getCacheKey(key), dictDatas);
- }
-
- /**
- * 鑾峰彇瀛楀吀缂撳瓨
- *
- * @param key 鍙傛暟閿�
- * @return dictDatas 瀛楀吀鏁版嵁鍒楄〃
- */
- public static List<SysDictData> getDictCache(String key)
- {
- JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
- if (StringUtils.isNotNull(arrayCache))
- {
- return arrayCache.toList(SysDictData.class);
- }
- return null;
- }
-
- /**
- * 鍒犻櫎鎸囧畾瀛楀吀缂撳瓨
- *
- * @param key 瀛楀吀閿�
- */
- public static void removeDictCache(String key)
- {
- SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key));
- }
-
- /**
- * 娓呯┖瀛楀吀缂撳瓨
- */
- public static void clearDictCache()
- {
- Collection<String> keys = SpringUtils.getBean(RedisService.class).keys(CacheConstants.SYS_DICT_KEY + "*");
- SpringUtils.getBean(RedisService.class).deleteObject(keys);
- }
-
- /**
- * 璁剧疆cache key
- *
- * @param configKey 鍙傛暟閿�
- * @return 缂撳瓨閿甼ey
- */
- public static String getCacheKey(String configKey)
- {
- return CacheConstants.SYS_DICT_KEY + configKey;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
deleted file mode 100644
index 88bfe00..0000000
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.ruoyi.common.sensitive.config;
-
-import java.io.IOException;
-import java.util.Objects;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.common.sensitive.annotation.Sensitive;
-import com.ruoyi.common.sensitive.enums.DesensitizedType;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * 鏁版嵁鑴辨晱搴忓垪鍖栬繃婊�
- *
- * @author ruoyi
- */
-public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer
-{
- private DesensitizedType desensitizedType;
-
- @Override
- public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException
- {
- if (desensitization())
- {
- gen.writeString(desensitizedType.desensitizer().apply(value));
- }
- else
- {
- gen.writeString(value);
- }
- }
-
- @Override
- public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property)
- throws JsonMappingException
- {
- Sensitive annotation = property.getAnnotation(Sensitive.class);
- if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass()))
- {
- this.desensitizedType = annotation.desensitizedType();
- return this;
- }
- return prov.findValueSerializer(property.getType(), property);
- }
-
- /**
- * 鏄惁闇�瑕佽劚鏁忓鐞�
- */
- private boolean desensitization()
- {
- try
- {
- LoginUser securityUser = SecurityUtils.getLoginUser();
- // 绠＄悊鍛樹笉鑴辨晱
- return !securityUser.getSysUser().isAdmin();
- }
- catch (Exception e)
- {
- return true;
- }
- }
-}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java
deleted file mode 100644
index 94ceada..0000000
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.common.sensitive.enums;
-
-import java.util.function.Function;
-import com.ruoyi.common.sensitive.utils.DesensitizedUtil;
-
-/**
- * 鑴辨晱绫诲瀷
- *
- * @author ruoyi
- */
-public enum DesensitizedType
-{
- /**
- * 濮撳悕锛岀2浣嶆槦鍙锋浛鎹�
- */
- USERNAME(s -> s.replaceAll("(\\S)\\S(\\S*)", "$1*$2")),
-
- /**
- * 瀵嗙爜锛屽叏閮ㄥ瓧绗﹂兘鐢�*浠ｆ浛
- */
- PASSWORD(DesensitizedUtil::password),
-
- /**
- * 韬唤璇侊紝涓棿10浣嶆槦鍙锋浛鎹�
- */
- ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{4})", "$1** **** ****$2")),
-
- /**
- * 鎵嬫満鍙凤紝涓棿4浣嶆槦鍙锋浛鎹�
- */
- PHONE(s -> s.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")),
-
- /**
- * 鐢靛瓙閭锛屼粎鏄剧ず绗竴涓瓧姣嶅拰@鍚庨潰鐨勫湴鍧�鏄剧ず锛屽叾浠栨槦鍙锋浛鎹�
- */
- EMAIL(s -> s.replaceAll("(^.)[^@]*(@.*$)", "$1****$2")),
-
- /**
- * 閾惰鍗″彿锛屼繚鐣欐渶鍚�4浣嶏紝鍏朵粬鏄熷彿鏇挎崲
- */
- BANK_CARD(s -> s.replaceAll("\\d{15}(\\d{3})", "**** **** **** **** $1")),
-
- /**
- * 杞︾墝鍙风爜锛屽寘鍚櫘閫氳溅杈嗐�佹柊鑳芥簮杞﹁締
- */
- CAR_LICENSE(DesensitizedUtil::carLicense);
-
- private final Function<String, String> desensitizer;
-
- DesensitizedType(Function<String, String> desensitizer)
- {
- this.desensitizer = desensitizer;
- }
-
- public Function<String, String> desensitizer()
- {
- return desensitizer;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java
deleted file mode 100644
index 9c542d6..0000000
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.common.sensitive.utils;
-
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 鑴辨晱宸ュ叿绫�
- *
- * @author ruoyi
- */
-public class DesensitizedUtil
-{
- /**
- * 瀵嗙爜鐨勫叏閮ㄥ瓧绗﹂兘鐢�*浠ｆ浛锛屾瘮濡傦細******
- *
- * @param password 瀵嗙爜
- * @return 鑴辨晱鍚庣殑瀵嗙爜
- */
- public static String password(String password)
- {
- if (StringUtils.isBlank(password))
- {
- return StringUtils.EMPTY;
- }
- return StringUtils.repeat('*', password.length());
- }
-
- /**
- * 杞︾墝涓棿鐢�*浠ｆ浛锛屽鏋滄槸閿欒鐨勮溅鐗岋紝涓嶅鐞�
- *
- * @param carLicense 瀹屾暣鐨勮溅鐗屽彿
- * @return 鑴辨晱鍚庣殑杞︾墝
- */
- public static String carLicense(String carLicense)
- {
- if (StringUtils.isBlank(carLicense))
- {
- return StringUtils.EMPTY;
- }
- // 鏅�氳溅鐗�
- if (carLicense.length() == 7)
- {
- carLicense = StringUtils.hide(carLicense, 3, 6);
- }
- else if (carLicense.length() == 8)
- {
- // 鏂拌兘婧愯溅鐗�
- carLicense = StringUtils.hide(carLicense, 3, 7);
- }
- return carLicense;
- }
-}
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java
deleted file mode 100644
index 83bb3d7..0000000
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.common.swagger.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.context.annotation.Import;
-import com.ruoyi.common.swagger.config.SwaggerAutoConfiguration;
-
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import({ SwaggerAutoConfiguration.class })
-public @interface EnableCustomSwagger2
-{
-
-}
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java
deleted file mode 100644
index aa223b2..0000000
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.ruoyi.common.swagger.config;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
-import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * swagger 鍦� springboot 2.6.x 涓嶅吋瀹归棶棰樼殑澶勭悊
- *
- * @author ruoyi
- */
-public class SwaggerBeanPostProcessor implements BeanPostProcessor
-{
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException
- {
- if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider)
- {
- customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
- }
- return bean;
- }
-
- private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings)
- {
- List<T> copy = mappings.stream().filter(mapping -> mapping.getPatternParser() == null)
- .collect(Collectors.toList());
- mappings.clear();
- mappings.addAll(copy);
- }
-
- @SuppressWarnings("unchecked")
- private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean)
- {
- try
- {
- Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
- field.setAccessible(true);
- return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
- }
- catch (IllegalArgumentException | IllegalAccessException e)
- {
- throw new IllegalStateException(e);
- }
- }
-}
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
index 3c54b77..9b7fa5f 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
@@ -7,7 +7,7 @@
/**
* 缃戝叧鍚姩绋嬪簭
*
- * @author ruoyi
+ * @author admin
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiGatewayApplication
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
index e6c6d9d..5e23e35 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java
@@ -10,7 +10,7 @@
/**
* 楠岃瘉鐮侀厤缃�
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
public class CaptchaConfig
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 3bb6d8e..4abfb1f 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -9,7 +9,7 @@
/**
* 缃戝叧闄愭祦閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
public class GatewayConfig
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
index f68e0fa..7583f4e 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
@@ -6,7 +6,7 @@
/**
* 楠岃瘉鐮佹枃鏈敓鎴愬櫒
*
- * @author ruoyi
+ * @author admin
*/
public class KaptchaTextCreator extends DefaultTextCreator
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
index db3c94e..4320db1 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java
@@ -12,7 +12,7 @@
/**
* 璺敱閰嶇疆淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
public class RouterFunctionConfiguration
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
index ae22264..5c06161 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
@@ -16,7 +16,7 @@
/**
* 鑱氬悎绯荤粺鎺ュ彛
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
index f6bb000..ba5ee47 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java
@@ -7,7 +7,7 @@
/**
* 楠岃瘉鐮侀厤缃�
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
index 1d2c56a..41475c2 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
@@ -9,7 +9,7 @@
/**
* 鏀捐鐧藉悕鍗曢厤缃�
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
index 891679e..13cef90 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java
@@ -9,7 +9,7 @@
/**
* XSS璺ㄧ珯鑴氭湰閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@RefreshScope
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index 101de63..5a01482 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -9,14 +9,14 @@
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.HttpStatus;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.constant.TokenConstants;
+import com.se.common.core.utils.JwtUtils;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
import io.jsonwebtoken.Claims;
import reactor.core.publisher.Mono;
@@ -24,7 +24,7 @@
/**
* 缃戝叧閴存潈
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class AuthFilter implements GlobalFilter, Ordered
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
index 343bd01..ddea86b 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
@@ -6,12 +6,12 @@
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.se.common.core.utils.ServletUtils;
/**
* 榛戝悕鍗曡繃婊ゅ櫒
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUrlFilter.Config>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
index 94c6cb5..0954768 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java
@@ -15,7 +15,7 @@
/**
* 鑾峰彇body璇锋眰鏁版嵁锛堣В鍐虫祦涓嶈兘閲嶅璇诲彇闂锛�
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class CacheRequestFilter extends AbstractGatewayFilterFactory<CacheRequestFilter.Config>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
index 611ac78..176c6e0 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
@@ -12,8 +12,8 @@
import org.springframework.stereotype.Component;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.gateway.config.properties.CaptchaProperties;
import com.ruoyi.gateway.service.ValidateCodeService;
import reactor.core.publisher.Flux;
@@ -21,7 +21,7 @@
/**
* 楠岃瘉鐮佽繃婊ゅ櫒
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
index c8f1ba4..9dd7999 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
@@ -18,8 +18,8 @@
import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.html.EscapeUtil;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.html.EscapeUtil;
import com.ruoyi.gateway.config.properties.XssProperties;
import io.netty.buffer.ByteBufAllocator;
import reactor.core.publisher.Flux;
@@ -28,7 +28,7 @@
/**
* 璺ㄧ珯鑴氭湰杩囨护鍣�
*
- * @author ruoyi
+ * @author admin
*/
@Component
@ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true")
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
index 29ea5e3..2b7d97f 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
@@ -9,13 +9,13 @@
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.server.ServerWebExchange;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.se.common.core.utils.ServletUtils;
import reactor.core.publisher.Mono;
/**
* 缃戝叧缁熶竴寮傚父澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@Order(-1)
@Configuration
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
index 86abf88..d995686 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
@@ -2,7 +2,7 @@
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
import com.alibaba.csp.sentinel.slots.block.BlockException;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.se.common.core.utils.ServletUtils;
import org.springframework.web.reactive.function.server.ServerResponse;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebExceptionHandler;
@@ -11,7 +11,7 @@
/**
* 鑷畾涔夐檺娴佸紓甯稿鐞�
*
- * @author ruoyi
+ * @author admin
*/
public class SentinelFallbackHandler implements WebExceptionHandler
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
index 45e7b15..1b87ae3 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
@@ -8,15 +8,15 @@
import org.springframework.web.reactive.function.server.HandlerFunction;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
-import com.ruoyi.common.core.exception.CaptchaException;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.se.common.core.exception.CaptchaException;
+import com.se.common.core.web.domain.AjaxResult;
import com.ruoyi.gateway.service.ValidateCodeService;
import reactor.core.publisher.Mono;
/**
* 楠岃瘉鐮佽幏鍙�
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class ValidateCodeHandler implements HandlerFunction<ServerResponse>
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
index 8a74aeb..9bbfa00 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
@@ -1,13 +1,13 @@
package com.ruoyi.gateway.service;
import java.io.IOException;
-import com.ruoyi.common.core.exception.CaptchaException;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.se.common.core.exception.CaptchaException;
+import com.se.common.core.web.domain.AjaxResult;
/**
* 楠岃瘉鐮佸鐞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ValidateCodeService
{
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
index 2185bdf..6961b68 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -9,21 +9,21 @@
import org.springframework.stereotype.Service;
import org.springframework.util.FastByteArrayOutputStream;
import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.CaptchaException;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.sign.Base64;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.redis.service.RedisService;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.exception.CaptchaException;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.sign.Base64;
+import com.se.common.core.utils.uuid.IdUtils;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.redis.service.RedisService;
import com.ruoyi.gateway.config.properties.CaptchaProperties;
import com.ruoyi.gateway.service.ValidateCodeService;
/**
* 楠岃瘉鐮佸疄鐜板鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class ValidateCodeServiceImpl implements ValidateCodeService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
index 1f320da..5427a06 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
@@ -3,12 +3,12 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import com.se.common.swagger.annotation.EnableCustomSwagger2;
/**
* 鏂囦欢鏈嶅姟
*
- * @author ruoyi
+ * @author admin
*/
@EnableCustomSwagger2
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
index 29beea0..28701a5 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -8,7 +8,7 @@
/**
* Minio 閰嶇疆淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@ConfigurationProperties(prefix = "minio")
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
index 8003670..425b3cc 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java
@@ -10,7 +10,7 @@
/**
* 閫氱敤鏄犲皠閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
public class ResourcesConfig implements WebMvcConfigurer
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
index 45f86b0..620c19f 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java
@@ -6,15 +6,15 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.file.FileUtils;
+import com.se.common.core.domain.R;
+import com.se.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
-import com.ruoyi.system.api.domain.SysFile;
+import com.se.system.api.domain.SysFile;
/**
* 鏂囦欢璇锋眰澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
public class SysFileController
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
index 0f85449..d555d66 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
@@ -8,12 +8,12 @@
import org.springframework.web.multipart.MultipartFile;
import com.github.tobato.fastdfs.domain.fdfs.StorePath;
import com.github.tobato.fastdfs.service.FastFileStorageClient;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
+import com.se.common.core.utils.file.FileTypeUtils;
/**
* FastDFS 鏂囦欢瀛樺偍
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class FastDfsSysFileServiceImpl implements ISysFileService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
index c95e6f2..9bdad05 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java
@@ -5,7 +5,7 @@
/**
* 鏂囦欢涓婁紶鎺ュ彛
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysFileService
{
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
index 3247e9b..240bbfb 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 鏈湴鏂囦欢瀛樺偍
*
- * @author ruoyi
+ * @author admin
*/
@Primary
@Service
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
index f53d86f..2b46662 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
@@ -13,7 +13,7 @@
/**
* Minio 鏂囦欢瀛樺偍
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class MinioSysFileServiceImpl implements ISysFileService
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
index 6ae0204..21317bf 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -6,20 +6,20 @@
import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.exception.file.FileException;
-import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
-import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
-import com.ruoyi.common.core.exception.file.InvalidExtensionException;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
-import com.ruoyi.common.core.utils.file.MimeTypeUtils;
-import com.ruoyi.common.core.utils.uuid.Seq;
+import com.se.common.core.exception.file.FileException;
+import com.se.common.core.exception.file.FileNameLengthLimitExceededException;
+import com.se.common.core.exception.file.FileSizeLimitExceededException;
+import com.se.common.core.exception.file.InvalidExtensionException;
+import com.se.common.core.utils.DateUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.file.FileTypeUtils;
+import com.se.common.core.utils.file.MimeTypeUtils;
+import com.se.common.core.utils.uuid.Seq;
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileUploadUtils
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
index ba6bdf1..d88ddbe 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
@@ -2,14 +2,14 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import com.se.common.security.annotation.EnableCustomConfig;
+import com.se.common.security.annotation.EnableRyFeignClients;
+import com.se.common.swagger.annotation.EnableCustomSwagger2;
/**
* 浠ｇ爜鐢熸垚
*
- * @author ruoyi
+ * @author admin
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
index ee7161b..f542350 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
@@ -6,7 +6,7 @@
/**
* 浠ｇ爜鐢熸垚鐩稿叧閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Component
@ConfigurationProperties(prefix = "gen")
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
index 72f8489..96ea440 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -16,13 +16,13 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.se.common.core.text.Convert;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
import com.ruoyi.gen.service.IGenTableColumnService;
@@ -31,7 +31,7 @@
/**
* 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RequestMapping("/gen")
@RestController
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
index 5585ad1..8f7c54f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -4,14 +4,14 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.core.constant.GenConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.constant.GenConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 涓氬姟琛� gen_table
*
- * @author ruoyi
+ * @author admin
*/
public class GenTable extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
index e53eff5..a6e7a9c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -2,13 +2,13 @@
import javax.validation.constraints.NotBlank;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
*
- * @author ruoyi
+ * @author admin
*/
public class GenTableColumn extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
index 0be7cc0..508484d 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java
@@ -6,7 +6,7 @@
/**
* 涓氬姟瀛楁 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface GenTableColumnMapper
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
index 3487d6a..3c9b97c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
@@ -6,7 +6,7 @@
/**
* 涓氬姟 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface GenTableMapper
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
index f009c4b..649a3cc 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java
@@ -3,14 +3,14 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.text.Convert;
+import com.se.common.core.text.Convert;
import com.ruoyi.gen.domain.GenTableColumn;
import com.ruoyi.gen.mapper.GenTableColumnMapper;
/**
* 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
index 2b1323b..0587c4e 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -23,12 +23,12 @@
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.GenConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.CharsetKit;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.constant.GenConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.text.CharsetKit;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
import com.ruoyi.gen.mapper.GenTableColumnMapper;
@@ -40,7 +40,7 @@
/**
* 涓氬姟 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class GenTableServiceImpl implements IGenTableService
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
index 1f23685..bf35e63 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java
@@ -6,7 +6,7 @@
/**
* 涓氬姟瀛楁 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface IGenTableColumnService
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
index 0da8af7..ad90cc9 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
@@ -7,7 +7,7 @@
/**
* 涓氬姟 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface IGenTableService
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
index 3dae786..08da737 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
@@ -2,8 +2,8 @@
import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils;
-import com.ruoyi.common.core.constant.GenConstants;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.constant.GenConstants;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.gen.config.GenConfig;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
@@ -11,7 +11,7 @@
/**
* 浠ｇ爜鐢熸垚鍣� 宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class GenUtils
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
index d6f0160..277ee9a 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
@@ -2,12 +2,12 @@
import java.util.Properties;
import org.apache.velocity.app.Velocity;
-import com.ruoyi.common.core.constant.Constants;
+import com.se.common.core.constant.Constants;
/**
* VelocityEngine宸ュ巶
*
- * @author ruoyi
+ * @author admin
*/
public class VelocityInitializer
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
index 005552a..5fc5383 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -7,16 +7,16 @@
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.constant.GenConstants;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.constant.GenConstants;
+import com.se.common.core.utils.DateUtils;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
/**
* 妯℃澘宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class VelocityUtils
{
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
index e5fe3b5..86e7eaf 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
@@ -1,7 +1,6 @@
package ${packageName}.controller;
import java.util.List;
-import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,16 +11,16 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.utils.poi.ExcelUtil;
#if($table.crud || $table.sub)
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.se.common.core.web.page.TableDataInfo;
#elseif($table.tree)
#end
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
index ee3b7b4..bb2fa06 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm
@@ -3,13 +3,9 @@
#foreach ($import in $importList)
import ${import};
#end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel;
#if($table.crud || $table.sub)
-import com.ruoyi.common.core.web.domain.BaseEntity;
#elseif($table.tree)
-import com.ruoyi.common.core.web.domain.TreeEntity;
#end
/**
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
index d590b92..81d3764 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
@@ -3,7 +3,7 @@
import java.util.List;
#foreach ($column in $columns)
#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.ruoyi.common.core.utils.DateUtils;
+import com.se.common.core.utils.DateUtils;
#break
#end
#end
@@ -11,7 +11,7 @@
import org.springframework.stereotype.Service;
#if($table.sub)
import java.util.ArrayList;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName};
#end
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm
index 2e039ff..a517964 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm
@@ -3,10 +3,7 @@
#foreach ($import in $subImportList)
import ${import};
#end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
/**
* ${subTable.functionName}瀵硅薄 ${subTableName}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
index fcd1963..1e316f6 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
@@ -2,14 +2,14 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import com.se.common.security.annotation.EnableCustomConfig;
+import com.se.common.security.annotation.EnableRyFeignClients;
+import com.se.common.swagger.annotation.EnableCustomSwagger2;
/**
* 瀹氭椂浠诲姟
*
- * @author ruoyi
+ * @author admin
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
index 912aadc..fa224ce 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
@@ -9,7 +9,7 @@
///**
// * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛�
// *
-// * @author ruoyi
+// * @author admin
// */
//@Configuration
//public class ScheduleConfig
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
index 7625e88..0959adc 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
@@ -12,17 +12,17 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.job.TaskException;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.exception.job.TaskException;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.job.domain.SysJob;
import com.ruoyi.job.service.ISysJobService;
import com.ruoyi.job.util.CronUtils;
@@ -31,7 +31,7 @@
/**
* 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/job")
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
index caf7451..5e0cae6 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
@@ -9,20 +9,20 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
import com.ruoyi.job.domain.SysJobLog;
import com.ruoyi.job.service.ISysJobLogService;
/**
* 璋冨害鏃ュ織鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/job/log")
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
index dd630ba..51e0c3a 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
@@ -6,17 +6,17 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.constant.ScheduleConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.domain.BaseEntity;
import com.ruoyi.job.util.CronUtils;
/**
* 瀹氭椂浠诲姟璋冨害琛� sys_job
*
- * @author ruoyi
+ * @author admin
*/
public class SysJob extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
index 6c2c7ed..a74443d 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java
@@ -3,13 +3,13 @@
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織琛� sys_job_log
*
- * @author ruoyi
+ * @author admin
*/
public class SysJobLog extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
index 80f0716..5a5ca67 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java
@@ -6,7 +6,7 @@
/**
* 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysJobLogMapper
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
index d7e499e..dae7a8e 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java
@@ -6,7 +6,7 @@
/**
* 璋冨害浠诲姟淇℃伅 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysJobMapper
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
index 75b3dc5..588a423 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java
@@ -6,7 +6,7 @@
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysJobLogService
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
index 5270b34..dd79879 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java
@@ -2,13 +2,13 @@
import java.util.List;
import org.quartz.SchedulerException;
-import com.ruoyi.common.core.exception.job.TaskException;
+import com.se.common.core.exception.job.TaskException;
import com.ruoyi.job.domain.SysJob;
/**
* 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysJobService
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
index 41bdcca..d415341 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java
@@ -9,7 +9,7 @@
/**
* 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysJobLogServiceImpl implements ISysJobLogService
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
index 8936b9c..75110d1 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
@@ -9,8 +9,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.exception.job.TaskException;
+import com.se.common.core.constant.ScheduleConstants;
+import com.se.common.core.exception.job.TaskException;
import com.ruoyi.job.domain.SysJob;
import com.ruoyi.job.mapper.SysJobMapper;
import com.ruoyi.job.util.CronUtils;
@@ -19,7 +19,7 @@
/**
* 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysJobServiceImpl implements ISysJobService
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
index 3a127ef..873c7c0 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java
@@ -1,12 +1,12 @@
package com.ruoyi.job.task;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 瀹氭椂浠诲姟璋冨害娴嬭瘯
*
- * @author ruoyi
+ * @author admin
*/
@Component("ryTask")
public class RyTask
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
index 55ff671..1e01071 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java
@@ -6,11 +6,11 @@
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.utils.ExceptionUtil;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.se.common.core.constant.ScheduleConstants;
+import com.se.common.core.utils.ExceptionUtil;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.bean.BeanUtils;
import com.ruoyi.job.domain.SysJob;
import com.ruoyi.job.domain.SysJobLog;
import com.ruoyi.job.service.ISysJobLogService;
@@ -18,7 +18,7 @@
/**
* 鎶借薄quartz璋冪敤
*
- * @author ruoyi
+ * @author admin
*/
public abstract class AbstractQuartzJob implements Job
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
index 9fc6c9f..99c3f61 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java
@@ -7,7 +7,7 @@
/**
* cron琛ㄨ揪寮忓伐鍏风被
*
- * @author ruoyi
+ * @author admin
*
*/
public class CronUtils
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
index 1f2c8d3..13001aa 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
@@ -4,14 +4,14 @@
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.job.domain.SysJob;
/**
* 浠诲姟鎵ц宸ュ叿
*
- * @author ruoyi
+ * @author admin
*/
public class JobInvokeUtil
{
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
index 325bd93..58aa3f0 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java
@@ -8,7 +8,7 @@
/**
* 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級
*
- * @author ruoyi
+ * @author admin
*
*/
@DisallowConcurrentExecution
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
index bab4ee9..a34648b 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java
@@ -7,7 +7,7 @@
/**
* 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級
*
- * @author ruoyi
+ * @author admin
*
*/
public class QuartzJobExecution extends AbstractQuartzJob
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
index 3c9b24e..e76c6d5 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
@@ -10,18 +10,18 @@
import org.quartz.SchedulerException;
import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.ScheduleConstants;
-import com.ruoyi.common.core.exception.job.TaskException;
-import com.ruoyi.common.core.exception.job.TaskException.Code;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.constant.ScheduleConstants;
+import com.se.common.core.exception.job.TaskException;
+import com.se.common.core.exception.job.TaskException.Code;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.job.domain.SysJob;
/**
* 瀹氭椂浠诲姟宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*
*/
public class ScheduleUtils
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
index 93d47ef..7823d25 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
@@ -2,14 +2,14 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
-import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import com.se.common.security.annotation.EnableCustomConfig;
+import com.se.common.security.annotation.EnableRyFeignClients;
+import com.se.common.swagger.annotation.EnableCustomSwagger2;
/**
* 绯荤粺妯″潡
*
- * @author ruoyi
+ * @author admin
*/
@EnableCustomConfig
@EnableCustomSwagger2
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
index bfa9001..f8cb2a8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
@@ -12,21 +12,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/config")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
index cf43c68..12cddef 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
@@ -12,21 +12,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDept;
import com.ruoyi.system.service.ISysDeptService;
/**
* 閮ㄩ棬淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/dept")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
index ef90356..53e8953 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
@@ -13,23 +13,23 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDictData;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
/**
* 鏁版嵁瀛楀吀淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/dict/data")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
index 02b4e68..fe225a6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
@@ -12,21 +12,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDictType;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDictType;
import com.ruoyi.system.service.ISysDictTypeService;
/**
* 鏁版嵁瀛楀吀淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/dict/type")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
index 713043f..ce44741 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
@@ -10,23 +10,23 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.redis.service.RedisService;
+import com.se.common.security.annotation.InnerAuth;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.system.api.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
/**
* 绯荤粺璁块棶璁板綍
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/logininfor")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
index 6cd9f24..d8f8b72 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
@@ -11,21 +11,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.service.ISysMenuService;
/**
* 鑿滃崟淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/menu")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
index 0f81b6f..0e0c3a3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
@@ -11,20 +11,20 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
/**
* 鍏憡 淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/notice")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
index 10c8045..4439026 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
@@ -10,21 +10,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.api.domain.SysOperLog;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.InnerAuth;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.system.api.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
/**
* 鎿嶄綔鏃ュ織璁板綍
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/operlog")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java
index 36ac90c..c0fbcb8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java
@@ -12,21 +12,21 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
/**
* 宀椾綅淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/post")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index cfbfb36..18290d2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -10,26 +10,26 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
-import com.ruoyi.common.core.utils.file.MimeTypeUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.domain.R;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.file.FileTypeUtils;
+import com.se.common.core.utils.file.MimeTypeUtils;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.service.TokenService;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.RemoteFileService;
+import com.se.system.api.domain.SysFile;
+import com.se.system.api.domain.SysUser;
+import com.se.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysUserService;
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/user/profile")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index ef9f015..61ef5a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -12,17 +12,17 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDept;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
@@ -31,7 +31,7 @@
/**
* 瑙掕壊淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/role")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 534483f..44bed81 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -17,21 +17,21 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.domain.R;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.poi.ExcelUtil;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.security.annotation.InnerAuth;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDept;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
+import com.se.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPermissionService;
@@ -42,7 +42,7 @@
/**
* 鐢ㄦ埛淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/user")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java
index e9ed9bb..864ddf5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java
@@ -10,23 +10,23 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.web.controller.BaseController;
+import com.se.common.core.web.domain.AjaxResult;
+import com.se.common.core.web.page.TableDataInfo;
+import com.se.common.log.annotation.Log;
+import com.se.common.log.enums.BusinessType;
+import com.se.common.redis.service.RedisService;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
*
- * @author ruoyi
+ * @author admin
*/
@RestController
@RequestMapping("/online")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index a1e22ef..3e18992 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -4,14 +4,14 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 鍙傛暟閰嶇疆琛� sys_config
*
- * @author ruoyi
+ * @author admin
*/
public class SysConfig extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
index daa874a..1be9e3b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
@@ -7,12 +7,12 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 鑿滃崟鏉冮檺琛� sys_menu
*
- * @author ruoyi
+ * @author admin
*/
public class SysMenu extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index 144fcdf..23cd2d8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -4,13 +4,13 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
+import com.se.common.core.web.domain.BaseEntity;
+import com.se.common.core.xss.Xss;
/**
* 閫氱煡鍏憡琛� sys_notice
*
- * @author ruoyi
+ * @author admin
*/
public class SysNotice extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 71ad02b..8369664 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -5,14 +5,14 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 宀椾綅琛� sys_post
*
- * @author ruoyi
+ * @author admin
*/
public class SysPost extends BaseEntity
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
index 47b21bf..e6fa9aa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -6,7 +6,7 @@
/**
* 瑙掕壊鍜岄儴闂ㄥ叧鑱� sys_role_dept
*
- * @author ruoyi
+ * @author admin
*/
public class SysRoleDept
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
index de10a74..3897f31 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -6,7 +6,7 @@
/**
* 瑙掕壊鍜岃彍鍗曞叧鑱� sys_role_menu
*
- * @author ruoyi
+ * @author admin
*/
public class SysRoleMenu
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
index 69bac9a..d1a7db2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -3,7 +3,7 @@
/**
* 褰撳墠鍦ㄧ嚎浼氳瘽
*
- * @author ruoyi
+ * @author admin
*/
public class SysUserOnline
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
index 6e8c416..5c1219b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -6,7 +6,7 @@
/**
* 鐢ㄦ埛鍜屽矖浣嶅叧鑱� sys_user_post
*
- * @author ruoyi
+ * @author admin
*/
public class SysUserPost
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
index 4d15810..65badb7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -6,7 +6,7 @@
/**
* 鐢ㄦ埛鍜岃鑹插叧鑱� sys_user_role
*
- * @author ruoyi
+ * @author admin
*/
public class SysUserRole
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 53bb9f6..449a1fc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -1,11 +1,11 @@
package com.ruoyi.system.domain.vo;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 璺敱鏄剧ず淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class MetaVo
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
index afff8c9..16eb2e1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -6,7 +6,7 @@
/**
* 璺敱閰嶇疆淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class RouterVo
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
index cc542ef..4be5870 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java
@@ -4,13 +4,13 @@
import java.util.List;
import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.system.api.domain.SysDept;
+import com.se.system.api.domain.SysDept;
import com.ruoyi.system.domain.SysMenu;
/**
* Treeselect鏍戠粨鏋勫疄浣撶被
*
- * @author ruoyi
+ * @author admin
*/
public class TreeSelect implements Serializable
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index 69f1ac5..1aa9d00 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -6,7 +6,7 @@
/**
* 鍙傛暟閰嶇疆 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysConfigMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index 77e7e83..b29197e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -2,12 +2,12 @@
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.api.domain.SysDept;
+import com.se.system.api.domain.SysDept;
/**
* 閮ㄩ棬绠＄悊 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysDeptMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
index b004c59..1403a8e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
@@ -2,12 +2,12 @@
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.se.system.api.domain.SysDictData;
/**
* 瀛楀吀琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysDictDataMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
index d217293..02fe04c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.mapper;
import java.util.List;
-import com.ruoyi.system.api.domain.SysDictType;
+import com.se.system.api.domain.SysDictType;
/**
* 瀛楀吀琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysDictTypeMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
index 19671f3..d6cf4c3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.mapper;
import java.util.List;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.se.system.api.domain.SysLogininfor;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysLogininforMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index 3302010..0342c46 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -7,7 +7,7 @@
/**
* 鑿滃崟琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysMenuMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
index 226fdab..4876782 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
@@ -6,7 +6,7 @@
/**
* 閫氱煡鍏憡琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysNoticeMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
index f243dcd..04b197a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.mapper;
import java.util.List;
-import com.ruoyi.system.api.domain.SysOperLog;
+import com.se.system.api.domain.SysOperLog;
/**
* 鎿嶄綔鏃ュ織 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysOperLogMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
index 19be227..21e8662 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
@@ -6,7 +6,7 @@
/**
* 宀椾綅淇℃伅 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysPostMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
index f9d3a2f..d1d4f7d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
@@ -6,7 +6,7 @@
/**
* 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysRoleDeptMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index 1ef156f..5d33398 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.mapper;
import java.util.List;
-import com.ruoyi.system.api.domain.SysRole;
+import com.se.system.api.domain.SysRole;
/**
* 瑙掕壊琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysRoleMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
index 6602bee..87fb374 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
@@ -6,7 +6,7 @@
/**
* 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysRoleMenuMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 2624ad8..9a4b430 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -2,12 +2,12 @@
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.system.api.domain.SysUser;
/**
* 鐢ㄦ埛琛� 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysUserMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
index 2a6a720..ad9bb68 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -6,7 +6,7 @@
/**
* 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysUserPostMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
index 3143ec8..d2dd378 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -7,7 +7,7 @@
/**
* 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface SysUserRoleMapper
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
index 52a3b00..607e370 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -6,7 +6,7 @@
/**
* 鍙傛暟閰嶇疆 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysConfigService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
index 313d577..76bb396 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
@@ -1,13 +1,13 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysDept;
+import com.se.system.api.domain.SysDept;
import com.ruoyi.system.domain.vo.TreeSelect;
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysDeptService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
index ba9d8ea..84df114 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.se.system.api.domain.SysDictData;
/**
* 瀛楀吀 涓氬姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysDictDataService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
index ceb80e7..78da119 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@@ -1,13 +1,13 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysDictData;
-import com.ruoyi.system.api.domain.SysDictType;
+import com.se.system.api.domain.SysDictData;
+import com.se.system.api.domain.SysDictType;
/**
* 瀛楀吀 涓氬姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysDictTypeService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
index 509cc54..f46a38a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.se.system.api.domain.SysLogininfor;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysLogininforService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
index 4de9419..da2b7fe 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -9,7 +9,7 @@
/**
* 鑿滃崟 涓氬姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysMenuService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
index 47ce1b7..88879ce 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
@@ -6,7 +6,7 @@
/**
* 鍏憡 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysNoticeService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
index 2178a9d..35040e9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysOperLog;
+import com.se.system.api.domain.SysOperLog;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysOperLogService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
index 230f9b2..9f38b49 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
@@ -2,12 +2,12 @@
import java.util.Set;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.system.api.domain.SysUser;
/**
* 鏉冮檺淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysPermissionService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
index 84779bf..55a43c0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
@@ -6,7 +6,7 @@
/**
* 宀椾綅淇℃伅 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysPostService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index de3ccf3..d03531a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -2,13 +2,13 @@
import java.util.List;
import java.util.Set;
-import com.ruoyi.system.api.domain.SysRole;
+import com.se.system.api.domain.SysRole;
import com.ruoyi.system.domain.SysUserRole;
/**
* 瑙掕壊涓氬姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysRoleService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
index 9ca0ac4..469c717 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.service;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
/**
* 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysUserOnlineService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 26ad3ca..9003977 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -1,12 +1,12 @@
package com.ruoyi.system.service;
import java.util.List;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.system.api.domain.SysUser;
/**
* 鐢ㄦ埛 涓氬姟灞�
*
- * @author ruoyi
+ * @author admin
*/
public interface ISysUserService
{
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 39c8f89..cb7dbe2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -5,12 +5,12 @@
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.text.Convert;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.redis.service.RedisService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
@@ -18,7 +18,7 @@
/**
* 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysConfigServiceImpl implements ISysConfigService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 8f53104..fc39218 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -6,16 +6,16 @@
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.text.Convert;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.datascope.annotation.DataScope;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysDept;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -24,7 +24,7 @@
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysDeptServiceImpl implements ISysDeptService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
index a40666f..1f8ef78 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -3,15 +3,15 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.se.common.security.utils.DictUtils;
+import com.se.system.api.domain.SysDictData;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
/**
* 瀛楀吀 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysDictDataServiceImpl implements ISysDictDataService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 1ac0925..a90504a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -8,12 +8,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.DictUtils;
-import com.ruoyi.system.api.domain.SysDictData;
-import com.ruoyi.system.api.domain.SysDictType;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.utils.DictUtils;
+import com.se.system.api.domain.SysDictData;
+import com.se.system.api.domain.SysDictType;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -21,7 +21,7 @@
/**
* 瀛楀吀 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
index ba53b22..c1557de 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -3,14 +3,14 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.se.system.api.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysLogininforServiceImpl implements ISysLogininforService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 667ae1f..9241a7f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -10,12 +10,12 @@
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.constant.Constants;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
@@ -28,7 +28,7 @@
/**
* 鑿滃崟 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysMenuServiceImpl implements ISysMenuService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
index 765438b..e2ee68f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -10,7 +10,7 @@
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysNoticeServiceImpl implements ISysNoticeService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index 232810f..8cb1d92 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -3,14 +3,14 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.system.api.domain.SysOperLog;
+import com.se.system.api.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysOperLogServiceImpl implements ISysOperLogService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index ffc794e..32240b6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -6,8 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysPermissionService;
import com.ruoyi.system.service.ISysRoleService;
@@ -15,7 +15,7 @@
/**
* 鐢ㄦ埛鏉冮檺澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysPermissionServiceImpl implements ISysPermissionService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
index 4148380..703f76d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@@ -3,9 +3,9 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
@@ -14,7 +14,7 @@
/**
* 宀椾綅淇℃伅 鏈嶅姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysPostServiceImpl implements ISysPostService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 9b9e7fa..ebcb81c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -8,14 +8,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.datascope.annotation.DataScope;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
@@ -28,7 +28,7 @@
/**
* 瑙掕壊 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysRoleServiceImpl implements ISysRoleService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
index 046b6fd..8570d45 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,15 +1,15 @@
package com.ruoyi.system.service.impl;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.utils.StringUtils;
+import com.se.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
/**
* 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e1cd9ca..1f44f5d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -10,15 +10,15 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.bean.BeanValidators;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.exception.ServiceException;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.bean.BeanValidators;
+import com.se.common.datascope.annotation.DataScope;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.domain.SysRole;
+import com.se.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
@@ -34,7 +34,7 @@
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author admin
*/
@Service
public class SysUserServiceImpl implements ISysUserService
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
deleted file mode 100644
index bdc98d9..0000000
--- a/ruoyi-visual/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <modules>
- <module>ruoyi-monitor</module>
- </modules>
-
- <artifactId>ruoyi-visual</artifactId>
- <packaging>pom</packaging>
-
- <description>
- ruoyi-visual鍥惧舰鍖栫鐞嗘ā鍧�
- </description>
-
-</project>
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
deleted file mode 100644
index b8a3610..0000000
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-visual</artifactId>
- <version>3.6.4</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ruoyi-visual-monitor</artifactId>
-
- <description>
- ruoyi-visual-monitor鐩戞帶涓績
- </description>
-
- <dependencies>
-
- <!-- SpringBoot Admin -->
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-server</artifactId>
- <version>${spring-boot-admin.version}</version>
- </dependency>
-
- <!-- SpringCloud Alibaba Nacos -->
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
- </dependency>
-
- <!-- SpringCloud Alibaba Nacos Config -->
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
- </dependency>
-
- <!-- SpringCloud Alibaba Sentinel -->
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
- </dependency>
-
- <!-- SpringBoot Web -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
- <!-- Spring Security -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
deleted file mode 100644
index 4ea0533..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.modules.monitor;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import de.codecentric.boot.admin.server.config.EnableAdminServer;
-
-/**
- * 鐩戞帶涓績
- *
- * @author ruoyi
- */
-@EnableAdminServer
-@SpringBootApplication
-public class RuoYiMonitorApplication
-{
- public static void main(String[] args)
- {
- SpringApplication.run(RuoYiMonitorApplication.class, args);
- System.out.println("(鈾モ棤鈥库棤)锞夛緸 鐩戞帶涓績鍚姩鎴愬姛 醿�(麓凇`醿�)锞� \n" +
- " .-------. ____ __ \n" +
- " | _ _ \\ \\ \\ / / \n" +
- " | ( ' ) | \\ _. / ' \n" +
- " |(_ o _) / _( )_ .' \n" +
- " | (_,_).' __ ___(_ o _)' \n" +
- " | |\\ \\ | || |(_,_)' \n" +
- " | | \\ `' /| `-' / \n" +
- " | | \\ / \\ / \n" +
- " ''-' `'-' `-..-' ");
- }
-}
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
deleted file mode 100644
index 9560204..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.ruoyi.modules.monitor.config;
-
-import de.codecentric.boot.admin.server.config.AdminServerProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-
-/**
- * 鐩戞帶鏉冮檺閰嶇疆
- *
- * @author ruoyi
- */
-@EnableWebSecurity
-public class WebSecurityConfigurer
-{
- private final String adminContextPath;
-
- public WebSecurityConfigurer(AdminServerProperties adminServerProperties)
- {
- this.adminContextPath = adminServerProperties.getContextPath();
- }
-
- @Bean
- public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception
- {
- SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
- successHandler.setTargetUrlParameter("redirectTo");
- successHandler.setDefaultTargetUrl(adminContextPath + "/");
-
- return httpSecurity
- .headers().frameOptions().disable()
- .and().authorizeRequests()
- .antMatchers(adminContextPath + "/assets/**"
- , adminContextPath + "/login"
- , adminContextPath + "/actuator/**"
- , adminContextPath + "/instances/**"
- ).permitAll()
- .anyRequest().authenticated()
- .and()
- .formLogin().loginPage(adminContextPath + "/login")
- .successHandler(successHandler).and()
- .logout().logoutUrl(adminContextPath + "/logout")
- .and()
- .httpBasic().and()
- .csrf()
- .disable()
- .build();
- }
-}
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt b/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt
deleted file mode 100644
index ecaf8a4..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _ _
- (_) (_)| |
- _ __ _ _ ___ _ _ _ ______ _ __ ___ ___ _ __ _ | |_ ___ _ __
-| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \ / _ \ | '_ \ | || __| / _ \ | '__|
-| | | |_| || (_) || |_| || | | | | | | || (_) || | | || || |_ | (_) || |
-|_| \__,_| \___/ \__, ||_| |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_|
- __/ |
- |___/
\ No newline at end of file
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
deleted file mode 100644
index 5bef22c..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Tomcat
-server:
- port: 9100
-
-# Spring
-spring:
- application:
- # 搴旂敤鍚嶇О
- name: ruoyi-monitor
- profiles:
- # 鐜閰嶇疆
- active: dev
- cloud:
- nacos:
- discovery:
- # 鏈嶅姟娉ㄥ唽鍦板潃
- server-addr: 127.0.0.1:8848
- config:
- # 閰嶇疆涓績鍦板潃
- server-addr: 127.0.0.1:8848
- # 閰嶇疆鏂囦欢鏍煎紡
- file-extension: yml
- # 鍏变韩閰嶇疆
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
deleted file mode 100644
index ab95c68..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
- <!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="logs/ruoyi-visual-monitor" />
- <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/info.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>INFO</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/error.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="warn" />
-
- <root level="info">
- <appender-ref ref="console" />
- </root>
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
- <root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
- </root>
-</configuration>
\ No newline at end of file
diff --git a/se-api/se-api-system/pom.xml b/se-api/se-api-system/pom.xml
index 9fd70d6..fade6e9 100644
--- a/se-api/se-api-system/pom.xml
+++ b/se-api/se-api-system/pom.xml
@@ -9,10 +9,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>ruoyi-api-system</artifactId>
+ <artifactId>se-api-system</artifactId>
<description>
- ruoyi-api-system绯荤粺鎺ュ彛妯″潡
+ se-api-system绯荤粺鎺ュ彛妯″潡
</description>
<dependencies>
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteFileService.java b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteFileService.java
index d13b418..72ac682 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteFileService.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteFileService.java
@@ -7,8 +7,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.constant.ServiceNameConstants;
+import com.se.common.core.domain.R;
/**
* 鏂囦欢鏈嶅姟
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteLogService.java b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteLogService.java
index a140880..871676e 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteLogService.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteLogService.java
@@ -6,9 +6,9 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.constant.ServiceNameConstants;
+import com.se.common.core.domain.R;
import com.se.system.api.factory.RemoteLogFallbackFactory;
/**
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteUserService.java b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteUserService.java
index ddec5b4..7c5bf1b 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/RemoteUserService.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/RemoteUserService.java
@@ -9,9 +9,9 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.constant.ServiceNameConstants;
+import com.se.common.core.domain.R;
import com.se.system.api.factory.RemoteUserFallbackFactory;
/**
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDept.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDept.java
index 74cf105..d656511 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDept.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDept.java
@@ -8,7 +8,7 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 閮ㄩ棬琛� sys_dept
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictData.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictData.java
index d4c62f6..74b0493 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictData.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictData.java
@@ -4,10 +4,10 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.constant.UserConstants;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 瀛楀吀鏁版嵁琛� sys_dict_data
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictType.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictType.java
index 4ef098f..8af29ab 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictType.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysDictType.java
@@ -5,9 +5,9 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 瀛楀吀绫诲瀷琛� sys_dict_type
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysLogininfor.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysLogininfor.java
index b615fc0..40f1b82 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysLogininfor.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysLogininfor.java
@@ -2,9 +2,9 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 绯荤粺璁块棶璁板綍琛� sys_logininfor
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysOperLog.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysOperLog.java
index 079c478..aacf3d8 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysOperLog.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysOperLog.java
@@ -2,9 +2,9 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 鎿嶄綔鏃ュ織璁板綍琛� oper_log
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysRole.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysRole.java
index 43e9e16..28e2d65 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysRole.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysRole.java
@@ -6,9 +6,9 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.web.domain.BaseEntity;
/**
* 瑙掕壊琛� sys_role
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
index 61414d0..4c6525d 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
@@ -5,12 +5,12 @@
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.annotation.Excels;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
+import com.se.common.core.annotation.Excel;
+import com.se.common.core.annotation.Excel.ColumnType;
+import com.se.common.core.annotation.Excel.Type;
+import com.se.common.core.annotation.Excels;
+import com.se.common.core.web.domain.BaseEntity;
+import com.se.common.core.xss.Xss;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteFileFallbackFactory.java b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteFileFallbackFactory.java
index 090e11e..ad094cf 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteFileFallbackFactory.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteFileFallbackFactory.java
@@ -5,7 +5,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.domain.R;
import com.se.system.api.RemoteFileService;
import com.se.system.api.domain.SysFile;
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteLogFallbackFactory.java b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteLogFallbackFactory.java
index 0afb378..bbf553c 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteLogFallbackFactory.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteLogFallbackFactory.java
@@ -7,7 +7,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.domain.R;
/**
* 鏃ュ織鏈嶅姟闄嶇骇澶勭悊
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteUserFallbackFactory.java b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteUserFallbackFactory.java
index 8bba032..dddff5b 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteUserFallbackFactory.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/factory/RemoteUserFallbackFactory.java
@@ -7,7 +7,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
+import com.se.common.core.domain.R;
/**
* 鐢ㄦ埛鏈嶅姟闄嶇骇澶勭悊
diff --git a/se-api/se-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-api/se-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index f3136a0..b384f21 100644
--- a/se-api/se-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/se-api/se-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,3 @@
-RemoteUserFallbackFactory
-RemoteLogFallbackFactory
-RemoteFileFallbackFactory
+com.se.system.api.factory.RemoteUserFallbackFactory
+com.se.system.api.factory.RemoteLogFallbackFactory
+com.se.system.api.factory.RemoteFileFallbackFactory
diff --git a/ruoyi-common/pom.xml b/se-common/pom.xml
similarity index 100%
rename from ruoyi-common/pom.xml
rename to se-common/pom.xml
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/se-common/ruoyi-common-core/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-core/pom.xml
rename to se-common/ruoyi-common-core/pom.xml
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
index dcb3539..3909a30 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -12,7 +12,7 @@
/**
* 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
index 38135e7..03f017a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
@@ -8,7 +8,7 @@
/**
* Excel娉ㄨВ闆�
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index cff69f5..aeeed91 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -3,7 +3,7 @@
/**
* 閫氱敤甯搁噺淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class Constants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
index 75a6090..cb713db 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
@@ -3,7 +3,7 @@
/**
* 鏉冮檺鐩稿叧閫氱敤甯搁噺
*
- * @author ruoyi
+ * @author admin
*/
public class SecurityConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 421a322..1e3a7c0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -3,7 +3,7 @@
/**
* 鏈嶅姟鍚嶇О
*
- * @author ruoyi
+ * @author admin
*/
public class ServiceNameConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
index 5d02f38..b19b8b4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
@@ -3,7 +3,7 @@
/**
* 鐢ㄦ埛甯搁噺淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class UserConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
index 0003b19..9359e2a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -6,7 +6,7 @@
/**
* 鍝嶅簲淇℃伅涓讳綋
*
- * @author ruoyi
+ * @author admin
*/
public class R<T> implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
index 65a8cd8..1ae37ec 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
@@ -3,7 +3,7 @@
/**
* 鐢ㄦ埛鐘舵��
*
- * @author ruoyi
+ * @author admin
*/
public enum UserStatus
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
similarity index 93%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
index 8fa2ec0..ecc2771 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
@@ -3,7 +3,7 @@
/**
* 楠岃瘉鐮侀敊璇紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class CaptchaException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
index c7f74cb..5fe5c4b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
@@ -3,7 +3,7 @@
/**
* 妫�鏌ュ紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class CheckedException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
index b55c7cd..7a725fa 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
@@ -3,7 +3,7 @@
/**
* 鍏ㄥ眬寮傚父
*
- * @author ruoyi
+ * @author admin
*/
public class GlobalException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
index 4983866..43fdedb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
@@ -3,7 +3,7 @@
/**
* 涓氬姟寮傚父
*
- * @author ruoyi
+ * @author admin
*/
public final class ServiceException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
index 6e9d3db..9fc871f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
@@ -5,7 +5,7 @@
/**
* 鏈兘閫氳繃鐨勬潈闄愯璇佸紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class NotPermissionException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
index 686374a..10f45ad 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
@@ -5,7 +5,7 @@
/**
* 鏈兘閫氳繃鐨勮鑹茶璇佸紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class NotRoleException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
index e8a4199..325ab0a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileNameLengthLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
index b592b6f..d172bd2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
@@ -3,7 +3,7 @@
/**
* 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class FileSizeLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
index 2a0b906..668cd4d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
@@ -5,7 +5,7 @@
/**
* 鏂囦欢涓婁紶 璇紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class InvalidExtensionException extends FileUploadException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
similarity index 94%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
index ec68864..fd3b7e1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
@@ -3,7 +3,7 @@
/**
* 楠岃瘉鐮佸け鏁堝紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class CaptchaExpireException extends UserException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index e74c532..220a761 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -12,7 +12,7 @@
/**
* 绫诲瀷杞崲鍣�
*
- * @author ruoyi
+ * @author admin
*/
public class Convert
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
index cf366ea..24a83c5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
@@ -5,7 +5,7 @@
/**
* 瀛楃涓叉牸寮忓寲
*
- * @author ruoyi
+ * @author admin
*/
public class StrFormatter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 137eccb..e0967f9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -14,7 +14,7 @@
/**
* 鏃堕棿宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
index 12f6c72..2fe9e92 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
@@ -7,7 +7,7 @@
/**
* 閿欒淇℃伅澶勭悊绫汇��
*
- * @author ruoyi
+ * @author admin
*/
public class ExceptionUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
index 95ee25b..13dafbe 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
@@ -8,7 +8,7 @@
/**
* 鍒嗛〉宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class PageUtils extends PageHelper
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
index 350c9a3..d29d260 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -30,7 +30,7 @@
/**
* 瀹㈡埛绔伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class ServletUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
index e4ec3bc..35a8950 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
@@ -10,7 +10,7 @@
/**
* spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
*
- * @author ruoyi
+ * @author admin
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
index 7a1270e..0f39ac6 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
@@ -10,7 +10,7 @@
/**
* 瀛楃涓插伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
index fba6032..31e0499 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
@@ -9,7 +9,7 @@
/**
* Bean 宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class BeanUtils extends org.springframework.beans.BeanUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
index c36c306..6e2636b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
@@ -9,7 +9,7 @@
/**
* 鏂囦欢绫诲瀷宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileTypeUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
index 61af137..24193f1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
@@ -16,7 +16,7 @@
/**
* 鏂囦欢澶勭悊宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
index 940bff7..a1e92ad 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
@@ -12,7 +12,7 @@
/**
* 鍥剧墖澶勭悊宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class ImageUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
index 75716fb..ee89d2f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
@@ -5,7 +5,7 @@
/**
* 杞箟鍜屽弽杞箟宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class EscapeUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
similarity index 99%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
copy to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
index 4d72b27..136eea0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
@@ -13,7 +13,7 @@
/**
* HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆�
*
- * @author ruoyi
+ * @author admin
*/
public final class HTMLFilter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
index cf5108b..966e306 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
@@ -9,7 +9,7 @@
/**
* 鑾峰彇IP鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
public class IpUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
index 4d99289..58573fe 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
@@ -6,7 +6,7 @@
/**
* Excel鏁版嵁鏍煎紡澶勭悊閫傞厤鍣�
*
- * @author ruoyi
+ * @author admin
*/
public interface ExcelHandlerAdapter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
index 32bb12d..e8238a5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
@@ -3,7 +3,7 @@
/**
* ID鐢熸垚鍣ㄥ伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class IdUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
index e226834..3cb9245 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
@@ -5,7 +5,7 @@
import com.ruoyi.common.core.utils.StringUtils;
/**
- * @author ruoyi 搴忓垪鐢熸垚绫�
+ * @author admin 搴忓垪鐢熸垚绫�
*/
public class Seq
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
index f6acbb1..1eb4f62 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
@@ -10,7 +10,7 @@
/**
* 鎻愪緵閫氱敤鍞竴璇嗗埆鐮侊紙universally unique identifier锛夛紙UUID锛夊疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
public final class UUID implements java.io.Serializable, Comparable<UUID>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
index 2bfd8cb..04dedb0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -17,7 +17,7 @@
/**
* web灞傞�氱敤鏁版嵁澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
public class BaseController
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
index a7ff17c..f2a11ca 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
@@ -8,7 +8,7 @@
/**
* 鎿嶄綔娑堟伅鎻愰啋
*
- * @author ruoyi
+ * @author admin
*/
public class AjaxResult extends HashMap<String, Object>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
index eb9f783..b6b74a3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
@@ -11,7 +11,7 @@
/**
* Entity鍩虹被
*
- * @author ruoyi
+ * @author admin
*/
public class BaseEntity implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
index 0481ced..6539e9d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
@@ -6,7 +6,7 @@
/**
* Tree鍩虹被
*
- * @author ruoyi
+ * @author admin
*/
public class TreeEntity extends BaseEntity
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index 31365c3..d6074f5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -5,7 +5,7 @@
/**
* 鍒嗛〉鏁版嵁
*
- * @author ruoyi
+ * @author admin
*/
public class PageDomain
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
index c294089..4985103 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
@@ -6,7 +6,7 @@
/**
* 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄
*
- * @author ruoyi
+ * @author admin
*/
public class TableDataInfo implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
rename to se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
index 404be08..961a150 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
+++ b/se-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
@@ -6,7 +6,7 @@
/**
* 琛ㄦ牸鏁版嵁澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
public class TableSupport
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to se-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/se-common/ruoyi-common-datascope/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-datascope/pom.xml
rename to se-common/ruoyi-common-datascope/pom.xml
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/se-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
rename to se-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
index 3834657..0d26b99 100644
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
+++ b/se-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
@@ -9,7 +9,7 @@
/**
* 鏁版嵁鏉冮檺杩囨护娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to se-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/se-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
rename to se-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
index bc45f6f..34ca129 100644
--- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
+++ b/se-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
@@ -10,7 +10,7 @@
/**
* 浠庡簱鏁版嵁婧�
*
- * @author ruoyi
+ * @author admin
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/se-common/ruoyi-common-log/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-log/pom.xml
rename to se-common/ruoyi-common-log/pom.xml
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java b/se-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
rename to se-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
index 0327a24..539d834 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
+++ b/se-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
@@ -5,7 +5,7 @@
/**
* 鎺掗櫎JSON鏁忔劅灞炴��
*
- * @author ruoyi
+ * @author admin
*/
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter
{
diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to se-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/se-common/ruoyi-common-redis/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-redis/pom.xml
rename to se-common/ruoyi-common-redis/pom.xml
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
rename to se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
index d897763..e6b0ebf 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
+++ b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
@@ -12,7 +12,7 @@
/**
* Redis浣跨敤FastJson搴忓垪鍖�
*
- * @author ruoyi
+ * @author admin
*/
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
rename to se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
index 6e1ec8a..4eb58f8 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -13,7 +13,7 @@
/**
* redis閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@EnableCaching
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
rename to se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
index 435cb6e..98fd6c2 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
+++ b/se-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
@@ -16,7 +16,7 @@
/**
* spring redis 宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/se-common/ruoyi-common-security/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-security/pom.xml
rename to se-common/ruoyi-common-security/pom.xml
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
similarity index 100%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
index 4eb416e..4947fc1 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
@@ -7,7 +7,7 @@
* 鑷畾涔塮eign娉ㄨВ
* 娣诲姞basePackages璺緞
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
similarity index 93%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
index 4b787a0..b1106ba 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
@@ -3,7 +3,7 @@
/**
* 鏉冮檺娉ㄨВ鐨勯獙璇佹ā寮�
*
- * @author ruoyi
+ * @author admin
*
*/
public enum Logical
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
index f196ff5..d6c1cb5 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
@@ -8,7 +8,7 @@
/**
* 鐧诲綍璁よ瘉锛氬彧鏈夌櫥褰曚箣鍚庢墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
index aef624d..1a4c7cc 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
@@ -8,7 +8,7 @@
/**
* 鏉冮檺璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氭潈闄愭墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
index 042e4c2..3fc55d3 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
@@ -8,7 +8,7 @@
/**
* 瑙掕壊璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氳鑹叉爣璇嗘墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
similarity index 100%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
index f50d70b..138507f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
@@ -16,12 +16,12 @@
import com.ruoyi.common.security.annotation.RequiresRoles;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
/**
* Token 鏉冮檺楠岃瘉锛岄�昏緫瀹炵幇绫�
*
- * @author ruoyi
+ * @author admin
*/
public class AuthLogic
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
index 8b0d86c..130362b 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
@@ -2,12 +2,12 @@
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
/**
* Token 鏉冮檺楠岃瘉宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class AuthUtil
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
index 5ae8d14..e95a4c1 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
@@ -7,7 +7,7 @@
/**
* 绯荤粺閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
public class ApplicationConfig
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
index 46adfd9..bd1aebe 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
@@ -7,7 +7,7 @@
/**
* 鎷︽埅鍣ㄩ厤缃�
*
- * @author ruoyi
+ * @author admin
*/
public class WebMvcConfig implements WebMvcConfigurer
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
similarity index 95%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
index 304798d..77a53f5 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
@@ -7,7 +7,7 @@
/**
* Feign 閰嶇疆娉ㄥ唽
*
- * @author ruoyi
+ * @author admin
**/
@Configuration
public class FeignAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
index 33e12c6..f836cc6 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
@@ -13,7 +13,7 @@
/**
* feign 璇锋眰鎷︽埅鍣�
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class FeignRequestInterceptor implements RequestInterceptor
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
index 18c8d2b..2400d33 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
@@ -10,13 +10,13 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
/**
* 鑷畾涔夎姹傚ご鎷︽埅鍣紝灏咹eader鏁版嵁灏佽鍒扮嚎绋嬪彉閲忎腑鏂逛究鑾峰彇
* 娉ㄦ剰锛氭鎷︽埅鍣ㄤ細鍚屾椂楠岃瘉褰撳墠鐢ㄦ埛鏈夋晥鏈熻嚜鍔ㄥ埛鏂版湁鏁堟湡
*
- * @author ruoyi
+ * @author admin
*/
public class HeaderInterceptor implements AsyncHandlerInterceptor
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
similarity index 98%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 2971792..d6cb5c6 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -17,12 +17,12 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
/**
* token楠岃瘉澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class TokenService
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
rename to se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
index 78a5393..3abe2c4 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/se-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -7,12 +7,12 @@
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.system.api.model.LoginUser;
/**
* 鏉冮檺鑾峰彇宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class SecurityUtils
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to se-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/se-common/ruoyi-common-sensitive/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-sensitive/pom.xml
rename to se-common/ruoyi-common-sensitive/pom.xml
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java b/se-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
similarity index 97%
rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
rename to se-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
index 30b24b3..5ebd1e4 100644
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
+++ b/se-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
@@ -12,7 +12,7 @@
/**
* 鏁版嵁鑴辨晱娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/se-common/ruoyi-common-swagger/pom.xml
similarity index 100%
rename from ruoyi-common/ruoyi-common-swagger/pom.xml
rename to se-common/ruoyi-common-swagger/pom.xml
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java
similarity index 100%
rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java
rename to se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java b/se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java
similarity index 100%
rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java
rename to se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
similarity index 96%
rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
rename to se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
index 28556b5..ebcba53 100644
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
+++ b/se-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
@@ -6,7 +6,7 @@
/**
* swagger 璧勬簮鏄犲皠璺緞
*
- * @author ruoyi
+ * @author admin
*/
public class SwaggerWebConfiguration implements WebMvcConfigurer
{
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to se-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/se-common/se-common-core/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-core/pom.xml
copy to se-common/se-common-core/pom.xml
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excel.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excel.java
index dcb3539..f0fa7d1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excel.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.annotation;
+package com.se.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -7,12 +7,12 @@
import java.math.BigDecimal;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
-import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
+import com.se.common.core.utils.poi.ExcelHandlerAdapter;
/**
* 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excels.java
similarity index 83%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excels.java
index 38135e7..4322428 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/annotation/Excels.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.annotation;
+package com.se.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@
/**
* Excel娉ㄨВ闆�
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/se-common/se-common-core/src/main/java/com/se/common/core/constant/Constants.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/constant/Constants.java
index cff69f5..80976e7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/constant/Constants.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.constant;
+package com.se.common.core.constant;
/**
* 閫氱敤甯搁噺淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class Constants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/se-common/se-common-core/src/main/java/com/se/common/core/constant/SecurityConstants.java
similarity index 93%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/constant/SecurityConstants.java
index 75a6090..63df4d1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/constant/SecurityConstants.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.constant;
+package com.se.common.core.constant;
/**
* 鏉冮檺鐩稿叧閫氱敤甯搁噺
*
- * @author ruoyi
+ * @author admin
*/
public class SecurityConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/se-common/se-common-core/src/main/java/com/se/common/core/constant/ServiceNameConstants.java
similarity index 87%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/constant/ServiceNameConstants.java
index 421a322..541e4ef 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/constant/ServiceNameConstants.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.constant;
+package com.se.common.core.constant;
/**
* 鏈嶅姟鍚嶇О
*
- * @author ruoyi
+ * @author admin
*/
public class ServiceNameConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/se-common/se-common-core/src/main/java/com/se/common/core/constant/UserConstants.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/constant/UserConstants.java
index 5d02f38..5058d34 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/constant/UserConstants.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.constant;
+package com.se.common.core.constant;
/**
* 鐢ㄦ埛甯搁噺淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class UserConstants
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/se-common/se-common-core/src/main/java/com/se/common/core/domain/R.java
similarity index 94%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/domain/R.java
index 0003b19..ff70b8f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/domain/R.java
@@ -1,12 +1,12 @@
-package com.ruoyi.common.core.domain;
+package com.se.common.core.domain;
import java.io.Serializable;
-import com.ruoyi.common.core.constant.Constants;
+import com.se.common.core.constant.Constants;
/**
* 鍝嶅簲淇℃伅涓讳綋
*
- * @author ruoyi
+ * @author admin
*/
public class R<T> implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/se-common/se-common-core/src/main/java/com/se/common/core/enums/UserStatus.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/enums/UserStatus.java
index 65a8cd8..5c4d4ff 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/enums/UserStatus.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.enums;
+package com.se.common.core.enums;
/**
* 鐢ㄦ埛鐘舵��
*
- * @author ruoyi
+ * @author admin
*/
public enum UserStatus
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/CaptchaException.java
similarity index 79%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/CaptchaException.java
index 8fa2ec0..5d258cc 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/CaptchaException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception;
+package com.se.common.core.exception;
/**
* 楠岃瘉鐮侀敊璇紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class CaptchaException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/CheckedException.java
similarity index 90%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/CheckedException.java
index c7f74cb..1c82555 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/CheckedException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception;
+package com.se.common.core.exception;
/**
* 妫�鏌ュ紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class CheckedException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/GlobalException.java
similarity index 94%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/GlobalException.java
index b55c7cd..f54105e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/GlobalException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception;
+package com.se.common.core.exception;
/**
* 鍏ㄥ眬寮傚父
*
- * @author ruoyi
+ * @author admin
*/
public class GlobalException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/ServiceException.java
similarity index 95%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/ServiceException.java
index 4983866..1a7f66b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/ServiceException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception;
+package com.se.common.core.exception;
/**
* 涓氬姟寮傚父
*
- * @author ruoyi
+ * @author admin
*/
public final class ServiceException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotPermissionException.java
similarity index 86%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotPermissionException.java
index 6e9d3db..6bb6b26 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotPermissionException.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.exception.auth;
+package com.se.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 鏈兘閫氳繃鐨勬潈闄愯璇佸紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class NotPermissionException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotRoleException.java
similarity index 85%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotRoleException.java
index 686374a..7588a45 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/auth/NotRoleException.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.exception.auth;
+package com.se.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 鏈兘閫氳繃鐨勮鑹茶璇佸紓甯�
*
- * @author ruoyi
+ * @author admin
*/
public class NotRoleException extends RuntimeException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileNameLengthLimitExceededException.java
similarity index 85%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileNameLengthLimitExceededException.java
index e8a4199..879684a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception.file;
+package com.se.common.core.exception.file;
/**
* 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileNameLengthLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileSizeLimitExceededException.java
similarity index 84%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileSizeLimitExceededException.java
index b592b6f..aa81643 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/FileSizeLimitExceededException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception.file;
+package com.se.common.core.exception.file;
/**
* 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class FileSizeLimitExceededException extends FileException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/InvalidExtensionException.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/file/InvalidExtensionException.java
index 2a0b906..6188174 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/file/InvalidExtensionException.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.exception.file;
+package com.se.common.core.exception.file;
import java.util.Arrays;
/**
* 鏂囦欢涓婁紶 璇紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class InvalidExtensionException extends FileUploadException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/se-common/se-common-core/src/main/java/com/se/common/core/exception/user/CaptchaExpireException.java
similarity index 79%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/exception/user/CaptchaExpireException.java
index ec68864..b824c9d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/exception/user/CaptchaExpireException.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.exception.user;
+package com.se.common.core.exception.user;
/**
* 楠岃瘉鐮佸け鏁堝紓甯哥被
*
- * @author ruoyi
+ * @author admin
*/
public class CaptchaExpireException extends UserException
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/se-common/se-common-core/src/main/java/com/se/common/core/text/Convert.java
similarity index 99%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/text/Convert.java
index e74c532..8ee1b61 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/text/Convert.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.text;
+package com.se.common.core.text;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -7,12 +7,12 @@
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 绫诲瀷杞崲鍣�
*
- * @author ruoyi
+ * @author admin
*/
public class Convert
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/se-common/se-common-core/src/main/java/com/se/common/core/text/StrFormatter.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/text/StrFormatter.java
index cf366ea..cdc6699 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/text/StrFormatter.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.text;
+package com.se.common.core.text;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 瀛楃涓叉牸寮忓寲
*
- * @author ruoyi
+ * @author admin
*/
public class StrFormatter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/DateUtils.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/DateUtils.java
index 137eccb..f98d1b5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/DateUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;
@@ -14,7 +14,7 @@
/**
* 鏃堕棿宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ExceptionUtil.java
similarity index 93%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/ExceptionUtil.java
index 12f6c72..5bf284d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ExceptionUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -7,7 +7,7 @@
/**
* 閿欒淇℃伅澶勭悊绫汇��
*
- * @author ruoyi
+ * @author admin
*/
public class ExceptionUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/PageUtils.java
similarity index 77%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/PageUtils.java
index 95ee25b..28bfeb2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/PageUtils.java
@@ -1,14 +1,14 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.core.utils.sql.SqlUtil;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableSupport;
+import com.se.common.core.utils.sql.SqlUtil;
+import com.se.common.core.web.page.PageDomain;
+import com.se.common.core.web.page.TableSupport;
/**
* 鍒嗛〉宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class PageUtils extends PageHelper
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
index 350c9a3..beaf73f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -12,6 +12,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+
+import com.se.common.core.constant.Constants;
+import com.se.common.core.domain.R;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -22,15 +25,13 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.text.Convert;
+import com.se.common.core.text.Convert;
import reactor.core.publisher.Mono;
/**
* 瀹㈡埛绔伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class ServletUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/SpringUtils.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/SpringUtils.java
index e4ec3bc..eba3d9d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/SpringUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
@@ -10,7 +10,7 @@
/**
* spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
*
- * @author ruoyi
+ * @author admin
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/StringUtils.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/StringUtils.java
index 7a1270e..71c6dc1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/StringUtils.java
@@ -1,16 +1,17 @@
-package com.ruoyi.common.core.utils;
+package com.se.common.core.utils;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+
+import com.se.common.core.constant.Constants;
+import com.se.common.core.text.StrFormatter;
import org.springframework.util.AntPathMatcher;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.text.StrFormatter;
/**
* 瀛楃涓插伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/bean/BeanUtils.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/bean/BeanUtils.java
index fba6032..e9bc2b6 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/bean/BeanUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.bean;
+package com.se.common.core.utils.bean;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -9,7 +9,7 @@
/**
* Bean 宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class BeanUtils extends org.springframework.beans.BeanUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileTypeUtils.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileTypeUtils.java
index c36c306..4213810 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileTypeUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.se.common.core.utils.file;
import java.io.File;
import java.util.Objects;
@@ -9,7 +9,7 @@
/**
* 鏂囦欢绫诲瀷宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileTypeUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileUtils.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileUtils.java
index 61af137..ce795d3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/FileUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.se.common.core.utils.file;
import java.io.File;
import java.io.FileInputStream;
@@ -11,12 +11,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 鏂囦欢澶勭悊宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class FileUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/ImageUtils.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/file/ImageUtils.java
index 940bff7..91e75fe 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/file/ImageUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.se.common.core.utils.file;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -12,7 +12,7 @@
/**
* 鍥剧墖澶勭悊宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class ImageUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/html/EscapeUtil.java
similarity index 97%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/html/EscapeUtil.java
index 75716fb..7797556 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/html/EscapeUtil.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.utils.html;
+package com.se.common.core.utils.html;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 杞箟鍜屽弽杞箟宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class EscapeUtil
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/html/HTMLFilter.java
similarity index 99%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
rename to se-common/se-common-core/src/main/java/com/se/common/core/utils/html/HTMLFilter.java
index 4d72b27..ee5e604 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/html/HTMLFilter.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.html;
+package com.se.common.core.utils.html;
import java.util.ArrayList;
import java.util.Collections;
@@ -13,7 +13,7 @@
/**
* HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆�
*
- * @author ruoyi
+ * @author admin
*/
public final class HTMLFilter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ip/IpUtils.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/ip/IpUtils.java
index cf5108b..e42acb5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ip/IpUtils.java
@@ -1,15 +1,15 @@
-package com.ruoyi.common.core.utils.ip;
+package com.se.common.core.utils.ip;
import java.net.InetAddress;
import java.net.UnknownHostException;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 鑾峰彇IP鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
public class IpUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/poi/ExcelHandlerAdapter.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/poi/ExcelHandlerAdapter.java
index 4d99289..012fe2c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/poi/ExcelHandlerAdapter.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.poi;
+package com.se.common.core.utils.poi;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Workbook;
@@ -6,7 +6,7 @@
/**
* Excel鏁版嵁鏍煎紡澶勭悊閫傞厤鍣�
*
- * @author ruoyi
+ * @author admin
*/
public interface ExcelHandlerAdapter
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/IdUtils.java
similarity index 93%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/IdUtils.java
index 32bb12d..5fdc0cb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/IdUtils.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.se.common.core.utils.uuid;
/**
* ID鐢熸垚鍣ㄥ伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class IdUtils
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/Seq.java
similarity index 92%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/Seq.java
index e226834..40981c7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/Seq.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.se.common.core.utils.uuid;
import java.util.concurrent.atomic.AtomicInteger;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.DateUtils;
+import com.se.common.core.utils.StringUtils;
/**
- * @author ruoyi 搴忓垪鐢熸垚绫�
+ * @author admin 搴忓垪鐢熸垚绫�
*/
public class Seq
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/UUID.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/UUID.java
index f6acbb1..089520c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/uuid/UUID.java
@@ -1,16 +1,16 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.se.common.core.utils.uuid;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
-import com.ruoyi.common.core.exception.UtilException;
+import com.se.common.core.exception.UtilException;
/**
* 鎻愪緵閫氱敤鍞竴璇嗗埆鐮侊紙universally unique identifier锛夛紙UUID锛夊疄鐜�
*
- * @author ruoyi
+ * @author admin
*/
public final class UUID implements java.io.Serializable, Comparable<UUID>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/controller/BaseController.java
similarity index 89%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/controller/BaseController.java
index 2bfd8cb..9b464db 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/controller/BaseController.java
@@ -1,23 +1,24 @@
-package com.ruoyi.common.core.web.controller;
+package com.se.common.core.web.controller;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
+
+import com.se.common.core.web.page.TableDataInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.PageUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.se.common.core.constant.HttpStatus;
+import com.se.common.core.utils.DateUtils;
+import com.se.common.core.utils.PageUtils;
+import com.se.common.core.web.domain.AjaxResult;
/**
* web灞傞�氱敤鏁版嵁澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
public class BaseController
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/AjaxResult.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/domain/AjaxResult.java
index a7ff17c..c4464c7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/AjaxResult.java
@@ -1,14 +1,14 @@
-package com.ruoyi.common.core.web.domain;
+package com.se.common.core.web.domain;
import java.util.HashMap;
import java.util.Objects;
-import com.ruoyi.common.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.constant.HttpStatus;
+import com.se.common.core.utils.StringUtils;
/**
* 鎿嶄綔娑堟伅鎻愰啋
*
- * @author ruoyi
+ * @author admin
*/
public class AjaxResult extends HashMap<String, Object>
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java
index eb9f783..4b7a1a9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/BaseEntity.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.web.domain;
+package com.se.common.core.web.domain;
import java.io.Serializable;
import java.util.Date;
@@ -11,7 +11,7 @@
/**
* Entity鍩虹被
*
- * @author ruoyi
+ * @author admin
*/
public class BaseEntity implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/TreeEntity.java
similarity index 95%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/domain/TreeEntity.java
index 0481ced..f1be068 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/domain/TreeEntity.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.web.domain;
+package com.se.common.core.web.domain;
import java.util.ArrayList;
import java.util.List;
@@ -6,7 +6,7 @@
/**
* Tree鍩虹被
*
- * @author ruoyi
+ * @author admin
*/
public class TreeEntity extends BaseEntity
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/PageDomain.java
similarity index 94%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/page/PageDomain.java
index 31365c3..490f0b6 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/PageDomain.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.web.page;
+package com.se.common.core.web.page;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.se.common.core.utils.StringUtils;
/**
* 鍒嗛〉鏁版嵁
*
- * @author ruoyi
+ * @author admin
*/
public class PageDomain
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableDataInfo.java
similarity index 95%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableDataInfo.java
index c294089..113320e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableDataInfo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.web.page;
+package com.se.common.core.web.page;
import java.io.Serializable;
import java.util.List;
@@ -6,7 +6,7 @@
/**
* 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄
*
- * @author ruoyi
+ * @author admin
*/
public class TableDataInfo implements Serializable
{
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableSupport.java
similarity index 89%
copy from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
copy to se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableSupport.java
index 404be08..9350f4e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/web/page/TableSupport.java
@@ -1,12 +1,12 @@
-package com.ruoyi.common.core.web.page;
+package com.se.common.core.web.page;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.se.common.core.text.Convert;
+import com.se.common.core.utils.ServletUtils;
/**
* 琛ㄦ牸鏁版嵁澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
public class TableSupport
{
diff --git a/se-common/se-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/se-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..5aa2189
--- /dev/null
+++ b/se-common/se-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.se.common.core.utils.SpringUtils
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/se-common/se-common-datascope/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-datascope/pom.xml
copy to se-common/se-common-datascope/pom.xml
diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/se-common/se-common-datascope/src/main/java/com/se/common/datascope/annotation/DataScope.java
similarity index 91%
copy from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
copy to se-common/se-common-datascope/src/main/java/com/se/common/datascope/annotation/DataScope.java
index 3834657..f87b4a8 100644
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
+++ b/se-common/se-common-datascope/src/main/java/com/se/common/datascope/annotation/DataScope.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.datascope.annotation;
+package com.se.common.datascope.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@
/**
* 鏁版嵁鏉冮檺杩囨护娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/se-common/se-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/se-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..40ce370
--- /dev/null
+++ b/se-common/se-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.se.common.datascope.aspect.DataScopeAspect
diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/se-common/se-common-datasource/src/main/java/com/se/common/datasource/annotation/Slave.java
similarity index 86%
copy from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
copy to se-common/se-common-datasource/src/main/java/com/se/common/datasource/annotation/Slave.java
index bc45f6f..3343771 100644
--- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java
+++ b/se-common/se-common-datasource/src/main/java/com/se/common/datasource/annotation/Slave.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.datasource.annotation;
+package com.se.common.datasource.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -10,7 +10,7 @@
/**
* 浠庡簱鏁版嵁婧�
*
- * @author ruoyi
+ * @author admin
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/se-common/se-common-log/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-log/pom.xml
copy to se-common/se-common-log/pom.xml
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java b/se-common/se-common-log/src/main/java/com/se/common/log/filter/PropertyPreExcludeFilter.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
copy to se-common/se-common-log/src/main/java/com/se/common/log/filter/PropertyPreExcludeFilter.java
index 0327a24..f5833b2 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java
+++ b/se-common/se-common-log/src/main/java/com/se/common/log/filter/PropertyPreExcludeFilter.java
@@ -1,11 +1,11 @@
-package com.ruoyi.common.log.filter;
+package com.se.common.log.filter;
import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
/**
* 鎺掗櫎JSON鏁忔劅灞炴��
*
- * @author ruoyi
+ * @author admin
*/
public class PropertyPreExcludeFilter extends SimplePropertyPreFilter
{
diff --git a/se-common/se-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/se-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..00ef9d4
--- /dev/null
+++ b/se-common/se-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.se.common.log.service.AsyncLogService
+com.se.common.log.aspect.LogAspect
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/se-common/se-common-redis/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-redis/pom.xml
copy to se-common/se-common-redis/pom.xml
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/se-common/se-common-redis/src/main/java/com/se/common/redis/configure/FastJson2JsonRedisSerializer.java
similarity index 92%
copy from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
copy to se-common/se-common-redis/src/main/java/com/se/common/redis/configure/FastJson2JsonRedisSerializer.java
index d897763..789c532 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java
+++ b/se-common/se-common-redis/src/main/java/com/se/common/redis/configure/FastJson2JsonRedisSerializer.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.configure;
+package com.se.common.redis.configure;
import java.nio.charset.Charset;
import org.springframework.data.redis.serializer.RedisSerializer;
@@ -7,12 +7,12 @@
import com.alibaba.fastjson2.JSONReader;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson2.filter.Filter;
-import com.ruoyi.common.core.constant.Constants;
+import com.se.common.core.constant.Constants;
/**
* Redis浣跨敤FastJson搴忓垪鍖�
*
- * @author ruoyi
+ * @author admin
*/
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
{
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/se-common/se-common-redis/src/main/java/com/se/common/redis/configure/RedisConfig.java
similarity index 96%
copy from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
copy to se-common/se-common-redis/src/main/java/com/se/common/redis/configure/RedisConfig.java
index 6e1ec8a..e6a989b 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/se-common/se-common-redis/src/main/java/com/se/common/redis/configure/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.configure;
+package com.se.common.redis.configure;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
@@ -13,7 +13,7 @@
/**
* redis閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
@Configuration
@EnableCaching
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/se-common/se-common-redis/src/main/java/com/se/common/redis/service/RedisService.java
similarity index 98%
copy from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
copy to se-common/se-common-redis/src/main/java/com/se/common/redis/service/RedisService.java
index 435cb6e..a83f2ce 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java
+++ b/se-common/se-common-redis/src/main/java/com/se/common/redis/service/RedisService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.service;
+package com.se.common.redis.service;
import java.util.Collection;
import java.util.Iterator;
@@ -16,7 +16,7 @@
/**
* spring redis 宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/se-common/se-common-security/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-security/pom.xml
copy to se-common/se-common-security/pom.xml
diff --git a/se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableCustomConfig.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableCustomConfig.java
new file mode 100644
index 0000000..356f60d
--- /dev/null
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableCustomConfig.java
@@ -0,0 +1,32 @@
+package com.se.common.security.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.se.common.security.config.ApplicationConfig;
+import com.se.common.security.feign.FeignAutoConfiguration;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.Import;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+// 琛ㄧず閫氳繃aop妗嗘灦鏆撮湶璇ヤ唬鐞嗗璞�,AopContext鑳藉璁块棶
+@EnableAspectJAutoProxy(exposeProxy = true)
+// 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞
+@MapperScan("com.ruoyi.**.mapper")
+// 寮�鍚嚎绋嬪紓姝ユ墽琛�
+@EnableAsync
+// 鑷姩鍔犺浇绫�
+@Import({ ApplicationConfig.class, FeignAutoConfiguration.class })
+public @interface EnableCustomConfig
+{
+
+}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableRyFeignClients.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableRyFeignClients.java
index 4eb416e..d44463e 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/EnableRyFeignClients.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.se.common.security.annotation;
import org.springframework.cloud.openfeign.EnableFeignClients;
import java.lang.annotation.*;
@@ -7,7 +7,7 @@
* 鑷畾涔塮eign娉ㄨВ
* 娣诲姞basePackages璺緞
*
- * @author ruoyi
+ * @author admin
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/Logical.java
similarity index 75%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/annotation/Logical.java
index 4b787a0..b02b1fd 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/Logical.java
@@ -1,9 +1,9 @@
-package com.ruoyi.common.security.annotation;
+package com.se.common.security.annotation;
/**
* 鏉冮檺娉ㄨВ鐨勯獙璇佹ā寮�
*
- * @author ruoyi
+ * @author admin
*
*/
public enum Logical
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresLogin.java
similarity index 84%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresLogin.java
index f196ff5..938c94a 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresLogin.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.se.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@
/**
* 鐧诲綍璁よ瘉锛氬彧鏈夌櫥褰曚箣鍚庢墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresPermissions.java
similarity index 89%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresPermissions.java
index aef624d..9250b70 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresPermissions.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.se.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@
/**
* 鏉冮檺璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氭潈闄愭墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresRoles.java
similarity index 89%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresRoles.java
index 042e4c2..a547010 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/annotation/RequiresRoles.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.se.common.security.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@
/**
* 瑙掕壊璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氳鑹叉爣璇嗘墠鑳借繘鍏ヨ鏂规硶
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/se-common/se-common-security/src/main/java/com/se/common/security/aspect/PreAuthorizeAspect.java b/se-common/se-common-security/src/main/java/com/se/common/security/aspect/PreAuthorizeAspect.java
new file mode 100644
index 0000000..680c337
--- /dev/null
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/aspect/PreAuthorizeAspect.java
@@ -0,0 +1,97 @@
+package com.se.common.security.aspect;
+
+import java.lang.reflect.Method;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import com.se.common.security.annotation.RequiresLogin;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.annotation.RequiresRoles;
+import com.se.common.security.auth.AuthUtil;
+
+/**
+ * 鍩轰簬 Spring Aop 鐨勬敞瑙ｉ壌鏉�
+ *
+ * @author kong
+ */
+@Aspect
+@Component
+public class PreAuthorizeAspect
+{
+ /**
+ * 鏋勫缓
+ */
+ public PreAuthorizeAspect()
+ {
+ }
+
+ /**
+ * 瀹氫箟AOP绛惧悕 (鍒囧叆鎵�鏈変娇鐢ㄩ壌鏉冩敞瑙ｇ殑鏂规硶)
+ */
+ public static final String POINTCUT_SIGN = " @annotation(RequiresLogin) || "
+ + "@annotation(RequiresPermissions) || "
+ + "@annotation(RequiresRoles)";
+
+ /**
+ * 澹版槑AOP绛惧悕
+ */
+ @Pointcut(POINTCUT_SIGN)
+ public void pointcut()
+ {
+ }
+
+ /**
+ * 鐜粫鍒囧叆
+ *
+ * @param joinPoint 鍒囬潰瀵硅薄
+ * @return 搴曞眰鏂规硶鎵ц鍚庣殑杩斿洖鍊�
+ * @throws Throwable 搴曞眰鏂规硶鎶涘嚭鐨勫紓甯�
+ */
+ @Around("pointcut()")
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable
+ {
+ // 娉ㄨВ閴存潈
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ checkMethodAnnotation(signature.getMethod());
+ try
+ {
+ // 鎵ц鍘熸湁閫昏緫
+ Object obj = joinPoint.proceed();
+ return obj;
+ }
+ catch (Throwable e)
+ {
+ throw e;
+ }
+ }
+
+ /**
+ * 瀵逛竴涓狹ethod瀵硅薄杩涜娉ㄨВ妫�鏌�
+ */
+ public void checkMethodAnnotation(Method method)
+ {
+ // 鏍￠獙 @RequiresLogin 娉ㄨВ
+ RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);
+ if (requiresLogin != null)
+ {
+ AuthUtil.checkLogin();
+ }
+
+ // 鏍￠獙 @RequiresRoles 娉ㄨВ
+ RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
+ if (requiresRoles != null)
+ {
+ AuthUtil.checkRole(requiresRoles);
+ }
+
+ // 鏍￠獙 @RequiresPermissions 娉ㄨВ
+ RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
+ if (requiresPermissions != null)
+ {
+ AuthUtil.checkPermi(requiresPermissions);
+ }
+ }
+}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthLogic.java
similarity index 91%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthLogic.java
index f50d70b..8126f39 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthLogic.java
@@ -1,27 +1,28 @@
-package com.ruoyi.common.security.auth;
+package com.se.common.security.auth;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+
+import com.se.common.security.annotation.Logical;
+import com.se.common.security.annotation.RequiresLogin;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.annotation.RequiresRoles;
+import com.se.common.security.utils.SecurityUtils;
import org.springframework.util.PatternMatchUtils;
-import com.ruoyi.common.core.context.SecurityContextHolder;
-import com.ruoyi.common.core.exception.auth.NotLoginException;
-import com.ruoyi.common.core.exception.auth.NotPermissionException;
-import com.ruoyi.common.core.exception.auth.NotRoleException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.annotation.Logical;
-import com.ruoyi.common.security.annotation.RequiresLogin;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.context.SecurityContextHolder;
+import com.se.common.core.exception.auth.NotLoginException;
+import com.se.common.core.exception.auth.NotPermissionException;
+import com.se.common.core.exception.auth.NotRoleException;
+import com.se.common.core.utils.SpringUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.service.TokenService;
+import com.se.system.api.model.LoginUser;
/**
* Token 鏉冮檺楠岃瘉锛岄�昏緫瀹炵幇绫�
*
- * @author ruoyi
+ * @author admin
*/
public class AuthLogic
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthUtil.java
similarity index 94%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthUtil.java
index 8b0d86c..bedbd0e 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/auth/AuthUtil.java
@@ -1,13 +1,13 @@
-package com.ruoyi.common.security.auth;
+package com.se.common.security.auth;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.security.annotation.RequiresPermissions;
+import com.se.common.security.annotation.RequiresRoles;
+import com.se.system.api.model.LoginUser;
/**
* Token 鏉冮檺楠岃瘉宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class AuthUtil
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/se-common/se-common-security/src/main/java/com/se/common/security/config/ApplicationConfig.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/config/ApplicationConfig.java
index 5ae8d14..58aa154 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/config/ApplicationConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.config;
+package com.se.common.security.config;
import java.util.TimeZone;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -7,7 +7,7 @@
/**
* 绯荤粺閰嶇疆
*
- * @author ruoyi
+ * @author admin
*/
public class ApplicationConfig
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/se-common/se-common-security/src/main/java/com/se/common/security/config/WebMvcConfig.java
similarity index 86%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/config/WebMvcConfig.java
index 46adfd9..2618663 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/config/WebMvcConfig.java
@@ -1,13 +1,13 @@
-package com.ruoyi.common.security.config;
+package com.se.common.security.config;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.security.interceptor.HeaderInterceptor;
+import com.se.common.security.interceptor.HeaderInterceptor;
/**
* 鎷︽埅鍣ㄩ厤缃�
*
- * @author ruoyi
+ * @author admin
*/
public class WebMvcConfig implements WebMvcConfigurer
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignAutoConfiguration.java
similarity index 85%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignAutoConfiguration.java
index 304798d..93fbfb6 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignAutoConfiguration.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.feign;
+package com.se.common.security.feign;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -7,7 +7,7 @@
/**
* Feign 閰嶇疆娉ㄥ唽
*
- * @author ruoyi
+ * @author admin
**/
@Configuration
public class FeignAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignRequestInterceptor.java
similarity index 86%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignRequestInterceptor.java
index 33e12c6..5e139a7 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/feign/FeignRequestInterceptor.java
@@ -1,19 +1,19 @@
-package com.ruoyi.common.security.feign;
+package com.se.common.security.feign;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.ip.IpUtils;
import feign.RequestInterceptor;
import feign.RequestTemplate;
/**
* feign 璇锋眰鎷︽埅鍣�
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class FeignRequestInterceptor implements RequestInterceptor
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/se-common/se-common-security/src/main/java/com/se/common/security/interceptor/HeaderInterceptor.java
similarity index 79%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/interceptor/HeaderInterceptor.java
index 18c8d2b..394bd91 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/interceptor/HeaderInterceptor.java
@@ -1,22 +1,22 @@
-package com.ruoyi.common.security.interceptor;
+package com.se.common.security.interceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.context.SecurityContextHolder;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.context.SecurityContextHolder;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.security.auth.AuthUtil;
+import com.se.common.security.utils.SecurityUtils;
+import com.se.system.api.model.LoginUser;
/**
* 鑷畾涔夎姹傚ご鎷︽埅鍣紝灏咹eader鏁版嵁灏佽鍒扮嚎绋嬪彉閲忎腑鏂逛究鑾峰彇
* 娉ㄦ剰锛氭鎷︽埅鍣ㄤ細鍚屾椂楠岃瘉褰撳墠鐢ㄦ埛鏈夋晥鏈熻嚜鍔ㄥ埛鏂版湁鏁堟湡
*
- * @author ruoyi
+ * @author admin
*/
public class HeaderInterceptor implements AsyncHandlerInterceptor
{
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/se-common/se-common-security/src/main/java/com/se/common/security/service/TokenService.java
similarity index 88%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/service/TokenService.java
index 2971792..3305c78 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/service/TokenService.java
@@ -1,28 +1,29 @@
-package com.ruoyi.common.security.service;
+package com.se.common.security.service;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+
+import com.se.common.security.utils.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.constant.CacheConstants;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.utils.JwtUtils;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.common.core.utils.ip.IpUtils;
+import com.se.common.core.utils.uuid.IdUtils;
+import com.se.common.redis.service.RedisService;
+import com.se.system.api.model.LoginUser;
/**
* token楠岃瘉澶勭悊
*
- * @author ruoyi
+ * @author admin
*/
@Component
public class TokenService
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/se-common/se-common-security/src/main/java/com/se/common/security/utils/SecurityUtils.java
similarity index 86%
copy from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
copy to se-common/se-common-security/src/main/java/com/se/common/security/utils/SecurityUtils.java
index 78a5393..c5d1a12 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/se-common/se-common-security/src/main/java/com/se/common/security/utils/SecurityUtils.java
@@ -1,18 +1,18 @@
-package com.ruoyi.common.security.utils;
+package com.se.common.security.utils;
import javax.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.context.SecurityContextHolder;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.se.common.core.constant.SecurityConstants;
+import com.se.common.core.constant.TokenConstants;
+import com.se.common.core.context.SecurityContextHolder;
+import com.se.common.core.utils.ServletUtils;
+import com.se.common.core.utils.StringUtils;
+import com.se.system.api.model.LoginUser;
/**
* 鏉冮檺鑾峰彇宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class SecurityUtils
{
diff --git a/se-common/se-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/se-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..44404fe
--- /dev/null
+++ b/se-common/se-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+com.se.common.security.config.WebMvcConfig
+com.se.common.security.service.TokenService
+com.se.common.security.aspect.PreAuthorizeAspect
+com.se.common.security.aspect.InnerAuthAspect
+com.se.common.security.handler.GlobalExceptionHandler
diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/se-common/se-common-sensitive/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-sensitive/pom.xml
copy to se-common/se-common-sensitive/pom.xml
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java b/se-common/se-common-sensitive/src/main/java/com/se/common/sensitive/annotation/Sensitive.java
similarity index 74%
copy from ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
copy to se-common/se-common-sensitive/src/main/java/com/se/common/sensitive/annotation/Sensitive.java
index 30b24b3..e6bb442 100644
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java
+++ b/se-common/se-common-sensitive/src/main/java/com/se/common/sensitive/annotation/Sensitive.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.sensitive.annotation;
+package com.se.common.sensitive.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -6,13 +6,13 @@
import java.lang.annotation.Target;
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.ruoyi.common.sensitive.config.SensitiveJsonSerializer;
-import com.ruoyi.common.sensitive.enums.DesensitizedType;
+import com.se.common.sensitive.config.SensitiveJsonSerializer;
+import com.se.common.sensitive.enums.DesensitizedType;
/**
* 鏁版嵁鑴辨晱娉ㄨВ
*
- * @author ruoyi
+ * @author admin
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/se-common/se-common-swagger/pom.xml
similarity index 100%
copy from ruoyi-common/ruoyi-common-swagger/pom.xml
copy to se-common/se-common-swagger/pom.xml
diff --git a/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerAutoConfiguration.java b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerAutoConfiguration.java
new file mode 100644
index 0000000..cb7eb27
--- /dev/null
+++ b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerAutoConfiguration.java
@@ -0,0 +1,123 @@
+package com.se.common.swagger.config;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.ApiSelectorBuilder;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+@EnableConfigurationProperties(SwaggerProperties.class)
+@ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true)
+@Import({SwaggerBeanPostProcessor.class, SwaggerWebConfiguration.class})
+public class SwaggerAutoConfiguration
+{
+ /**
+ * 榛樿鐨勬帓闄よ矾寰勶紝鎺掗櫎Spring Boot榛樿鐨勯敊璇鐞嗚矾寰勫拰绔偣
+ */
+ private static final List<String> DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**");
+
+ private static final String BASE_PATH = "/**";
+
+ @Bean
+ public Docket api(SwaggerProperties swaggerProperties)
+ {
+ // base-path澶勭悊
+ if (swaggerProperties.getBasePath().isEmpty())
+ {
+ swaggerProperties.getBasePath().add(BASE_PATH);
+ }
+ // noinspection unchecked
+ List<Predicate<String>> basePath = new ArrayList<Predicate<String>>();
+ swaggerProperties.getBasePath().forEach(path -> basePath.add(PathSelectors.ant(path)));
+
+ // exclude-path澶勭悊
+ if (swaggerProperties.getExcludePath().isEmpty())
+ {
+ swaggerProperties.getExcludePath().addAll(DEFAULT_EXCLUDE_PATH);
+ }
+
+ List<Predicate<String>> excludePath = new ArrayList<>();
+ swaggerProperties.getExcludePath().forEach(path -> excludePath.add(PathSelectors.ant(path)));
+
+ ApiSelectorBuilder builder = new Docket(DocumentationType.SWAGGER_2).host(swaggerProperties.getHost())
+ .apiInfo(apiInfo(swaggerProperties)).select()
+ .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage()));
+
+ swaggerProperties.getBasePath().forEach(p -> builder.paths(PathSelectors.ant(p)));
+ swaggerProperties.getExcludePath().forEach(p -> builder.paths(PathSelectors.ant(p).negate()));
+
+ return builder.build().securitySchemes(securitySchemes()).securityContexts(securityContexts()).pathMapping("/");
+ }
+
+ /**
+ * 瀹夊叏妯″紡锛岃繖閲屾寚瀹歵oken閫氳繃Authorization澶磋姹傚ご浼犻��
+ */
+ private List<SecurityScheme> securitySchemes()
+ {
+ List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+ apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
+ return apiKeyList;
+ }
+
+ /**
+ * 瀹夊叏涓婁笅鏂�
+ */
+ private List<SecurityContext> securityContexts()
+ {
+ List<SecurityContext> securityContexts = new ArrayList<>();
+ securityContexts.add(
+ SecurityContext.builder()
+ .securityReferences(defaultAuth())
+ .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+ .build());
+ return securityContexts;
+ }
+
+ /**
+ * 榛樿鐨勫叏灞�閴存潈绛栫暐
+ *
+ * @return
+ */
+ private List<SecurityReference> defaultAuth()
+ {
+ AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+ AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+ authorizationScopes[0] = authorizationScope;
+ List<SecurityReference> securityReferences = new ArrayList<>();
+ securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+ return securityReferences;
+ }
+
+ private ApiInfo apiInfo(SwaggerProperties swaggerProperties)
+ {
+ return new ApiInfoBuilder()
+ .title(swaggerProperties.getTitle())
+ .description(swaggerProperties.getDescription())
+ .license(swaggerProperties.getLicense())
+ .licenseUrl(swaggerProperties.getLicenseUrl())
+ .termsOfServiceUrl(swaggerProperties.getTermsOfServiceUrl())
+ .contact(new Contact(swaggerProperties.getContact().getName(), swaggerProperties.getContact().getUrl(), swaggerProperties.getContact().getEmail()))
+ .version(swaggerProperties.getVersion())
+ .build();
+ }
+}
diff --git a/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerProperties.java b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerProperties.java
new file mode 100644
index 0000000..8137767
--- /dev/null
+++ b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerProperties.java
@@ -0,0 +1,343 @@
+package com.se.common.swagger.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("swagger")
+public class SwaggerProperties
+{
+ /**
+ * 鏄惁寮�鍚痵wagger
+ */
+ private Boolean enabled;
+
+ /**
+ * swagger浼氳В鏋愮殑鍖呰矾寰�
+ **/
+ private String basePackage = "";
+
+ /**
+ * swagger浼氳В鏋愮殑url瑙勫垯
+ **/
+ private List<String> basePath = new ArrayList<>();
+
+ /**
+ * 鍦╞asePath鍩虹涓婇渶瑕佹帓闄ょ殑url瑙勫垯
+ **/
+ private List<String> excludePath = new ArrayList<>();
+
+ /**
+ * 鏍囬
+ **/
+ private String title = "";
+
+ /**
+ * 鎻忚堪
+ **/
+ private String description = "";
+
+ /**
+ * 鐗堟湰
+ **/
+ private String version = "";
+
+ /**
+ * 璁稿彲璇�
+ **/
+ private String license = "";
+
+ /**
+ * 璁稿彲璇乁RL
+ **/
+ private String licenseUrl = "";
+
+ /**
+ * 鏈嶅姟鏉℃URL
+ **/
+ private String termsOfServiceUrl = "";
+
+ /**
+ * host淇℃伅
+ **/
+ private String host = "";
+
+ /**
+ * 鑱旂郴浜轰俊鎭�
+ */
+ private Contact contact = new Contact();
+
+ /**
+ * 鍏ㄥ眬缁熶竴閴存潈閰嶇疆
+ **/
+ private Authorization authorization = new Authorization();
+
+ public Boolean getEnabled()
+ {
+ return enabled;
+ }
+
+ public void setEnabled(Boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+ public String getBasePackage()
+ {
+ return basePackage;
+ }
+
+ public void setBasePackage(String basePackage)
+ {
+ this.basePackage = basePackage;
+ }
+
+ public List<String> getBasePath()
+ {
+ return basePath;
+ }
+
+ public void setBasePath(List<String> basePath)
+ {
+ this.basePath = basePath;
+ }
+
+ public List<String> getExcludePath()
+ {
+ return excludePath;
+ }
+
+ public void setExcludePath(List<String> excludePath)
+ {
+ this.excludePath = excludePath;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
+ public String getLicense()
+ {
+ return license;
+ }
+
+ public void setLicense(String license)
+ {
+ this.license = license;
+ }
+
+ public String getLicenseUrl()
+ {
+ return licenseUrl;
+ }
+
+ public void setLicenseUrl(String licenseUrl)
+ {
+ this.licenseUrl = licenseUrl;
+ }
+
+ public String getTermsOfServiceUrl()
+ {
+ return termsOfServiceUrl;
+ }
+
+ public void setTermsOfServiceUrl(String termsOfServiceUrl)
+ {
+ this.termsOfServiceUrl = termsOfServiceUrl;
+ }
+
+ public String getHost()
+ {
+ return host;
+ }
+
+ public void setHost(String host)
+ {
+ this.host = host;
+ }
+
+ public Contact getContact()
+ {
+ return contact;
+ }
+
+ public void setContact(Contact contact)
+ {
+ this.contact = contact;
+ }
+
+ public Authorization getAuthorization()
+ {
+ return authorization;
+ }
+
+ public void setAuthorization(Authorization authorization)
+ {
+ this.authorization = authorization;
+ }
+
+ public static class Contact
+ {
+ /**
+ * 鑱旂郴浜�
+ **/
+ private String name = "";
+ /**
+ * 鑱旂郴浜簎rl
+ **/
+ private String url = "";
+ /**
+ * 鑱旂郴浜篹mail
+ **/
+ private String email = "";
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getUrl()
+ {
+ return url;
+ }
+
+ public void setUrl(String url)
+ {
+ this.url = url;
+ }
+
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+ }
+
+ public static class Authorization
+ {
+ /**
+ * 閴存潈绛栫暐ID锛岄渶瑕佸拰SecurityReferences ID淇濇寔涓�鑷�
+ */
+ private String name = "";
+
+ /**
+ * 闇�瑕佸紑鍚壌鏉僓RL鐨勬鍒�
+ */
+ private String authRegex = "^.*$";
+
+ /**
+ * 閴存潈浣滅敤鍩熷垪琛�
+ */
+ private List<AuthorizationScope> authorizationScopeList = new ArrayList<>();
+
+ private List<String> tokenUrlList = new ArrayList<>();
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getAuthRegex()
+ {
+ return authRegex;
+ }
+
+ public void setAuthRegex(String authRegex)
+ {
+ this.authRegex = authRegex;
+ }
+
+ public List<AuthorizationScope> getAuthorizationScopeList()
+ {
+ return authorizationScopeList;
+ }
+
+ public void setAuthorizationScopeList(List<AuthorizationScope> authorizationScopeList)
+ {
+ this.authorizationScopeList = authorizationScopeList;
+ }
+
+ public List<String> getTokenUrlList()
+ {
+ return tokenUrlList;
+ }
+
+ public void setTokenUrlList(List<String> tokenUrlList)
+ {
+ this.tokenUrlList = tokenUrlList;
+ }
+ }
+
+ public static class AuthorizationScope
+ {
+ /**
+ * 浣滅敤鍩熷悕绉�
+ */
+ private String scope = "";
+
+ /**
+ * 浣滅敤鍩熸弿杩�
+ */
+ private String description = "";
+
+ public String getScope()
+ {
+ return scope;
+ }
+
+ public void setScope(String scope)
+ {
+ this.scope = scope;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerWebConfiguration.java
similarity index 90%
copy from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
copy to se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerWebConfiguration.java
index 28556b5..197b325 100644
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
+++ b/se-common/se-common-swagger/src/main/java/com/se/common/swagger/config/SwaggerWebConfiguration.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.swagger.config;
+package com.se.common.swagger.config;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -6,7 +6,7 @@
/**
* swagger 璧勬簮鏄犲皠璺緞
*
- * @author ruoyi
+ * @author admin
*/
public class SwaggerWebConfiguration implements WebMvcConfigurer
{
diff --git a/se-common/se-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/se-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..fcb10a3
--- /dev/null
+++ b/se-common/se-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+# com.se.common.swagger.config.SwaggerAutoConfiguration
+# com.se.common.swagger.config.SwaggerWebConfiguration
+# com.se.common.swagger.config.SwaggerBeanPostProcessor
--
Gitblit v1.9.3