From 47baa061257d860fd8311ff8cb883dc37f60b6d6 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Thu, 28 Dec 2023 13:39:42 +0800 Subject: [PATCH] Change namespace to top.fatweb.oxygen.api --- build-docker.sh | 16 +++--- pom.xml | 4 +- .../api/OxygenApiApplication.kt} | 8 +-- .../api/annotation/ApiController.kt | 2 +- .../api/annotation/BaseController.kt | 2 +- .../api/annotation/EventLogRecord.kt | 4 +- .../api/annotation/HiddenController.kt | 2 +- .../{ => oxygen}/api/aop/EventLogAspect.kt | 14 +++--- .../api/config/DataFormatConfig.kt | 2 +- .../{ => oxygen}/api/config/FilterConfig.kt | 4 +- .../{ => oxygen}/api/config/FlywayConfig.kt | 4 +- .../{ => oxygen}/api/config/InitConfig.kt | 15 +++--- .../api/config/MybatisPlusConfig.kt | 2 +- .../{ => oxygen}/api/config/RedisConfig.kt | 2 +- .../{ => oxygen}/api/config/SecurityConfig.kt | 8 +-- .../{ => oxygen}/api/config/SwaggerConfig.kt | 8 +-- .../{ => oxygen}/api/config/SysLogConfig.kt | 4 +- .../api/config/VelocityEngineConfig.kt | 2 +- .../api/config/WebMvcConfigurerConfig.kt | 6 +-- .../api/config/WebMvcRegistrationsConfig.kt | 4 +- .../api/controller/ExceptionController.kt | 4 +- .../api/controller/api/v1/AvatarController.kt | 16 +++--- .../permission/AuthenticationController.kt | 25 +++++----- .../controller/permission/GroupController.kt | 18 +++---- .../controller/permission/PowerController.kt | 10 ++-- .../controller/permission/RoleController.kt | 18 +++---- .../controller/permission/UserController.kt | 22 ++++----- .../controller/system/SettingsController.kt | 18 +++---- .../controller/system/StatisticsController.kt | 14 +++--- .../api/controller/system/SysLogController.kt | 16 +++--- .../api/converter/permission/FuncConverter.kt | 6 +-- .../converter/permission/GroupConverter.kt | 18 +++---- .../api/converter/permission/MenuConverter.kt | 6 +-- .../converter/permission/ModuleConverter.kt | 6 +-- .../permission/OperationConverter.kt | 6 +-- .../converter/permission/PowerConverter.kt | 6 +-- .../api/converter/permission/RoleConverter.kt | 18 +++---- .../api/converter/permission/UserConverter.kt | 24 ++++----- .../converter/permission/UserInfoConverter.kt | 6 +-- .../api/converter/system/SysLogConverter.kt | 8 +-- .../{ => oxygen}/api/cron/StatisticsCron.kt | 12 ++--- .../api/entity/common/BusinessCode.kt | 2 +- .../api/entity/common/ResponseCode.kt | 2 +- .../api/entity/common/ResponseResult.kt | 2 +- .../api/entity/permission/Func.kt | 2 +- .../api/entity/permission/Group.kt | 4 +- .../api/entity/permission/LoginUser.kt | 6 ++- .../api/entity/permission/Menu.kt | 2 +- .../api/entity/permission/Module.kt | 2 +- .../api/entity/permission/Operation.kt | 2 +- .../api/entity/permission/Power.kt | 2 +- .../api/entity/permission/PowerRole.kt | 2 +- .../api/entity/permission/PowerSet.kt | 6 ++- .../api/entity/permission/PowerType.kt | 2 +- .../api/entity/permission/Role.kt | 4 +- .../api/entity/permission/RoleGroup.kt | 2 +- .../api/entity/permission/User.kt | 2 +- .../api/entity/permission/UserGroup.kt | 2 +- .../api/entity/permission/UserInfo.kt | 2 +- .../api/entity/permission/UserRole.kt | 2 +- .../api/entity/system/EventLog.kt | 2 +- .../api/entity/system/StatisticsLog.kt | 4 +- .../{ => oxygen}/api/entity/system/SysLog.kt | 2 +- .../api/exception/AccountNeedInitException.kt | 2 +- .../AccountNeedResetPasswordException.kt | 2 +- .../api/exception/NoEmailConfigException.kt | 2 +- .../api/exception/NoRecordFoundException.kt | 2 +- .../NoVerificationRequiredException.kt | 2 +- .../RetrieveCodeErrorOrExpiredException.kt | 2 +- .../api/exception/TokenHasExpiredException.kt | 2 +- .../api/exception/UserNotFoundException.kt | 2 +- ...VerificationCodeErrorOrExpiredException.kt | 2 +- .../api/filter/ExceptionFilter.kt | 2 +- .../filter/JwtAuthenticationTokenFilter.kt | 14 +++--- .../api/handler/DataMetaObjectHandler.kt | 2 +- .../api/handler/ExceptionHandler.kt | 8 +-- .../api/handler/JwtAccessDeniedHandler.kt | 2 +- .../JwtAuthenticationEntryPointHandler.kt | 2 +- .../api/interceptor/SysLogInterceptor.kt | 14 +++--- .../api/mapper/permission/FuncMapper.kt | 4 +- .../api/mapper/permission/GroupMapper.kt | 4 +- .../api/mapper/permission/MenuMapper.kt | 4 +- .../api/mapper/permission/ModuleMapper.kt | 4 +- .../api/mapper/permission/OperationMapper.kt | 4 +- .../api/mapper/permission/PowerMapper.kt | 4 +- .../api/mapper/permission/PowerRoleMapper.kt | 4 +- .../api/mapper/permission/RoleGroupMapper.kt | 4 +- .../api/mapper/permission/RoleMapper.kt | 4 +- .../api/mapper/permission/UserGroupMapper.kt | 4 +- .../api/mapper/permission/UserInfoMapper.kt | 4 +- .../api/mapper/permission/UserMapper.kt | 4 +- .../api/mapper/permission/UserRoleMapper.kt | 4 +- .../api/mapper/system/EventLogMapper.kt | 4 +- .../api/mapper/system/StatisticsLogMapper.kt | 4 +- .../api/mapper/system/SysLogMapper.kt | 4 +- .../{ => oxygen}/api/param/PageSortParam.kt | 2 +- .../param/api/v1/avatar/AvatarBaseParam.kt | 2 +- .../param/api/v1/avatar/AvatarGitHubParam.kt | 2 +- .../api/param/permission/ForgetParam.kt | 2 +- .../api/param/permission/LoginParam.kt | 2 +- .../api/param/permission/RegisterParam.kt | 2 +- .../api/param/permission/RetrieveParam.kt | 2 +- .../api/param/permission/VerifyParam.kt | 2 +- .../param/permission/group/GroupAddParam.kt | 2 +- .../permission/group/GroupDeleteParam.kt | 2 +- .../param/permission/group/GroupGetParam.kt | 4 +- .../permission/group/GroupUpdateParam.kt | 2 +- .../group/GroupUpdateStatusParam.kt | 2 +- .../api/param/permission/role/RoleAddParam.kt | 2 +- .../param/permission/role/RoleDeleteParam.kt | 2 +- .../api/param/permission/role/RoleGetParam.kt | 4 +- .../param/permission/role/RoleUpdateParam.kt | 2 +- .../permission/role/RoleUpdateStatusParam.kt | 2 +- .../api/param/permission/user/UserAddParam.kt | 2 +- .../param/permission/user/UserDeleteParam.kt | 2 +- .../api/param/permission/user/UserGetParam.kt | 4 +- .../param/permission/user/UserUpdateParam.kt | 2 +- .../user/UserUpdatePasswordParam.kt | 2 +- .../api/param/system/ActiveInfoGetParam.kt | 2 +- .../api/param/system/BaseSettingsParam.kt | 2 +- .../api/param/system/MailSendParam.kt | 2 +- .../api/param/system/MailSettingsParam.kt | 4 +- .../api/param/system/OnlineInfoGetParam.kt | 2 +- .../api/param/system/SysLogGetParam.kt | 4 +- .../api/properties/AdminProperties.kt | 4 +- .../api/properties/FlywayProperties.kt | 2 +- .../api/properties/SecurityProperties.kt | 6 +-- .../api/properties/ServerProperties.kt | 4 +- .../api/service/api/v1/IAvatarService.kt | 8 +-- .../service/api/v1/impl/AvatarServiceImpl.kt | 12 ++--- .../permission/IAuthenticationService.kt | 12 ++--- .../api/service/permission/IFuncService.kt | 4 +- .../api/service/permission/IGroupService.kt | 12 ++--- .../api/service/permission/IMenuService.kt | 4 +- .../api/service/permission/IModuleService.kt | 4 +- .../service/permission/IOperationService.kt | 4 +- .../service/permission/IPowerRoleService.kt | 4 +- .../api/service/permission/IPowerService.kt | 6 +-- .../service/permission/IRoleGroupService.kt | 4 +- .../api/service/permission/IRoleService.kt | 12 ++--- .../service/permission/IUserGroupService.kt | 4 +- .../service/permission/IUserInfoService.kt | 4 +- .../service/permission/IUserRoleService.kt | 4 +- .../api/service/permission/IUserService.kt | 16 +++--- .../impl/AuthenticationServiceImpl.kt | 49 ++++++++++--------- .../permission/impl/FuncServiceImpl.kt | 8 +-- .../permission/impl/GroupServiceImpl.kt | 30 ++++++------ .../permission/impl/MenuServiceImpl.kt | 8 +-- .../permission/impl/ModuleServiceImpl.kt | 8 +-- .../permission/impl/OperationServiceImpl.kt | 8 +-- .../permission/impl/PowerRoleServiceImpl.kt | 8 +-- .../permission/impl/PowerServiceImpl.kt | 12 ++--- .../permission/impl/RoleGroupServiceImpl.kt | 8 +-- .../permission/impl/RoleServiceImpl.kt | 26 +++++----- .../permission/impl/UserDetailsServiceImpl.kt | 6 +-- .../permission/impl/UserGroupServiceImpl.kt | 8 +-- .../permission/impl/UserInfoServiceImpl.kt | 8 +-- .../permission/impl/UserRoleServiceImpl.kt | 8 +-- .../permission/impl/UserServiceImpl.kt | 34 ++++++------- .../api/service/system/IEventLogService.kt | 6 +-- .../api/service/system/ISettingsService.kt | 12 ++--- .../service/system/IStatisticsLogService.kt | 4 +- .../api/service/system/IStatisticsService.kt | 10 ++-- .../api/service/system/ISysLogService.kt | 10 ++-- .../system/impl/EventLogServiceImpl.kt | 10 ++-- .../system/impl/SettingsServiceImpl.kt | 26 +++++----- .../system/impl/StatisticsLogServiceImpl.kt | 8 +-- .../system/impl/StatisticsServiceImpl.kt | 28 +++++------ .../service/system/impl/SysLogServiceImpl.kt | 33 +++++++------ .../{ => oxygen}/api/settings/BaseSettings.kt | 2 +- .../api/settings/MailSecurityType.kt | 2 +- .../{ => oxygen}/api/settings/MailSettings.kt | 2 +- .../api/settings/SettingsOperator.kt | 10 ++-- .../api/settings/SystemSettings.kt | 2 +- .../util/ApiResponseMappingHandlerMapping.kt | 4 +- .../api/util/ApiVersionCondition.kt | 2 +- .../fatweb/{ => oxygen}/api/util/ByteUtil.kt | 2 +- .../fatweb/{ => oxygen}/api/util/JwtUtil.kt | 4 +- .../fatweb/{ => oxygen}/api/util/MailUtil.kt | 10 ++-- .../{ => oxygen}/api/util/NumberUtil.kt | 2 +- .../fatweb/{ => oxygen}/api/util/PageUtil.kt | 6 +-- .../fatweb/{ => oxygen}/api/util/RedisUtil.kt | 2 +- .../fatweb/{ => oxygen}/api/util/StrUtil.kt | 2 +- .../fatweb/{ => oxygen}/api/util/WebUtil.kt | 6 +-- .../top/fatweb/{ => oxygen}/api/vo/PageVo.kt | 2 +- .../api/vo/api/v1/avatar/AvatarBase64Vo.kt | 2 +- .../api/vo/permission/GroupWithRoleVo.kt | 4 +- .../{ => oxygen}/api/vo/permission/LoginVo.kt | 2 +- .../api/vo/permission/PowerSetVo.kt | 10 ++-- .../api/vo/permission/RegisterVo.kt | 2 +- .../api/vo/permission/RoleWithPowerVo.kt | 10 ++-- .../{ => oxygen}/api/vo/permission/TokenVo.kt | 2 +- .../api/vo/permission/UserWithInfoVo.kt | 4 +- .../permission/UserWithPasswordRoleInfoVo.kt | 8 +-- .../api/vo/permission/UserWithPowerInfoVo.kt | 4 +- .../api/vo/permission/UserWithRoleInfoVo.kt | 8 +-- .../api/vo/permission/base/FuncVo.kt | 2 +- .../api/vo/permission/base/GroupVo.kt | 2 +- .../api/vo/permission/base/MenuVo.kt | 2 +- .../api/vo/permission/base/ModuleVo.kt | 2 +- .../api/vo/permission/base/OperationVo.kt | 2 +- .../api/vo/permission/base/RoleVo.kt | 2 +- .../api/vo/permission/base/UserInfoVo.kt | 4 +- .../api/vo/system/ActiveInfoVo.kt | 4 +- .../api/vo/system/BaseSettingsVo.kt | 2 +- .../{ => oxygen}/api/vo/system/CpuInfoVo.kt | 2 +- .../api/vo/system/FileStoreInfoVo.kt | 2 +- .../api/vo/system/HardwareInfoVo.kt | 2 +- .../api/vo/system/MailSettingsVo.kt | 4 +- .../api/vo/system/OnlineInfoVo.kt | 4 +- .../{ => oxygen}/api/vo/system/SettingsVo.kt | 2 +- .../api/vo/system/SoftwareInfoVo.kt | 2 +- .../api/vo/system/StorageInfoVo.kt | 2 +- .../{ => oxygen}/api/vo/system/SysLogVo.kt | 4 +- .../resources/application-config-template.yml | 4 +- src/main/resources/application.yml | 2 +- .../mapper/permission/FuncMapper.xml | 2 +- .../mapper/permission/GroupMapper.xml | 4 +- .../mapper/permission/MenuMapper.xml | 2 +- .../mapper/permission/ModuleMapper.xml | 2 +- .../mapper/permission/OperationMapper.xml | 2 +- .../mapper/permission/PowerMapper.xml | 2 +- .../mapper/permission/PowerRoleMapper.xml | 2 +- .../mapper/permission/RoleGroupMapper.xml | 2 +- .../mapper/permission/RoleMapper.xml | 10 ++-- .../mapper/permission/UserGroupMapper.xml | 2 +- .../mapper/permission/UserInfoMapper.xml | 2 +- .../mapper/permission/UserMapper.xml | 16 +++--- .../mapper/permission/UserRoleMapper.xml | 2 +- .../resources/mapper/system/SysLogMapper.xml | 2 +- .../api/OxygenApiApplicationTests.kt} | 12 ++--- 231 files changed, 698 insertions(+), 682 deletions(-) rename src/main/kotlin/top/fatweb/{api/FatWebApiApplication.kt => oxygen/api/OxygenApiApplication.kt} (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/annotation/ApiController.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/annotation/BaseController.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/annotation/EventLogRecord.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/annotation/HiddenController.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/aop/EventLogAspect.kt (78%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/DataFormatConfig.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/FilterConfig.kt (87%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/FlywayConfig.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/InitConfig.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/MybatisPlusConfig.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/RedisConfig.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/SecurityConfig.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/SwaggerConfig.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/SysLogConfig.kt (87%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/VelocityEngineConfig.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/WebMvcConfigurerConfig.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/config/WebMvcRegistrationsConfig.kt (84%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/ExceptionController.kt (81%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/api/v1/AvatarController.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/permission/AuthenticationController.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/permission/GroupController.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/permission/PowerController.kt (76%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/permission/RoleController.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/permission/UserController.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/system/SettingsController.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/system/StatisticsController.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/controller/system/SysLogController.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/FuncConverter.kt (76%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/GroupConverter.kt (86%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/MenuConverter.kt (77%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/ModuleConverter.kt (74%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/OperationConverter.kt (77%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/PowerConverter.kt (83%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/RoleConverter.kt (87%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/UserConverter.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/permission/UserInfoConverter.kt (81%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/converter/system/SysLogConverter.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/cron/StatisticsCron.kt (65%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/common/BusinessCode.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/common/ResponseCode.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/common/ResponseResult.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Func.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Group.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/LoginUser.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Menu.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Module.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Operation.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Power.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/PowerRole.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/PowerSet.kt (79%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/PowerType.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/Role.kt (90%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/RoleGroup.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/User.kt (99%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/UserGroup.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/UserInfo.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/permission/UserRole.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/system/EventLog.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/system/StatisticsLog.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/entity/system/SysLog.kt (99%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/AccountNeedInitException.kt (84%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/AccountNeedResetPasswordException.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/NoEmailConfigException.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/NoRecordFoundException.kt (82%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/NoVerificationRequiredException.kt (84%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/RetrieveCodeErrorOrExpiredException.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/TokenHasExpiredException.kt (83%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/UserNotFoundException.kt (82%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/exception/VerificationCodeErrorOrExpiredException.kt (86%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/filter/ExceptionFilter.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/filter/JwtAuthenticationTokenFilter.kt (84%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/handler/DataMetaObjectHandler.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/handler/ExceptionHandler.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/handler/JwtAccessDeniedHandler.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/handler/JwtAuthenticationEntryPointHandler.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/interceptor/SysLogInterceptor.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/FuncMapper.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/GroupMapper.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/MenuMapper.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/ModuleMapper.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/OperationMapper.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/PowerMapper.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/PowerRoleMapper.kt (74%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/RoleGroupMapper.kt (74%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/RoleMapper.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/UserGroupMapper.kt (74%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/UserInfoMapper.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/UserMapper.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/permission/UserRoleMapper.kt (74%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/system/EventLogMapper.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/system/StatisticsLogMapper.kt (72%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/mapper/system/SysLogMapper.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/PageSortParam.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/api/v1/avatar/AvatarBaseParam.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/api/v1/avatar/AvatarGitHubParam.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/ForgetParam.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/LoginParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/RegisterParam.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/RetrieveParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/VerifyParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/group/GroupAddParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/group/GroupDeleteParam.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/group/GroupGetParam.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/group/GroupUpdateParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/group/GroupUpdateStatusParam.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/role/RoleAddParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/role/RoleDeleteParam.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/role/RoleGetParam.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/role/RoleUpdateParam.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/role/RoleUpdateStatusParam.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/user/UserAddParam.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/user/UserDeleteParam.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/user/UserGetParam.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/user/UserUpdateParam.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/permission/user/UserUpdatePasswordParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/ActiveInfoGetParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/BaseSettingsParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/MailSendParam.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/MailSettingsParam.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/OnlineInfoGetParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/param/system/SysLogGetParam.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/properties/AdminProperties.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/properties/FlywayProperties.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/properties/SecurityProperties.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/properties/ServerProperties.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/api/v1/IAvatarService.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/api/v1/impl/AvatarServiceImpl.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IAuthenticationService.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IFuncService.kt (69%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IGroupService.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IMenuService.kt (69%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IModuleService.kt (69%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IOperationService.kt (70%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IPowerRoleService.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IPowerService.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IRoleGroupService.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IRoleService.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IUserGroupService.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IUserInfoService.kt (70%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IUserRoleService.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/IUserService.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/AuthenticationServiceImpl.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/FuncServiceImpl.kt (62%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/GroupServiceImpl.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/MenuServiceImpl.kt (61%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/ModuleServiceImpl.kt (62%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/OperationServiceImpl.kt (62%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/PowerRoleServiceImpl.kt (63%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/PowerServiceImpl.kt (73%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/RoleGroupServiceImpl.kt (63%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/RoleServiceImpl.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/UserDetailsServiceImpl.kt (79%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/UserGroupServiceImpl.kt (63%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/UserInfoServiceImpl.kt (62%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/UserRoleServiceImpl.kt (62%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/permission/impl/UserServiceImpl.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/IEventLogService.kt (64%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/ISettingsService.kt (80%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/IStatisticsLogService.kt (68%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/IStatisticsService.kt (87%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/ISysLogService.kt (71%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/impl/EventLogServiceImpl.kt (77%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/impl/SettingsServiceImpl.kt (80%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/impl/StatisticsLogServiceImpl.kt (55%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/impl/StatisticsServiceImpl.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/service/system/impl/SysLogServiceImpl.kt (67%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/settings/BaseSettings.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/settings/MailSecurityType.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/settings/MailSettings.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/settings/SettingsOperator.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/settings/SystemSettings.kt (92%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/ApiResponseMappingHandlerMapping.kt (90%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/ApiVersionCondition.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/ByteUtil.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/JwtUtil.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/MailUtil.kt (88%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/NumberUtil.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/PageUtil.kt (85%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/RedisUtil.kt (99%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/StrUtil.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/util/WebUtil.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/PageVo.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/api/v1/avatar/AvatarBase64Vo.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/GroupWithRoleVo.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/LoginVo.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/PowerSetVo.kt (80%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/RegisterVo.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/RoleWithPowerVo.kt (89%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/TokenVo.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/UserWithInfoVo.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/UserWithPasswordRoleInfoVo.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/UserWithPowerInfoVo.kt (97%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/UserWithRoleInfoVo.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/FuncVo.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/GroupVo.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/MenuVo.kt (95%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/ModuleVo.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/OperationVo.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/RoleVo.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/permission/base/UserInfoVo.kt (94%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/ActiveInfoVo.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/BaseSettingsVo.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/CpuInfoVo.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/FileStoreInfoVo.kt (96%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/HardwareInfoVo.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/MailSettingsVo.kt (93%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/OnlineInfoVo.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/SettingsVo.kt (91%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/SoftwareInfoVo.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/StorageInfoVo.kt (98%) rename src/main/kotlin/top/fatweb/{ => oxygen}/api/vo/system/SysLogVo.kt (97%) rename src/test/kotlin/top/fatweb/{api/FatWebApiApplicationTests.kt => oxygen/api/OxygenApiApplicationTests.kt} (84%) diff --git a/build-docker.sh b/build-docker.sh index 3839b82..877f249 100644 --- a/build-docker.sh +++ b/build-docker.sh @@ -10,15 +10,15 @@ java -Djarmode=layertools -jar target/*.jar extract --destination target/extract if [[ "${JAR_VERSION}" =~ ^.*SNAPSHOT$ ]] then - docker build -t hub.fatweb.top/fatweb-api:snapshot-latest -t hub.fatweb.top/fatweb-api:$JAR_VERSION -t hub.fatweb.top/fatweb-api:$JAR_VERSION-${BUILD_TIME} . + docker build -t hub.fatweb.top/oxygen-api:snapshot-latest -t hub.fatweb.top/oxygen-api:$JAR_VERSION -t hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} . cat "${KEYS_PATH}/docker.password" | docker login hub.fatweb.top -u jenkins --password-stdin - docker push hub.fatweb.top/fatweb-api:snapshot-latest - docker push hub.fatweb.top/fatweb-api:$JAR_VERSION - docker push hub.fatweb.top/fatweb-api:$JAR_VERSION-${BUILD_TIME} + docker push hub.fatweb.top/oxygen-api:snapshot-latest + docker push hub.fatweb.top/oxygen-api:$JAR_VERSION + docker push hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} else - docker build -t hub.fatweb.top/fatweb-api:latest -t hub.fatweb.top/fatweb-api:$JAR_VERSION -t hub.fatweb.top/fatweb-api:$JAR_VERSION-${BUILD_TIME} . + docker build -t hub.fatweb.top/oxygen-api:latest -t hub.fatweb.top/oxygen-api:$JAR_VERSION -t hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} . cat "${KEYS_PATH}/docker.password" | docker login hub.fatweb.top -u jenkins --password-stdin - docker push hub.fatweb.top/fatweb-api:latest - docker push hub.fatweb.top/fatweb-api:$JAR_VERSION - docker push hub.fatweb.top/fatweb-api:$JAR_VERSION-${BUILD_TIME} + docker push hub.fatweb.top/oxygen-api:latest + docker push hub.fatweb.top/oxygen-api:$JAR_VERSION + docker push hub.fatweb.top/oxygen-api:$JAR_VERSION-${BUILD_TIME} fi \ No newline at end of file diff --git a/pom.xml b/pom.xml index 225ece4..eef0dab 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ top.fatweb api 0.0.1-SNAPSHOT - fatweb-api - fatweb-api + oxygen-api + oxygen-api diff --git a/src/main/kotlin/top/fatweb/api/FatWebApiApplication.kt b/src/main/kotlin/top/fatweb/oxygen/api/OxygenApiApplication.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/FatWebApiApplication.kt rename to src/main/kotlin/top/fatweb/oxygen/api/OxygenApiApplication.kt index 1bbf8aa..146c2fb 100644 --- a/src/main/kotlin/top/fatweb/api/FatWebApiApplication.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/OxygenApiApplication.kt @@ -1,4 +1,4 @@ -package top.fatweb.api +package top.fatweb.oxygen.api import org.slf4j.LoggerFactory import org.springframework.boot.autoconfigure.SpringBootApplication @@ -17,7 +17,7 @@ import java.util.* @SpringBootApplication @EnableTransactionManagement @EnableScheduling -class FatWebApiApplication +class OxygenApiApplication /** * Main function @@ -53,10 +53,10 @@ fun main(args: Array) { } if (File("application-config.yml").exists() || File("data/application-config.yml").exists()) { - runApplication(*args) + runApplication(*args) } else { logger.warn("File 'application-config.yml' cannot be found in the running path or the data path. The configuration file template 'application-config.example.yml' has been created in directory 'data'. Please change the configuration file content, move it to the running path, rename it to 'application-config.yml', and then restart the server.") - FatWebApiApplication::class.java.getResource("/application-config-template.yml")?.readText()?.let { + OxygenApiApplication::class.java.getResource("/application-config-template.yml")?.readText()?.let { File("data/application-config.example.yml").writeText( it.replace( "\$uuid\$", UUID.randomUUID().toString().replace("-", "") diff --git a/src/main/kotlin/top/fatweb/api/annotation/ApiController.kt b/src/main/kotlin/top/fatweb/oxygen/api/annotation/ApiController.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/annotation/ApiController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/annotation/ApiController.kt index 0382a56..5805c4e 100644 --- a/src/main/kotlin/top/fatweb/api/annotation/ApiController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/annotation/ApiController.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.annotation +package top.fatweb.oxygen.api.annotation import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.core.annotation.AliasFor diff --git a/src/main/kotlin/top/fatweb/api/annotation/BaseController.kt b/src/main/kotlin/top/fatweb/oxygen/api/annotation/BaseController.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/annotation/BaseController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/annotation/BaseController.kt index 029fa05..598555d 100644 --- a/src/main/kotlin/top/fatweb/api/annotation/BaseController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/annotation/BaseController.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.annotation +package top.fatweb.oxygen.api.annotation import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.core.annotation.AliasFor diff --git a/src/main/kotlin/top/fatweb/api/annotation/EventLogRecord.kt b/src/main/kotlin/top/fatweb/oxygen/api/annotation/EventLogRecord.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/annotation/EventLogRecord.kt rename to src/main/kotlin/top/fatweb/oxygen/api/annotation/EventLogRecord.kt index 4eb87e0..f0e023b 100644 --- a/src/main/kotlin/top/fatweb/api/annotation/EventLogRecord.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/annotation/EventLogRecord.kt @@ -1,6 +1,6 @@ -package top.fatweb.api.annotation +package top.fatweb.oxygen.api.annotation -import top.fatweb.api.entity.system.EventLog +import top.fatweb.oxygen.api.entity.system.EventLog /** * Event log record annotation diff --git a/src/main/kotlin/top/fatweb/api/annotation/HiddenController.kt b/src/main/kotlin/top/fatweb/oxygen/api/annotation/HiddenController.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/annotation/HiddenController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/annotation/HiddenController.kt index 5e593e5..90287fb 100644 --- a/src/main/kotlin/top/fatweb/api/annotation/HiddenController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/annotation/HiddenController.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.annotation +package top.fatweb.oxygen.api.annotation import io.swagger.v3.oas.annotations.Hidden import org.springframework.core.annotation.AliasFor diff --git a/src/main/kotlin/top/fatweb/api/aop/EventLogAspect.kt b/src/main/kotlin/top/fatweb/oxygen/api/aop/EventLogAspect.kt similarity index 78% rename from src/main/kotlin/top/fatweb/api/aop/EventLogAspect.kt rename to src/main/kotlin/top/fatweb/oxygen/api/aop/EventLogAspect.kt index b5c26d9..c9710e5 100644 --- a/src/main/kotlin/top/fatweb/api/aop/EventLogAspect.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/aop/EventLogAspect.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.aop +package top.fatweb.oxygen.api.aop import org.aspectj.lang.JoinPoint import org.aspectj.lang.annotation.AfterReturning @@ -6,11 +6,11 @@ import org.aspectj.lang.annotation.Aspect import org.aspectj.lang.annotation.Pointcut import org.aspectj.lang.reflect.MethodSignature import org.springframework.stereotype.Component -import top.fatweb.api.annotation.EventLogRecord -import top.fatweb.api.service.system.IEventLogService -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.permission.LoginVo -import top.fatweb.api.vo.permission.RegisterVo +import top.fatweb.oxygen.api.annotation.EventLogRecord +import top.fatweb.oxygen.api.service.system.IEventLogService +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.permission.LoginVo +import top.fatweb.oxygen.api.vo.permission.RegisterVo /** * Event log record aspect @@ -30,7 +30,7 @@ class EventLogAspect( * @author FatttSnake, fatttsnake@gmail.com * @since 1.0.0 */ - @Pointcut("@annotation(top.fatweb.api.annotation.EventLogRecord)") + @Pointcut("@annotation(top.fatweb.oxygen.api.annotation.EventLogRecord)") fun eventLogPointcut() { } diff --git a/src/main/kotlin/top/fatweb/api/config/DataFormatConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/DataFormatConfig.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/config/DataFormatConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/DataFormatConfig.kt index c974b86..328afaa 100644 --- a/src/main/kotlin/top/fatweb/api/config/DataFormatConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/DataFormatConfig.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer diff --git a/src/main/kotlin/top/fatweb/api/config/FilterConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt similarity index 87% rename from src/main/kotlin/top/fatweb/api/config/FilterConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt index 180bd67..7b1883b 100644 --- a/src/main/kotlin/top/fatweb/api/config/FilterConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.springframework.boot.web.servlet.FilterRegistrationBean import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import top.fatweb.api.filter.ExceptionFilter +import top.fatweb.oxygen.api.filter.ExceptionFilter /** * Filter configuration diff --git a/src/main/kotlin/top/fatweb/api/config/FlywayConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/FlywayConfig.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/config/FlywayConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/FlywayConfig.kt index 824b529..9e34385 100644 --- a/src/main/kotlin/top/fatweb/api/config/FlywayConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/FlywayConfig.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import com.baomidou.dynamic.datasource.DynamicRoutingDataSource import jakarta.annotation.PostConstruct import org.flywaydb.core.Flyway import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.DependsOn -import top.fatweb.api.properties.FlywayProperties +import top.fatweb.oxygen.api.properties.FlywayProperties import javax.sql.DataSource /** diff --git a/src/main/kotlin/top/fatweb/api/config/InitConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/InitConfig.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/config/InitConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/InitConfig.kt index f20b707..7e4d123 100644 --- a/src/main/kotlin/top/fatweb/api/config/InitConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/InitConfig.kt @@ -1,20 +1,19 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import jakarta.annotation.PostConstruct -import org.apache.velocity.app.VelocityEngine import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.context.annotation.DependsOn import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.stereotype.Component -import top.fatweb.api.entity.permission.User -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.properties.AdminProperties -import top.fatweb.api.service.permission.IUserInfoService -import top.fatweb.api.service.permission.IUserService -import top.fatweb.api.util.StrUtil import top.fatweb.avatargenerator.GitHubAvatar +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.properties.AdminProperties +import top.fatweb.oxygen.api.service.permission.IUserInfoService +import top.fatweb.oxygen.api.service.permission.IUserService +import top.fatweb.oxygen.api.util.StrUtil /** * Application initialization configuration diff --git a/src/main/kotlin/top/fatweb/api/config/MybatisPlusConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/config/MybatisPlusConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt index 83d7dec..9d36fe0 100644 --- a/src/main/kotlin/top/fatweb/api/config/MybatisPlusConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor diff --git a/src/main/kotlin/top/fatweb/api/config/RedisConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/config/RedisConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt index 2ec60fe..b22b12f 100644 --- a/src/main/kotlin/top/fatweb/api/config/RedisConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import com.fasterxml.jackson.annotation.JsonAutoDetect import com.fasterxml.jackson.annotation.JsonTypeInfo diff --git a/src/main/kotlin/top/fatweb/api/config/SecurityConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/SecurityConfig.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/config/SecurityConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/SecurityConfig.kt index 5e0dcb8..5d59bfe 100644 --- a/src/main/kotlin/top/fatweb/api/config/SecurityConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/SecurityConfig.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -13,9 +13,9 @@ import org.springframework.security.web.SecurityFilterChain import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter import org.springframework.web.cors.CorsConfiguration import org.springframework.web.cors.UrlBasedCorsConfigurationSource -import top.fatweb.api.filter.JwtAuthenticationTokenFilter -import top.fatweb.api.handler.JwtAccessDeniedHandler -import top.fatweb.api.handler.JwtAuthenticationEntryPointHandler +import top.fatweb.oxygen.api.filter.JwtAuthenticationTokenFilter +import top.fatweb.oxygen.api.handler.JwtAccessDeniedHandler +import top.fatweb.oxygen.api.handler.JwtAuthenticationEntryPointHandler /** * Spring Security configuration diff --git a/src/main/kotlin/top/fatweb/api/config/SwaggerConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/SwaggerConfig.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/config/SwaggerConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/SwaggerConfig.kt index 78a59bf..af0ca61 100644 --- a/src/main/kotlin/top/fatweb/api/config/SwaggerConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/SwaggerConfig.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import io.swagger.v3.oas.models.OpenAPI import io.swagger.v3.oas.models.info.Contact import io.swagger.v3.oas.models.info.Info import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import top.fatweb.api.properties.ServerProperties +import top.fatweb.oxygen.api.properties.ServerProperties /** * Swagger API doc configuration @@ -17,9 +17,9 @@ import top.fatweb.api.properties.ServerProperties class SwaggerConfig { @Bean fun customOpenAPI(): OpenAPI? { - val contact = Contact().name("FatttSnake").url("https://fatweb.top").email("fatttsnake@fatweb.top") + val contact = Contact().name("FatttSnake").url("https://fatweb.top").email("fatttsnake@gmail.com") return OpenAPI().info( - Info().title("FatWeb API 文档").description("FatWeb 后端 API 文档，包含各个 Controller 调用信息") + Info().title("Oxygen API 文档").description("Oxygen 后端 API 文档，包含各个 Controller 调用信息") .contact(contact).version( ServerProperties.version ) diff --git a/src/main/kotlin/top/fatweb/api/config/SysLogConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/SysLogConfig.kt similarity index 87% rename from src/main/kotlin/top/fatweb/api/config/SysLogConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/SysLogConfig.kt index f8a76e4..fbd40c3 100644 --- a/src/main/kotlin/top/fatweb/api/config/SysLogConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/SysLogConfig.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.springframework.context.annotation.Configuration import org.springframework.web.servlet.config.annotation.InterceptorRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer -import top.fatweb.api.interceptor.SysLogInterceptor +import top.fatweb.oxygen.api.interceptor.SysLogInterceptor /** * System log configuration diff --git a/src/main/kotlin/top/fatweb/api/config/VelocityEngineConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/VelocityEngineConfig.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/config/VelocityEngineConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/VelocityEngineConfig.kt index 2ae172d..0995ada 100644 --- a/src/main/kotlin/top/fatweb/api/config/VelocityEngineConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/VelocityEngineConfig.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.apache.velocity.app.VelocityEngine import org.apache.velocity.runtime.RuntimeConstants diff --git a/src/main/kotlin/top/fatweb/api/config/WebMvcConfigurerConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcConfigurerConfig.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/config/WebMvcConfigurerConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcConfigurerConfig.kt index f2453a8..604a8ab 100644 --- a/src/main/kotlin/top/fatweb/api/config/WebMvcConfigurerConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcConfigurerConfig.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations import org.springframework.context.annotation.Configuration import org.springframework.web.servlet.config.annotation.PathMatchConfigurer import org.springframework.web.servlet.config.annotation.WebMvcConfigurer -import top.fatweb.api.annotation.ApiController +import top.fatweb.oxygen.api.annotation.ApiController /** * Web MVC configurer configuration @@ -16,6 +16,6 @@ import top.fatweb.api.annotation.ApiController @Configuration class WebMvcConfigurerConfig : WebMvcConfigurer { override fun configurePathMatch(configurer: PathMatchConfigurer) { - configurer.addPathPrefix("/api/{API_VERSION}") {it.isAnnotationPresent(ApiController::class.java)} + configurer.addPathPrefix("/api/{API_VERSION}") { it.isAnnotationPresent(ApiController::class.java) } } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/config/WebMvcRegistrationsConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcRegistrationsConfig.kt similarity index 84% rename from src/main/kotlin/top/fatweb/api/config/WebMvcRegistrationsConfig.kt rename to src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcRegistrationsConfig.kt index d5a1a26..f65a30c 100644 --- a/src/main/kotlin/top/fatweb/api/config/WebMvcRegistrationsConfig.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/config/WebMvcRegistrationsConfig.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.config +package top.fatweb.oxygen.api.config import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations import org.springframework.context.annotation.Configuration import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping -import top.fatweb.api.util.ApiResponseMappingHandlerMapping +import top.fatweb.oxygen.api.util.ApiResponseMappingHandlerMapping /** * Web MVC registrations configuration diff --git a/src/main/kotlin/top/fatweb/api/controller/ExceptionController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/ExceptionController.kt similarity index 81% rename from src/main/kotlin/top/fatweb/api/controller/ExceptionController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/ExceptionController.kt index 3c2f76f..c61cceb 100644 --- a/src/main/kotlin/top/fatweb/api/controller/ExceptionController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/ExceptionController.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.controller +package top.fatweb.oxygen.api.controller import jakarta.servlet.http.HttpServletRequest import org.springframework.web.bind.annotation.RequestMapping -import top.fatweb.api.annotation.HiddenController +import top.fatweb.oxygen.api.annotation.HiddenController /** * Exception controller diff --git a/src/main/kotlin/top/fatweb/api/controller/api/v1/AvatarController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/api/v1/AvatarController.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/controller/api/v1/AvatarController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/api/v1/AvatarController.kt index b02bf7c..0747aff 100644 --- a/src/main/kotlin/top/fatweb/api/controller/api/v1/AvatarController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/api/v1/AvatarController.kt @@ -1,16 +1,16 @@ -package top.fatweb.api.controller.api.v1 +package top.fatweb.oxygen.api.controller.api.v1 import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid import org.springframework.http.MediaType import org.springframework.web.bind.annotation.GetMapping -import top.fatweb.api.annotation.ApiController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.api.v1.avatar.AvatarBaseParam -import top.fatweb.api.param.api.v1.avatar.AvatarGitHubParam -import top.fatweb.api.service.api.v1.IAvatarService -import top.fatweb.api.vo.api.v1.avatar.AvatarBase64Vo +import top.fatweb.oxygen.api.annotation.ApiController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarBaseParam +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarGitHubParam +import top.fatweb.oxygen.api.service.api.v1.IAvatarService +import top.fatweb.oxygen.api.vo.api.v1.avatar.AvatarBase64Vo /** * Avatar controller diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/AuthenticationController.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/permission/AuthenticationController.kt index 99ce14a..4c47343 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/AuthenticationController.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.controller.permission +package top.fatweb.oxygen.api.controller.permission import io.swagger.v3.oas.annotations.Operation import jakarta.servlet.http.HttpServletRequest @@ -6,15 +6,15 @@ import jakarta.validation.Valid import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.permission.* -import top.fatweb.api.service.permission.IAuthenticationService -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.permission.LoginVo -import top.fatweb.api.vo.permission.RegisterVo -import top.fatweb.api.vo.permission.TokenVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.permission.* +import top.fatweb.oxygen.api.service.permission.IAuthenticationService +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.permission.LoginVo +import top.fatweb.oxygen.api.vo.permission.RegisterVo +import top.fatweb.oxygen.api.vo.permission.TokenVo /** * Authentication controller @@ -114,7 +114,10 @@ class AuthenticationController( */ @Operation(summary = "找回密码") @PostMapping("/retrieve") - fun retrieve(request: HttpServletRequest, @Valid @RequestBody retrieveParam: RetrieveParam): ResponseResult { + fun retrieve( + request: HttpServletRequest, + @Valid @RequestBody retrieveParam: RetrieveParam + ): ResponseResult { authenticationService.retrieve(request, retrieveParam) return ResponseResult.success(ResponseCode.PERMISSION_RETRIEVE_SUCCESS) diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/GroupController.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/permission/GroupController.kt index f52db31..5238386 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/GroupController.kt @@ -1,17 +1,17 @@ -package top.fatweb.api.controller.permission +package top.fatweb.oxygen.api.controller.permission import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.* -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.permission.group.* -import top.fatweb.api.service.permission.IGroupService -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.GroupWithRoleVo -import top.fatweb.api.vo.permission.base.GroupVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.permission.group.* +import top.fatweb.oxygen.api.service.permission.IGroupService +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo /** * Group controller diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/PowerController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/PowerController.kt similarity index 76% rename from src/main/kotlin/top/fatweb/api/controller/permission/PowerController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/permission/PowerController.kt index 3da4c87..4fcfa08 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/PowerController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/PowerController.kt @@ -1,12 +1,12 @@ -package top.fatweb.api.controller.permission +package top.fatweb.oxygen.api.controller.permission import io.swagger.v3.oas.annotations.Operation import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.GetMapping -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.service.permission.IPowerService -import top.fatweb.api.vo.permission.PowerSetVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.service.permission.IPowerService +import top.fatweb.oxygen.api.vo.permission.PowerSetVo /** * Power controller diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/RoleController.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/permission/RoleController.kt index 63a7015..c92dee9 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/RoleController.kt @@ -1,17 +1,17 @@ -package top.fatweb.api.controller.permission +package top.fatweb.oxygen.api.controller.permission import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.* -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.permission.role.* -import top.fatweb.api.service.permission.IRoleService -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.RoleWithPowerVo -import top.fatweb.api.vo.permission.base.RoleVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.permission.role.* +import top.fatweb.oxygen.api.service.permission.IRoleService +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo /** * Role controller diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/UserController.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/permission/UserController.kt index e2419e4..9cb4261 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/permission/UserController.kt @@ -1,19 +1,19 @@ -package top.fatweb.api.controller.permission +package top.fatweb.oxygen.api.controller.permission import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.* -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.exception.NoRecordFoundException -import top.fatweb.api.param.permission.user.* -import top.fatweb.api.service.permission.IUserService -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo -import top.fatweb.api.vo.permission.UserWithPowerInfoVo -import top.fatweb.api.vo.permission.UserWithRoleInfoVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.exception.NoRecordFoundException +import top.fatweb.oxygen.api.param.permission.user.* +import top.fatweb.oxygen.api.service.permission.IUserService +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.UserWithPasswordRoleInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithPowerInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithRoleInfoVo /** * User controller diff --git a/src/main/kotlin/top/fatweb/api/controller/system/SettingsController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/SettingsController.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/controller/system/SettingsController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/system/SettingsController.kt index 39a4cd6..9602e56 100644 --- a/src/main/kotlin/top/fatweb/api/controller/system/SettingsController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/SettingsController.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.controller.system +package top.fatweb.oxygen.api.controller.system import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid @@ -7,14 +7,14 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PutMapping import org.springframework.web.bind.annotation.RequestBody -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.system.BaseSettingsParam -import top.fatweb.api.param.system.MailSendParam -import top.fatweb.api.param.system.MailSettingsParam -import top.fatweb.api.service.system.ISettingsService -import top.fatweb.api.vo.system.BaseSettingsVo -import top.fatweb.api.vo.system.MailSettingsVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.system.BaseSettingsParam +import top.fatweb.oxygen.api.param.system.MailSendParam +import top.fatweb.oxygen.api.param.system.MailSettingsParam +import top.fatweb.oxygen.api.service.system.ISettingsService +import top.fatweb.oxygen.api.vo.system.BaseSettingsVo +import top.fatweb.oxygen.api.vo.system.MailSettingsVo /** * System settings controller diff --git a/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/StatisticsController.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/system/StatisticsController.kt index 107e6d4..f21802b 100644 --- a/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/StatisticsController.kt @@ -1,14 +1,14 @@ -package top.fatweb.api.controller.system +package top.fatweb.oxygen.api.controller.system import io.swagger.v3.oas.annotations.Operation import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.GetMapping -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.system.ActiveInfoGetParam -import top.fatweb.api.param.system.OnlineInfoGetParam -import top.fatweb.api.service.system.IStatisticsService -import top.fatweb.api.vo.system.* +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.system.ActiveInfoGetParam +import top.fatweb.oxygen.api.param.system.OnlineInfoGetParam +import top.fatweb.oxygen.api.service.system.IStatisticsService +import top.fatweb.oxygen.api.vo.system.* /** * Statistics controller diff --git a/src/main/kotlin/top/fatweb/api/controller/system/SysLogController.kt b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/SysLogController.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/controller/system/SysLogController.kt rename to src/main/kotlin/top/fatweb/oxygen/api/controller/system/SysLogController.kt index 80298aa..01c37cd 100644 --- a/src/main/kotlin/top/fatweb/api/controller/system/SysLogController.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/controller/system/SysLogController.kt @@ -1,16 +1,16 @@ -package top.fatweb.api.controller.system +package top.fatweb.oxygen.api.controller.system import io.swagger.v3.oas.annotations.Operation import jakarta.validation.Valid import org.springframework.security.access.prepost.PreAuthorize import org.springframework.web.bind.annotation.GetMapping -import top.fatweb.api.annotation.BaseController -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.system.SysLogGetParam -import top.fatweb.api.service.system.ISysLogService -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.system.SysLogVo +import top.fatweb.oxygen.api.annotation.BaseController +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.param.system.SysLogGetParam +import top.fatweb.oxygen.api.service.system.ISysLogService +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.system.SysLogVo /** * System log controller diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/FuncConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/FuncConverter.kt similarity index 76% rename from src/main/kotlin/top/fatweb/api/converter/permission/FuncConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/FuncConverter.kt index 9079ee2..ed5c227 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/FuncConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/FuncConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.Func -import top.fatweb.api.vo.permission.base.FuncVo +import top.fatweb.oxygen.api.entity.permission.Func +import top.fatweb.oxygen.api.vo.permission.base.FuncVo /** * Function converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt similarity index 86% rename from src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt index b218e48..8f3db91 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt @@ -1,14 +1,14 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission import com.baomidou.mybatisplus.core.metadata.IPage -import top.fatweb.api.entity.permission.Group -import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.permission.group.GroupAddParam -import top.fatweb.api.param.permission.group.GroupUpdateStatusParam -import top.fatweb.api.param.permission.group.GroupUpdateParam -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.GroupVo -import top.fatweb.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.entity.permission.Group +import top.fatweb.oxygen.api.entity.permission.Role +import top.fatweb.oxygen.api.param.permission.group.GroupAddParam +import top.fatweb.oxygen.api.param.permission.group.GroupUpdateParam +import top.fatweb.oxygen.api.param.permission.group.GroupUpdateStatusParam +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo /** * Group converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/MenuConverter.kt similarity index 77% rename from src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/MenuConverter.kt index 8b9f205..ef573d1 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/MenuConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.Menu -import top.fatweb.api.vo.permission.base.MenuVo +import top.fatweb.oxygen.api.entity.permission.Menu +import top.fatweb.oxygen.api.vo.permission.base.MenuVo /** * Menu converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/ModuleConverter.kt similarity index 74% rename from src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/ModuleConverter.kt index 4c32635..4760c51 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/ModuleConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.Module -import top.fatweb.api.vo.permission.base.ModuleVo +import top.fatweb.oxygen.api.entity.permission.Module +import top.fatweb.oxygen.api.vo.permission.base.ModuleVo /** * Module converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/OperationConverter.kt similarity index 77% rename from src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/OperationConverter.kt index 6328ad4..dd9f0b3 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/OperationConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.Operation -import top.fatweb.api.vo.permission.base.OperationVo +import top.fatweb.oxygen.api.entity.permission.Operation +import top.fatweb.oxygen.api.vo.permission.base.OperationVo /** * Operation converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/PowerConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/PowerConverter.kt similarity index 83% rename from src/main/kotlin/top/fatweb/api/converter/permission/PowerConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/PowerConverter.kt index 4c4dc05..80a21c0 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/PowerConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/PowerConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.PowerSet -import top.fatweb.api.vo.permission.PowerSetVo +import top.fatweb.oxygen.api.entity.permission.PowerSet +import top.fatweb.oxygen.api.vo.permission.PowerSetVo /** * Power converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt similarity index 87% rename from src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt index 044227f..13a9005 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt @@ -1,14 +1,14 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission import com.baomidou.mybatisplus.core.metadata.IPage -import top.fatweb.api.entity.permission.Power -import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.permission.role.RoleAddParam -import top.fatweb.api.param.permission.role.RoleUpdateStatusParam -import top.fatweb.api.param.permission.role.RoleUpdateParam -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.RoleVo -import top.fatweb.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.entity.permission.Power +import top.fatweb.oxygen.api.entity.permission.Role +import top.fatweb.oxygen.api.param.permission.role.RoleAddParam +import top.fatweb.oxygen.api.param.permission.role.RoleUpdateParam +import top.fatweb.oxygen.api.param.permission.role.RoleUpdateStatusParam +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo /** * Role converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserConverter.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserConverter.kt index 13a2964..b75bc68 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserConverter.kt @@ -1,18 +1,18 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission import com.baomidou.mybatisplus.core.metadata.IPage -import top.fatweb.api.entity.permission.Group -import top.fatweb.api.entity.permission.Role -import top.fatweb.api.entity.permission.User -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.param.permission.user.UserAddParam -import top.fatweb.api.param.permission.user.UserUpdateParam -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.UserWithInfoVo -import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo -import top.fatweb.api.vo.permission.UserWithPowerInfoVo -import top.fatweb.api.vo.permission.UserWithRoleInfoVo import top.fatweb.avatargenerator.GitHubAvatar +import top.fatweb.oxygen.api.entity.permission.Group +import top.fatweb.oxygen.api.entity.permission.Role +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.param.permission.user.UserAddParam +import top.fatweb.oxygen.api.param.permission.user.UserUpdateParam +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.UserWithInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithPasswordRoleInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithPowerInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithRoleInfoVo /** * User converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserInfoConverter.kt similarity index 81% rename from src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserInfoConverter.kt index dd2c253..89bf651 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/UserInfoConverter.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.converter.permission +package top.fatweb.oxygen.api.converter.permission -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.vo.permission.base.UserInfoVo +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.vo.permission.base.UserInfoVo /** * User information converter diff --git a/src/main/kotlin/top/fatweb/api/converter/system/SysLogConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/converter/system/SysLogConverter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt index 80812df..d94bd90 100644 --- a/src/main/kotlin/top/fatweb/api/converter/system/SysLogConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.converter.system +package top.fatweb.oxygen.api.converter.system import com.baomidou.mybatisplus.core.metadata.IPage -import top.fatweb.api.entity.system.SysLog -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.system.SysLogVo +import top.fatweb.oxygen.api.entity.system.SysLog +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.system.SysLogVo /** * System log converter diff --git a/src/main/kotlin/top/fatweb/api/cron/StatisticsCron.kt b/src/main/kotlin/top/fatweb/oxygen/api/cron/StatisticsCron.kt similarity index 65% rename from src/main/kotlin/top/fatweb/api/cron/StatisticsCron.kt rename to src/main/kotlin/top/fatweb/oxygen/api/cron/StatisticsCron.kt index 26677b1..e4b014f 100644 --- a/src/main/kotlin/top/fatweb/api/cron/StatisticsCron.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/cron/StatisticsCron.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.cron +package top.fatweb.oxygen.api.cron import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component -import top.fatweb.api.entity.system.StatisticsLog -import top.fatweb.api.properties.SecurityProperties -import top.fatweb.api.service.system.IStatisticsLogService -import top.fatweb.api.util.RedisUtil +import top.fatweb.oxygen.api.entity.system.StatisticsLog +import top.fatweb.oxygen.api.properties.SecurityProperties +import top.fatweb.oxygen.api.service.system.IStatisticsLogService +import top.fatweb.oxygen.api.util.RedisUtil /** * Statistics scheduled tasks @@ -29,7 +29,7 @@ class StatisticsCron( statisticsLogService.save(StatisticsLog().apply { key = StatisticsLog.KeyItem.ONLINE_USERS_COUNT value = redisUtil.keys("${SecurityProperties.jwtIssuer}_login_*") - .distinctBy { Regex("FatWeb_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull(1) }.size.toString() + .distinctBy { Regex("${SecurityProperties.jwtIssuer}_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull(1) }.size.toString() }) } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/entity/common/BusinessCode.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/BusinessCode.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/entity/common/BusinessCode.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/common/BusinessCode.kt index faff351..5c3a4d2 100644 --- a/src/main/kotlin/top/fatweb/api/entity/common/BusinessCode.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/BusinessCode.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.common +package top.fatweb.oxygen.api.entity.common /** * Business code entity diff --git a/src/main/kotlin/top/fatweb/api/entity/common/ResponseCode.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseCode.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/entity/common/ResponseCode.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseCode.kt index 23eb2d5..5b6b721 100644 --- a/src/main/kotlin/top/fatweb/api/entity/common/ResponseCode.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseCode.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.common +package top.fatweb.oxygen.api.entity.common /** * Response code entity diff --git a/src/main/kotlin/top/fatweb/api/entity/common/ResponseResult.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseResult.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/entity/common/ResponseResult.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseResult.kt index c3e2a1a..7c866fe 100644 --- a/src/main/kotlin/top/fatweb/api/entity/common/ResponseResult.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/common/ResponseResult.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.common +package top.fatweb.oxygen.api.entity.common import io.swagger.v3.oas.annotations.media.Schema import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Func.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Func.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/entity/permission/Func.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Func.kt index fd7163c..78014e0 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Func.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Func.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Group.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Group.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/entity/permission/Group.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Group.kt index 2f6afb8..480f857 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Group.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Group.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable @@ -90,6 +90,6 @@ class Group : Serializable { var roles: List? = null override fun toString(): String { - return "Group(id=$id, name=$name, enable=$enable, deleted=$deleted, version=$version, roles=$roles)" + return "Group(id=$id, name=$name, enable=$enable, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version, roles=$roles)" } } diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/LoginUser.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/LoginUser.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/entity/permission/LoginUser.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/LoginUser.kt index 1d9ce30..29fafce 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/LoginUser.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/LoginUser.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonTypeInfo @@ -60,4 +60,8 @@ class LoginUser() : UserDetails { @JsonIgnore override fun isEnabled() = user.enable == 1 + + override fun toString(): String { + return "LoginUser(user=$user, authorities=$authorities)" + } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Menu.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Menu.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/entity/permission/Menu.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Menu.kt index 37577ee..a3f982e 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Menu.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Menu.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Module.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Module.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/entity/permission/Module.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Module.kt index 37f2488..eac5aa7 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Module.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Module.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Operation.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Operation.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/entity/permission/Operation.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Operation.kt index 106876f..05740b4 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Operation.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Operation.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Power.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Power.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/entity/permission/Power.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Power.kt index af610b4..3ebe80a 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Power.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Power.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/PowerRole.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/entity/permission/PowerRole.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt index 5651c12..915eb5a 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/PowerRole.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/PowerSet.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerSet.kt similarity index 79% rename from src/main/kotlin/top/fatweb/api/entity/permission/PowerSet.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerSet.kt index 519c077..c99f5ae 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/PowerSet.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerSet.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import java.io.Serializable @@ -44,4 +44,8 @@ class PowerSet : Serializable { * @see Operation */ var operationList: List? = null + + override fun toString(): String { + return "PowerSet(moduleList=$moduleList, menuList=$menuList, funcList=$funcList, operationList=$operationList)" + } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/PowerType.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerType.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/entity/permission/PowerType.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerType.kt index e250336..676588c 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/PowerType.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerType.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableId diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/Role.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Role.kt similarity index 90% rename from src/main/kotlin/top/fatweb/api/entity/permission/Role.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Role.kt index 81efd8a..32ba4fe 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/Role.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/Role.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable @@ -130,6 +130,6 @@ class Role : Serializable { var powers: List? = null override fun toString(): String { - return "Role(id=$id, name=$name, enable=$enable, deleted=$deleted, version=$version, modules=$modules, menus=$menus, funcs=$funcs, operations=$operations, powers=$powers)" + return "Role(id=$id, name=$name, enable=$enable, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version, modules=$modules, menus=$menus, funcs=$funcs, operations=$operations, powers=$powers)" } } diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/RoleGroup.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/entity/permission/RoleGroup.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt index cb9e557..149e31a 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/RoleGroup.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/User.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/User.kt similarity index 99% rename from src/main/kotlin/top/fatweb/api/entity/permission/User.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/User.kt index 14d04d2..67b6592 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/User.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/User.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/UserGroup.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/entity/permission/UserGroup.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt index 368253e..ae8c102 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/UserGroup.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserInfo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserInfo.kt index 9635470..f1cb26e 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserInfo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/permission/UserRole.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/entity/permission/UserRole.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt index 94cb0b6..de09ff6 100644 --- a/src/main/kotlin/top/fatweb/api/entity/permission/UserRole.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.permission +package top.fatweb.oxygen.api.entity.permission import com.baomidou.mybatisplus.annotation.* import java.io.Serializable diff --git a/src/main/kotlin/top/fatweb/api/entity/system/EventLog.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/EventLog.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/entity/system/EventLog.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/system/EventLog.kt index e09f86f..a719457 100644 --- a/src/main/kotlin/top/fatweb/api/entity/system/EventLog.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/EventLog.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.system +package top.fatweb.oxygen.api.entity.system import com.baomidou.mybatisplus.annotation.EnumValue import com.baomidou.mybatisplus.annotation.TableField diff --git a/src/main/kotlin/top/fatweb/api/entity/system/StatisticsLog.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/StatisticsLog.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/entity/system/StatisticsLog.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/system/StatisticsLog.kt index b8c1426..7ba87a6 100644 --- a/src/main/kotlin/top/fatweb/api/entity/system/StatisticsLog.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/StatisticsLog.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.system +package top.fatweb.oxygen.api.entity.system import com.baomidou.mybatisplus.annotation.EnumValue import com.baomidou.mybatisplus.annotation.TableField @@ -56,7 +56,7 @@ class StatisticsLog : Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") @TableField("record_time") - var recordTime: LocalDateTime?= null + var recordTime: LocalDateTime? = null override fun toString(): String { return "StatisticsLog(id=$id, key=$key, value=$value, recordTime=$recordTime)" diff --git a/src/main/kotlin/top/fatweb/api/entity/system/SysLog.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/SysLog.kt similarity index 99% rename from src/main/kotlin/top/fatweb/api/entity/system/SysLog.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/system/SysLog.kt index 98fbdf4..b557357 100644 --- a/src/main/kotlin/top/fatweb/api/entity/system/SysLog.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/entity/system/SysLog.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.entity.system +package top.fatweb.oxygen.api.entity.system import com.baomidou.mybatisplus.annotation.EnumValue import com.baomidou.mybatisplus.annotation.TableField diff --git a/src/main/kotlin/top/fatweb/api/exception/AccountNeedInitException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedInitException.kt similarity index 84% rename from src/main/kotlin/top/fatweb/api/exception/AccountNeedInitException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedInitException.kt index ec1bdb5..311a9a6 100644 --- a/src/main/kotlin/top/fatweb/api/exception/AccountNeedInitException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedInitException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Account need initialize exception diff --git a/src/main/kotlin/top/fatweb/api/exception/AccountNeedResetPasswordException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedResetPasswordException.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/exception/AccountNeedResetPasswordException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedResetPasswordException.kt index 10f6767..756682b 100644 --- a/src/main/kotlin/top/fatweb/api/exception/AccountNeedResetPasswordException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/AccountNeedResetPasswordException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Account need reset password exception diff --git a/src/main/kotlin/top/fatweb/api/exception/NoEmailConfigException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoEmailConfigException.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/exception/NoEmailConfigException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/NoEmailConfigException.kt index 0377775..a7bd6f2 100644 --- a/src/main/kotlin/top/fatweb/api/exception/NoEmailConfigException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoEmailConfigException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Email settings not configured exception diff --git a/src/main/kotlin/top/fatweb/api/exception/NoRecordFoundException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoRecordFoundException.kt similarity index 82% rename from src/main/kotlin/top/fatweb/api/exception/NoRecordFoundException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/NoRecordFoundException.kt index 574c7ab..65274fa 100644 --- a/src/main/kotlin/top/fatweb/api/exception/NoRecordFoundException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoRecordFoundException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * No record found exception diff --git a/src/main/kotlin/top/fatweb/api/exception/NoVerificationRequiredException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoVerificationRequiredException.kt similarity index 84% rename from src/main/kotlin/top/fatweb/api/exception/NoVerificationRequiredException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/NoVerificationRequiredException.kt index 4ae2c74..c0bcc3a 100644 --- a/src/main/kotlin/top/fatweb/api/exception/NoVerificationRequiredException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/NoVerificationRequiredException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * No verification required exception diff --git a/src/main/kotlin/top/fatweb/api/exception/RetrieveCodeErrorOrExpiredException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/RetrieveCodeErrorOrExpiredException.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/exception/RetrieveCodeErrorOrExpiredException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/RetrieveCodeErrorOrExpiredException.kt index d73239e..d8010c1 100644 --- a/src/main/kotlin/top/fatweb/api/exception/RetrieveCodeErrorOrExpiredException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/RetrieveCodeErrorOrExpiredException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Retrieve code error or expired exception diff --git a/src/main/kotlin/top/fatweb/api/exception/TokenHasExpiredException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/TokenHasExpiredException.kt similarity index 83% rename from src/main/kotlin/top/fatweb/api/exception/TokenHasExpiredException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/TokenHasExpiredException.kt index e5fb85d..7250ef7 100644 --- a/src/main/kotlin/top/fatweb/api/exception/TokenHasExpiredException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/TokenHasExpiredException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Token has expired exception diff --git a/src/main/kotlin/top/fatweb/api/exception/UserNotFoundException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/UserNotFoundException.kt similarity index 82% rename from src/main/kotlin/top/fatweb/api/exception/UserNotFoundException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/UserNotFoundException.kt index 64b032b..6b2dc60 100644 --- a/src/main/kotlin/top/fatweb/api/exception/UserNotFoundException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/UserNotFoundException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * User not found exception diff --git a/src/main/kotlin/top/fatweb/api/exception/VerificationCodeErrorOrExpiredException.kt b/src/main/kotlin/top/fatweb/oxygen/api/exception/VerificationCodeErrorOrExpiredException.kt similarity index 86% rename from src/main/kotlin/top/fatweb/api/exception/VerificationCodeErrorOrExpiredException.kt rename to src/main/kotlin/top/fatweb/oxygen/api/exception/VerificationCodeErrorOrExpiredException.kt index 9c28388..bfbbee7 100644 --- a/src/main/kotlin/top/fatweb/api/exception/VerificationCodeErrorOrExpiredException.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/exception/VerificationCodeErrorOrExpiredException.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.exception +package top.fatweb.oxygen.api.exception /** * Verification code error or expired exception diff --git a/src/main/kotlin/top/fatweb/api/filter/ExceptionFilter.kt b/src/main/kotlin/top/fatweb/oxygen/api/filter/ExceptionFilter.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/filter/ExceptionFilter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/filter/ExceptionFilter.kt index 193f33c..6117074 100644 --- a/src/main/kotlin/top/fatweb/api/filter/ExceptionFilter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/filter/ExceptionFilter.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.filter +package top.fatweb.oxygen.api.filter import jakarta.servlet.Filter import jakarta.servlet.FilterChain diff --git a/src/main/kotlin/top/fatweb/api/filter/JwtAuthenticationTokenFilter.kt b/src/main/kotlin/top/fatweb/oxygen/api/filter/JwtAuthenticationTokenFilter.kt similarity index 84% rename from src/main/kotlin/top/fatweb/api/filter/JwtAuthenticationTokenFilter.kt rename to src/main/kotlin/top/fatweb/oxygen/api/filter/JwtAuthenticationTokenFilter.kt index 1af4dfb..0c61eb5 100644 --- a/src/main/kotlin/top/fatweb/api/filter/JwtAuthenticationTokenFilter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/filter/JwtAuthenticationTokenFilter.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.filter +package top.fatweb.oxygen.api.filter import jakarta.servlet.FilterChain import jakarta.servlet.http.HttpServletRequest @@ -8,12 +8,12 @@ import org.springframework.security.core.context.SecurityContextHolder import org.springframework.stereotype.Component import org.springframework.util.StringUtils import org.springframework.web.filter.OncePerRequestFilter -import top.fatweb.api.entity.permission.LoginUser -import top.fatweb.api.exception.TokenHasExpiredException -import top.fatweb.api.properties.SecurityProperties -import top.fatweb.api.util.JwtUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.util.WebUtil +import top.fatweb.oxygen.api.entity.permission.LoginUser +import top.fatweb.oxygen.api.exception.TokenHasExpiredException +import top.fatweb.oxygen.api.properties.SecurityProperties +import top.fatweb.oxygen.api.util.JwtUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.util.WebUtil /** * Jwt authentication token filter diff --git a/src/main/kotlin/top/fatweb/api/handler/DataMetaObjectHandler.kt b/src/main/kotlin/top/fatweb/oxygen/api/handler/DataMetaObjectHandler.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/handler/DataMetaObjectHandler.kt rename to src/main/kotlin/top/fatweb/oxygen/api/handler/DataMetaObjectHandler.kt index b85cbe1..e667eec 100644 --- a/src/main/kotlin/top/fatweb/api/handler/DataMetaObjectHandler.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/handler/DataMetaObjectHandler.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.handler +package top.fatweb.oxygen.api.handler import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler import org.apache.ibatis.reflection.MetaObject diff --git a/src/main/kotlin/top/fatweb/api/handler/ExceptionHandler.kt b/src/main/kotlin/top/fatweb/oxygen/api/handler/ExceptionHandler.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/handler/ExceptionHandler.kt rename to src/main/kotlin/top/fatweb/oxygen/api/handler/ExceptionHandler.kt index 3d818cb..47d2262 100644 --- a/src/main/kotlin/top/fatweb/api/handler/ExceptionHandler.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/handler/ExceptionHandler.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.handler +package top.fatweb.oxygen.api.handler import com.auth0.jwt.exceptions.JWTDecodeException import com.auth0.jwt.exceptions.SignatureVerificationException @@ -14,10 +14,10 @@ import org.springframework.web.HttpRequestMethodNotSupportedException import org.springframework.web.bind.MethodArgumentNotValidException import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.RestControllerAdvice -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.exception.* import top.fatweb.avatargenerator.AvatarException +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.exception.* /** * Exception handler diff --git a/src/main/kotlin/top/fatweb/api/handler/JwtAccessDeniedHandler.kt b/src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAccessDeniedHandler.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/handler/JwtAccessDeniedHandler.kt rename to src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAccessDeniedHandler.kt index 7e8f1f8..2c89073 100644 --- a/src/main/kotlin/top/fatweb/api/handler/JwtAccessDeniedHandler.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAccessDeniedHandler.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.handler +package top.fatweb.oxygen.api.handler import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse diff --git a/src/main/kotlin/top/fatweb/api/handler/JwtAuthenticationEntryPointHandler.kt b/src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAuthenticationEntryPointHandler.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/handler/JwtAuthenticationEntryPointHandler.kt rename to src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAuthenticationEntryPointHandler.kt index fc477d4..b215232 100644 --- a/src/main/kotlin/top/fatweb/api/handler/JwtAuthenticationEntryPointHandler.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/handler/JwtAuthenticationEntryPointHandler.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.handler +package top.fatweb.oxygen.api.handler import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse diff --git a/src/main/kotlin/top/fatweb/api/interceptor/SysLogInterceptor.kt b/src/main/kotlin/top/fatweb/oxygen/api/interceptor/SysLogInterceptor.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/interceptor/SysLogInterceptor.kt rename to src/main/kotlin/top/fatweb/oxygen/api/interceptor/SysLogInterceptor.kt index e91bc78..73ac78a 100644 --- a/src/main/kotlin/top/fatweb/api/interceptor/SysLogInterceptor.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/interceptor/SysLogInterceptor.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.interceptor +package top.fatweb.oxygen.api.interceptor import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse @@ -11,12 +11,12 @@ import org.springframework.http.server.ServerHttpResponse import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.servlet.HandlerInterceptor import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice -import top.fatweb.api.entity.common.ResponseCode -import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.entity.system.SysLog -import top.fatweb.api.service.system.ISysLogService -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.permission.LoginVo +import top.fatweb.oxygen.api.entity.common.ResponseCode +import top.fatweb.oxygen.api.entity.common.ResponseResult +import top.fatweb.oxygen.api.entity.system.SysLog +import top.fatweb.oxygen.api.service.system.ISysLogService +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.permission.LoginVo import java.net.URI import java.time.LocalDateTime import java.time.ZoneOffset diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/FuncMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/FuncMapper.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/mapper/permission/FuncMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/FuncMapper.kt index c20f3c6..167353d 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/FuncMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/FuncMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.Func +import top.fatweb.oxygen.api.entity.permission.Func /** * Function mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/GroupMapper.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/GroupMapper.kt index d2b001e..8413f65 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/GroupMapper.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import com.baomidou.mybatisplus.core.metadata.IPage import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param -import top.fatweb.api.entity.permission.Group +import top.fatweb.oxygen.api.entity.permission.Group /** * Group mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/MenuMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/MenuMapper.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/mapper/permission/MenuMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/MenuMapper.kt index f3527af..1952dcd 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/MenuMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/MenuMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.Menu +import top.fatweb.oxygen.api.entity.permission.Menu /** * Menu mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/ModuleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/ModuleMapper.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/mapper/permission/ModuleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/ModuleMapper.kt index 2c5041a..bc2e492 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/ModuleMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/ModuleMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.Module +import top.fatweb.oxygen.api.entity.permission.Module /** * Module mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/OperationMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/OperationMapper.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/mapper/permission/OperationMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/OperationMapper.kt index c9e7dd1..848a5bf 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/OperationMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/OperationMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.Operation +import top.fatweb.oxygen.api.entity.permission.Operation /** * Operation mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/PowerMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerMapper.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/mapper/permission/PowerMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerMapper.kt index 1dd1bb5..1100fdd 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/PowerMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.Power +import top.fatweb.oxygen.api.entity.permission.Power /** * Power mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/PowerRoleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt similarity index 74% rename from src/main/kotlin/top/fatweb/api/mapper/permission/PowerRoleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt index 643f5a0..ec2af79 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/PowerRoleMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.PowerRole +import top.fatweb.oxygen.api.entity.permission.PowerRole /** * Power role intermediate mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleGroupMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt similarity index 74% rename from src/main/kotlin/top/fatweb/api/mapper/permission/RoleGroupMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt index 39a3f04..8010ae4 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleGroupMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.RoleGroup +import top.fatweb.oxygen.api.entity.permission.RoleGroup /** * Role group intermediate mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleMapper.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleMapper.kt index 94c99a5..b036bee 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleMapper.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import com.baomidou.mybatisplus.core.metadata.IPage import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param -import top.fatweb.api.entity.permission.Role +import top.fatweb.oxygen.api.entity.permission.Role /** * Role mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/UserGroupMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt similarity index 74% rename from src/main/kotlin/top/fatweb/api/mapper/permission/UserGroupMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt index aea7444..4dbe85e 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/UserGroupMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.UserGroup +import top.fatweb.oxygen.api.entity.permission.UserGroup /** * User group intermediate mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/UserInfoMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserInfoMapper.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/mapper/permission/UserInfoMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserInfoMapper.kt index 4313835..8e816d6 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/UserInfoMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserInfoMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.entity.permission.UserInfo /** * User information mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserMapper.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserMapper.kt index 0118e0d..1f91df6 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserMapper.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import com.baomidou.mybatisplus.core.metadata.IPage import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param -import top.fatweb.api.entity.permission.User +import top.fatweb.oxygen.api.entity.permission.User /** * User mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/permission/UserRoleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt similarity index 74% rename from src/main/kotlin/top/fatweb/api/mapper/permission/UserRoleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt index 10d7892..ebc5eb6 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/permission/UserRoleMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.permission +package top.fatweb.oxygen.api.mapper.permission import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.permission.UserRole +import top.fatweb.oxygen.api.entity.permission.UserRole /** * User role intermediate mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/system/EventLogMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/EventLogMapper.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/mapper/system/EventLogMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/system/EventLogMapper.kt index 8bf0da4..b9e5963 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/system/EventLogMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/EventLogMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.system +package top.fatweb.oxygen.api.mapper.system import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.system.EventLog +import top.fatweb.oxygen.api.entity.system.EventLog /** * Event log mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/system/StatisticsLogMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/StatisticsLogMapper.kt similarity index 72% rename from src/main/kotlin/top/fatweb/api/mapper/system/StatisticsLogMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/system/StatisticsLogMapper.kt index 1d60659..5c6266a 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/system/StatisticsLogMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/StatisticsLogMapper.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.mapper.system +package top.fatweb.oxygen.api.mapper.system import com.baomidou.mybatisplus.core.mapper.BaseMapper import org.apache.ibatis.annotations.Mapper -import top.fatweb.api.entity.system.StatisticsLog +import top.fatweb.oxygen.api.entity.system.StatisticsLog /** * Statistics log mapper diff --git a/src/main/kotlin/top/fatweb/api/mapper/system/SysLogMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/SysLogMapper.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/mapper/system/SysLogMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/system/SysLogMapper.kt index b8f0932..06088a2 100644 --- a/src/main/kotlin/top/fatweb/api/mapper/system/SysLogMapper.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/mapper/system/SysLogMapper.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.mapper.system +package top.fatweb.oxygen.api.mapper.system import com.baomidou.mybatisplus.core.mapper.BaseMapper import com.baomidou.mybatisplus.core.metadata.IPage import org.apache.ibatis.annotations.Mapper import org.apache.ibatis.annotations.Param -import top.fatweb.api.entity.system.SysLog +import top.fatweb.oxygen.api.entity.system.SysLog import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/param/PageSortParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/PageSortParam.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/param/PageSortParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/PageSortParam.kt index 6692b20..cab7e95 100644 --- a/src/main/kotlin/top/fatweb/api/param/PageSortParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/PageSortParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param +package top.fatweb.oxygen.api.param import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarBaseParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarBaseParam.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarBaseParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarBaseParam.kt index b333daa..390e4d1 100644 --- a/src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarBaseParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarBaseParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.api.v1.avatar +package top.fatweb.oxygen.api.param.api.v1.avatar import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Max diff --git a/src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarGitHubParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarGitHubParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarGitHubParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarGitHubParam.kt index 536c000..58e4908 100644 --- a/src/main/kotlin/top/fatweb/api/param/api/v1/avatar/AvatarGitHubParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/api/v1/avatar/AvatarGitHubParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.api.v1.avatar +package top.fatweb.oxygen.api.param.api.v1.avatar import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Max diff --git a/src/main/kotlin/top/fatweb/api/param/permission/ForgetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/ForgetParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/permission/ForgetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/ForgetParam.kt index 97398b9..05091d2 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/ForgetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/ForgetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission +package top.fatweb.oxygen.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/LoginParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/LoginParam.kt index 163a849..2c0da76 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/LoginParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission +package top.fatweb.oxygen.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/RegisterParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/RegisterParam.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/param/permission/RegisterParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/RegisterParam.kt index 731cb6f..e32ee3a 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/RegisterParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/RegisterParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission +package top.fatweb.oxygen.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/RetrieveParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/RetrieveParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/permission/RetrieveParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/RetrieveParam.kt index cbd41b9..f3571d5 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/RetrieveParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/RetrieveParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission +package top.fatweb.oxygen.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/VerifyParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/VerifyParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/permission/VerifyParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/VerifyParam.kt index a9670d1..c88e333 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/VerifyParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/VerifyParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission +package top.fatweb.oxygen.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupAddParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupAddParam.kt index b3471a4..6f24d3d 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.group +package top.fatweb.oxygen.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupDeleteParam.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupDeleteParam.kt index 2e2dc54..f7ebe22 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.group +package top.fatweb.oxygen.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupGetParam.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupGetParam.kt index cbaf63e..f494191 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupGetParam.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.param.permission.group +package top.fatweb.oxygen.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.param.PageSortParam +import top.fatweb.oxygen.api.param.PageSortParam /** * Get group parameters diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateParam.kt index d02d4e1..937679c 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.group +package top.fatweb.oxygen.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateStatusParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateStatusParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateStatusParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateStatusParam.kt index 9a7affb..2676a93 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateStatusParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/group/GroupUpdateStatusParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.group +package top.fatweb.oxygen.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotNull diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleAddParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleAddParam.kt index a44f703..ab093c5 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.role +package top.fatweb.oxygen.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleDeleteParam.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleDeleteParam.kt index 74a3b44..af400da 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.role +package top.fatweb.oxygen.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleGetParam.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleGetParam.kt index 469720b..929ba19 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleGetParam.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.param.permission.role +package top.fatweb.oxygen.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.param.PageSortParam +import top.fatweb.oxygen.api.param.PageSortParam /** * Get role parameters diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateParam.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateParam.kt index c123665..c24704f 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.role +package top.fatweb.oxygen.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateStatusParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateStatusParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateStatusParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateStatusParam.kt index fa0f135..5fda3c1 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateStatusParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/role/RoleUpdateStatusParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.role +package top.fatweb.oxygen.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotNull diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserAddParam.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserAddParam.kt index a2e227b..52b941a 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.user +package top.fatweb.oxygen.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserDeleteParam.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserDeleteParam.kt index eba2828..486d39c 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.user +package top.fatweb.oxygen.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserGetParam.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserGetParam.kt index f06548b..93c4fa0 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserGetParam.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.param.permission.user +package top.fatweb.oxygen.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.param.PageSortParam +import top.fatweb.oxygen.api.param.PageSortParam /** * Get user parameters diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdateParam.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdateParam.kt index 96afb83..fb7298b 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.user +package top.fatweb.oxygen.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdatePasswordParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdatePasswordParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdatePasswordParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdatePasswordParam.kt index 561ba34..76e8413 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdatePasswordParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/permission/user/UserUpdatePasswordParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.permission.user +package top.fatweb.oxygen.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/system/ActiveInfoGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/ActiveInfoGetParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/system/ActiveInfoGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/ActiveInfoGetParam.kt index ce8b7ac..51e45b9 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/ActiveInfoGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/ActiveInfoGetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import com.baomidou.mybatisplus.annotation.EnumValue import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/main/kotlin/top/fatweb/api/param/system/BaseSettingsParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/BaseSettingsParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/system/BaseSettingsParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/BaseSettingsParam.kt index 6d8bb4c..eaf5226 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/BaseSettingsParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/BaseSettingsParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/system/MailSendParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSendParam.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/param/system/MailSendParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSendParam.kt index e408664..08ffd20 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/MailSendParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSendParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/system/MailSettingsParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSettingsParam.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/param/system/MailSettingsParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSettingsParam.kt index 0446b78..d56ca69 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/MailSettingsParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/MailSettingsParam.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.settings.MailSecurityType +import top.fatweb.oxygen.api.settings.MailSecurityType /** * Mail settings parameters diff --git a/src/main/kotlin/top/fatweb/api/param/system/OnlineInfoGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/OnlineInfoGetParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/system/OnlineInfoGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/OnlineInfoGetParam.kt index 557be14..1e42833 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/OnlineInfoGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/OnlineInfoGetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import com.baomidou.mybatisplus.annotation.EnumValue import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt b/src/main/kotlin/top/fatweb/oxygen/api/param/system/SysLogGetParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt rename to src/main/kotlin/top/fatweb/oxygen/api/param/system/SysLogGetParam.kt index 9d22674..f948f87 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/param/system/SysLogGetParam.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.param.system +package top.fatweb.oxygen.api.param.system import io.swagger.v3.oas.annotations.media.Schema import org.springframework.format.annotation.DateTimeFormat -import top.fatweb.api.param.PageSortParam +import top.fatweb.oxygen.api.param.PageSortParam import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/properties/AdminProperties.kt b/src/main/kotlin/top/fatweb/oxygen/api/properties/AdminProperties.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/properties/AdminProperties.kt rename to src/main/kotlin/top/fatweb/oxygen/api/properties/AdminProperties.kt index 0067b89..4638122 100644 --- a/src/main/kotlin/top/fatweb/api/properties/AdminProperties.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/properties/AdminProperties.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.properties +package top.fatweb.oxygen.api.properties import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component @@ -42,5 +42,5 @@ object AdminProperties { * @author FatttSnake, fatttsnake@gmail.com * @since 1.0.0 */ - var email = "admin@fatweb.top" + var email = "admin@mail.com" } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/properties/FlywayProperties.kt b/src/main/kotlin/top/fatweb/oxygen/api/properties/FlywayProperties.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/properties/FlywayProperties.kt rename to src/main/kotlin/top/fatweb/oxygen/api/properties/FlywayProperties.kt index 9a2a31e..c6f857e 100644 --- a/src/main/kotlin/top/fatweb/api/properties/FlywayProperties.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/properties/FlywayProperties.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.properties +package top.fatweb.oxygen.api.properties import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component diff --git a/src/main/kotlin/top/fatweb/api/properties/SecurityProperties.kt b/src/main/kotlin/top/fatweb/oxygen/api/properties/SecurityProperties.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/properties/SecurityProperties.kt rename to src/main/kotlin/top/fatweb/oxygen/api/properties/SecurityProperties.kt index ed079bf..fe70e6d 100644 --- a/src/main/kotlin/top/fatweb/api/properties/SecurityProperties.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/properties/SecurityProperties.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.properties +package top.fatweb.oxygen.api.properties import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component @@ -51,7 +51,7 @@ object SecurityProperties { * @author FatttSnake, fatttsnake@gmail.com * @since 1.0.0 */ - var jwtKey = "FatWeb" + var jwtKey = "Oxygen" /** * Issuer of JWT @@ -59,7 +59,7 @@ object SecurityProperties { * @author FatttSnake, fatttsnake@gmail.com * @since 1.0.0 */ - var jwtIssuer = "FatWeb" + var jwtIssuer = "Oxygen" /** * TTL of redis diff --git a/src/main/kotlin/top/fatweb/api/properties/ServerProperties.kt b/src/main/kotlin/top/fatweb/oxygen/api/properties/ServerProperties.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/properties/ServerProperties.kt rename to src/main/kotlin/top/fatweb/oxygen/api/properties/ServerProperties.kt index e9b3c1b..4912682 100644 --- a/src/main/kotlin/top/fatweb/api/properties/ServerProperties.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/properties/ServerProperties.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.properties +package top.fatweb.oxygen.api.properties import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component @@ -39,7 +39,7 @@ object ServerProperties { * @since 1.0.0 */ lateinit var buildTime: String - + /** * Startup time * diff --git a/src/main/kotlin/top/fatweb/api/service/api/v1/IAvatarService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/IAvatarService.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/service/api/v1/IAvatarService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/IAvatarService.kt index c5659de..46520c9 100644 --- a/src/main/kotlin/top/fatweb/api/service/api/v1/IAvatarService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/IAvatarService.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.service.api.v1 +package top.fatweb.oxygen.api.service.api.v1 -import top.fatweb.api.param.api.v1.avatar.AvatarBaseParam -import top.fatweb.api.param.api.v1.avatar.AvatarGitHubParam -import top.fatweb.api.vo.api.v1.avatar.AvatarBase64Vo +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarBaseParam +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarGitHubParam +import top.fatweb.oxygen.api.vo.api.v1.avatar.AvatarBase64Vo /** * Avatar service interface diff --git a/src/main/kotlin/top/fatweb/api/service/api/v1/impl/AvatarServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/service/api/v1/impl/AvatarServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt index d209d3b..b117db4 100644 --- a/src/main/kotlin/top/fatweb/api/service/api/v1/impl/AvatarServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt @@ -1,16 +1,16 @@ -package top.fatweb.api.service.api.v1.impl +package top.fatweb.oxygen.api.service.api.v1.impl import org.springframework.stereotype.Service -import top.fatweb.api.param.api.v1.avatar.AvatarBaseParam -import top.fatweb.api.param.api.v1.avatar.AvatarGitHubParam -import top.fatweb.api.service.api.v1.IAvatarService -import top.fatweb.api.util.NumberUtil -import top.fatweb.api.vo.api.v1.avatar.AvatarBase64Vo import top.fatweb.avatargenerator.GitHubAvatar import top.fatweb.avatargenerator.IdenticonAvatar import top.fatweb.avatargenerator.SquareAvatar import top.fatweb.avatargenerator.TriangleAvatar import top.fatweb.avatargenerator.layer.background.ColorPaintBackgroundLayer +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarBaseParam +import top.fatweb.oxygen.api.param.api.v1.avatar.AvatarGitHubParam +import top.fatweb.oxygen.api.service.api.v1.IAvatarService +import top.fatweb.oxygen.api.util.NumberUtil +import top.fatweb.oxygen.api.vo.api.v1.avatar.AvatarBase64Vo import java.awt.Color import kotlin.io.encoding.Base64 import kotlin.io.encoding.ExperimentalEncodingApi diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IAuthenticationService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IAuthenticationService.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/service/permission/IAuthenticationService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IAuthenticationService.kt index 050d2f3..557a8b8 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IAuthenticationService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IAuthenticationService.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import jakarta.servlet.http.HttpServletRequest -import top.fatweb.api.entity.permission.User -import top.fatweb.api.param.permission.* -import top.fatweb.api.vo.permission.LoginVo -import top.fatweb.api.vo.permission.RegisterVo -import top.fatweb.api.vo.permission.TokenVo +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.param.permission.* +import top.fatweb.oxygen.api.vo.permission.LoginVo +import top.fatweb.oxygen.api.vo.permission.RegisterVo +import top.fatweb.oxygen.api.vo.permission.TokenVo /** * Authentication service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IFuncService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IFuncService.kt similarity index 69% rename from src/main/kotlin/top/fatweb/api/service/permission/IFuncService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IFuncService.kt index f482566..36af68a 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IFuncService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IFuncService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Func +import top.fatweb.oxygen.api.entity.permission.Func /** * Function service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IGroupService.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IGroupService.kt index 4660759..761ef8d 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IGroupService.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Group -import top.fatweb.api.param.permission.group.* -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.GroupVo -import top.fatweb.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.entity.permission.Group +import top.fatweb.oxygen.api.param.permission.group.* +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo /** * Group service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IMenuService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IMenuService.kt similarity index 69% rename from src/main/kotlin/top/fatweb/api/service/permission/IMenuService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IMenuService.kt index ae2216b..967d56a 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IMenuService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IMenuService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Menu +import top.fatweb.oxygen.api.entity.permission.Menu /** * Menu service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IModuleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IModuleService.kt similarity index 69% rename from src/main/kotlin/top/fatweb/api/service/permission/IModuleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IModuleService.kt index f2a06bf..431a84d 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IModuleService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IModuleService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Module +import top.fatweb.oxygen.api.entity.permission.Module /** * Module service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IOperationService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IOperationService.kt similarity index 70% rename from src/main/kotlin/top/fatweb/api/service/permission/IOperationService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IOperationService.kt index fb36082..a468550 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IOperationService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IOperationService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Operation +import top.fatweb.oxygen.api.entity.permission.Operation /** * Operation service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IPowerRoleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/service/permission/IPowerRoleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt index 7cd4995..22787b0 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IPowerRoleService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.PowerRole +import top.fatweb.oxygen.api.entity.permission.PowerRole /** * Power role intermediate service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IPowerService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerService.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/service/permission/IPowerService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerService.kt index 8e8611a..b5a34cd 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IPowerService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerService.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Power -import top.fatweb.api.vo.permission.PowerSetVo +import top.fatweb.oxygen.api.entity.permission.Power +import top.fatweb.oxygen.api.vo.permission.PowerSetVo /** * Power service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IRoleGroupService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/service/permission/IRoleGroupService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt index 7ccddbc..0465468 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IRoleGroupService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.RoleGroup +import top.fatweb.oxygen.api.entity.permission.RoleGroup /** * Role group intermediate service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleService.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleService.kt index 8f944fa..c12c6d8 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleService.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.permission.role.* -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.RoleVo -import top.fatweb.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.entity.permission.Role +import top.fatweb.oxygen.api.param.permission.role.* +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo /** * Role service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IUserGroupService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/service/permission/IUserGroupService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt index 8ff45d2..ec8765f 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IUserGroupService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.UserGroup +import top.fatweb.oxygen.api.entity.permission.UserGroup /** * User group intermediate service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IUserInfoService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserInfoService.kt similarity index 70% rename from src/main/kotlin/top/fatweb/api/service/permission/IUserInfoService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserInfoService.kt index 4455d05..c2b29f3 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IUserInfoService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserInfoService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.entity.permission.UserInfo /** * User information service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IUserRoleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/service/permission/IUserRoleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt index 1b1ff58..debf680 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IUserRoleService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.UserRole +import top.fatweb.oxygen.api.entity.permission.UserRole /** * User role intermediate service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserService.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserService.kt index a208420..fe38623 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserService.kt @@ -1,13 +1,13 @@ -package top.fatweb.api.service.permission +package top.fatweb.oxygen.api.service.permission import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.permission.User -import top.fatweb.api.param.permission.user.* -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.UserWithInfoVo -import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo -import top.fatweb.api.vo.permission.UserWithPowerInfoVo -import top.fatweb.api.vo.permission.UserWithRoleInfoVo +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.param.permission.user.* +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.UserWithInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithPasswordRoleInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithPowerInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithRoleInfoVo /** * User service interface diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/AuthenticationServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/AuthenticationServiceImpl.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/AuthenticationServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/AuthenticationServiceImpl.kt index 63a178d..2bb8916 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/AuthenticationServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/AuthenticationServiceImpl.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import com.baomidou.mybatisplus.extension.kotlin.KtUpdateWrapper @@ -13,27 +13,27 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import top.fatweb.api.annotation.EventLogRecord -import top.fatweb.api.entity.permission.LoginUser -import top.fatweb.api.entity.permission.User -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.entity.system.EventLog -import top.fatweb.api.exception.* -import top.fatweb.api.param.permission.* -import top.fatweb.api.properties.SecurityProperties -import top.fatweb.api.service.api.v1.IAvatarService -import top.fatweb.api.service.permission.IAuthenticationService -import top.fatweb.api.service.permission.IUserInfoService -import top.fatweb.api.service.permission.IUserService -import top.fatweb.api.settings.BaseSettings -import top.fatweb.api.settings.SettingsOperator -import top.fatweb.api.util.JwtUtil -import top.fatweb.api.util.MailUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.permission.LoginVo -import top.fatweb.api.vo.permission.RegisterVo -import top.fatweb.api.vo.permission.TokenVo +import top.fatweb.oxygen.api.annotation.EventLogRecord +import top.fatweb.oxygen.api.entity.permission.LoginUser +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.entity.system.EventLog +import top.fatweb.oxygen.api.exception.* +import top.fatweb.oxygen.api.param.permission.* +import top.fatweb.oxygen.api.properties.SecurityProperties +import top.fatweb.oxygen.api.service.api.v1.IAvatarService +import top.fatweb.oxygen.api.service.permission.IAuthenticationService +import top.fatweb.oxygen.api.service.permission.IUserInfoService +import top.fatweb.oxygen.api.service.permission.IUserService +import top.fatweb.oxygen.api.settings.BaseSettings +import top.fatweb.oxygen.api.settings.SettingsOperator +import top.fatweb.oxygen.api.util.JwtUtil +import top.fatweb.oxygen.api.util.MailUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.permission.LoginVo +import top.fatweb.oxygen.api.vo.permission.RegisterVo +import top.fatweb.oxygen.api.vo.permission.TokenVo import java.io.StringWriter import java.time.Instant import java.time.LocalDateTime @@ -174,7 +174,10 @@ class AuthenticationServiceImpl( put("ipAddress", ip) put( "retrieveUrl", - SettingsOperator.getAppValue(BaseSettings::retrieveUrl, "http://localhost/retrieve?code=\${retrieveCode}") + SettingsOperator.getAppValue( + BaseSettings::retrieveUrl, + "http://localhost/retrieve?code=\${retrieveCode}" + ) .replace( Regex("(?<=([^\\\\]))\\$\\{retrieveCode}"), code ) diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/FuncServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/FuncServiceImpl.kt similarity index 62% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/FuncServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/FuncServiceImpl.kt index e46d5eb..cbfbba6 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/FuncServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/FuncServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.Func -import top.fatweb.api.mapper.permission.FuncMapper -import top.fatweb.api.service.permission.IFuncService +import top.fatweb.oxygen.api.entity.permission.Func +import top.fatweb.oxygen.api.mapper.permission.FuncMapper +import top.fatweb.oxygen.api.service.permission.IFuncService /** * Function service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt index 63a9781..ae197c4 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt @@ -1,24 +1,24 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import top.fatweb.api.converter.permission.GroupConverter -import top.fatweb.api.entity.permission.Group -import top.fatweb.api.entity.permission.RoleGroup -import top.fatweb.api.mapper.permission.GroupMapper -import top.fatweb.api.param.permission.group.* -import top.fatweb.api.service.permission.IGroupService -import top.fatweb.api.service.permission.IRoleGroupService -import top.fatweb.api.service.permission.IUserService -import top.fatweb.api.util.PageUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.GroupVo -import top.fatweb.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.converter.permission.GroupConverter +import top.fatweb.oxygen.api.entity.permission.Group +import top.fatweb.oxygen.api.entity.permission.RoleGroup +import top.fatweb.oxygen.api.mapper.permission.GroupMapper +import top.fatweb.oxygen.api.param.permission.group.* +import top.fatweb.oxygen.api.service.permission.IGroupService +import top.fatweb.oxygen.api.service.permission.IRoleGroupService +import top.fatweb.oxygen.api.service.permission.IUserService +import top.fatweb.oxygen.api.util.PageUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.GroupWithRoleVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo /** * Group service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/MenuServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/MenuServiceImpl.kt similarity index 61% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/MenuServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/MenuServiceImpl.kt index d4de1e0..3c85e99 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/MenuServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/MenuServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.Menu -import top.fatweb.api.mapper.permission.MenuMapper -import top.fatweb.api.service.permission.IMenuService +import top.fatweb.oxygen.api.entity.permission.Menu +import top.fatweb.oxygen.api.mapper.permission.MenuMapper +import top.fatweb.oxygen.api.service.permission.IMenuService /** * Menu service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/ModuleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/ModuleServiceImpl.kt similarity index 62% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/ModuleServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/ModuleServiceImpl.kt index ef2a479..23f0886 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/ModuleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/ModuleServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.Module -import top.fatweb.api.mapper.permission.ModuleMapper -import top.fatweb.api.service.permission.IModuleService +import top.fatweb.oxygen.api.entity.permission.Module +import top.fatweb.oxygen.api.mapper.permission.ModuleMapper +import top.fatweb.oxygen.api.service.permission.IModuleService /** * Module service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/OperationServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/OperationServiceImpl.kt similarity index 62% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/OperationServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/OperationServiceImpl.kt index e331784..241efa9 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/OperationServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/OperationServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.Operation -import top.fatweb.api.mapper.permission.OperationMapper -import top.fatweb.api.service.permission.IOperationService +import top.fatweb.oxygen.api.entity.permission.Operation +import top.fatweb.oxygen.api.mapper.permission.OperationMapper +import top.fatweb.oxygen.api.service.permission.IOperationService /** * Operation service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/PowerRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt similarity index 63% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/PowerRoleServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt index 89e2f1f..5fa9d70 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/PowerRoleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.PowerRole -import top.fatweb.api.mapper.permission.PowerRoleMapper -import top.fatweb.api.service.permission.IPowerRoleService +import top.fatweb.oxygen.api.entity.permission.PowerRole +import top.fatweb.oxygen.api.mapper.permission.PowerRoleMapper +import top.fatweb.oxygen.api.service.permission.IPowerRoleService /** * Power role intermediate service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/PowerServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerServiceImpl.kt similarity index 73% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/PowerServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerServiceImpl.kt index 4fca03a..d709f72 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/PowerServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerServiceImpl.kt @@ -1,12 +1,12 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.converter.permission.PowerConverter -import top.fatweb.api.entity.permission.Power -import top.fatweb.api.entity.permission.PowerSet -import top.fatweb.api.mapper.permission.PowerMapper -import top.fatweb.api.service.permission.* +import top.fatweb.oxygen.api.converter.permission.PowerConverter +import top.fatweb.oxygen.api.entity.permission.Power +import top.fatweb.oxygen.api.entity.permission.PowerSet +import top.fatweb.oxygen.api.mapper.permission.PowerMapper +import top.fatweb.oxygen.api.service.permission.* /** * Power service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt similarity index 63% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/RoleGroupServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt index 5d4e947..897614c 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleGroupServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.RoleGroup -import top.fatweb.api.mapper.permission.RoleGroupMapper -import top.fatweb.api.service.permission.IRoleGroupService +import top.fatweb.oxygen.api.entity.permission.RoleGroup +import top.fatweb.oxygen.api.mapper.permission.RoleGroupMapper +import top.fatweb.oxygen.api.service.permission.IRoleGroupService /** * Role group intermediate service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt index db077d6..ea8a5b6 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt @@ -1,22 +1,22 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import top.fatweb.api.converter.permission.RoleConverter -import top.fatweb.api.entity.permission.PowerRole -import top.fatweb.api.entity.permission.Role -import top.fatweb.api.mapper.permission.RoleMapper -import top.fatweb.api.param.permission.role.* -import top.fatweb.api.service.permission.* -import top.fatweb.api.util.PageUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.base.RoleVo -import top.fatweb.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.converter.permission.RoleConverter +import top.fatweb.oxygen.api.entity.permission.PowerRole +import top.fatweb.oxygen.api.entity.permission.Role +import top.fatweb.oxygen.api.mapper.permission.RoleMapper +import top.fatweb.oxygen.api.param.permission.role.* +import top.fatweb.oxygen.api.service.permission.* +import top.fatweb.oxygen.api.util.PageUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.RoleWithPowerVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo /** * Role service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserDetailsServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserDetailsServiceImpl.kt similarity index 79% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/UserDetailsServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserDetailsServiceImpl.kt index f92d344..9aa4351 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserDetailsServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserDetailsServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import org.springframework.security.core.userdetails.UserDetails import org.springframework.security.core.userdetails.UserDetailsService import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.LoginUser -import top.fatweb.api.service.permission.IUserService +import top.fatweb.oxygen.api.entity.permission.LoginUser +import top.fatweb.oxygen.api.service.permission.IUserService /** * User details service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt similarity index 63% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/UserGroupServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt index 30432eb..5664ba4 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserGroupServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.UserGroup -import top.fatweb.api.mapper.permission.UserGroupMapper -import top.fatweb.api.service.permission.IUserGroupService +import top.fatweb.oxygen.api.entity.permission.UserGroup +import top.fatweb.oxygen.api.mapper.permission.UserGroupMapper +import top.fatweb.oxygen.api.service.permission.IUserGroupService /** * User group intermediate service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserInfoServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserInfoServiceImpl.kt similarity index 62% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/UserInfoServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserInfoServiceImpl.kt index fce770a..c9ceb1e 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserInfoServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserInfoServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.mapper.permission.UserInfoMapper -import top.fatweb.api.service.permission.IUserInfoService +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.mapper.permission.UserInfoMapper +import top.fatweb.oxygen.api.service.permission.IUserInfoService /** * User information service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt similarity index 62% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/UserRoleServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt index ebe3d9d..b42ba8b 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserRoleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.permission.UserRole -import top.fatweb.api.mapper.permission.UserRoleMapper -import top.fatweb.api.service.permission.IUserRoleService +import top.fatweb.oxygen.api.entity.permission.UserRole +import top.fatweb.oxygen.api.mapper.permission.UserRoleMapper +import top.fatweb.oxygen.api.service.permission.IUserRoleService /** * User role intermediate service implement diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt index e8c57bd..6a8595e 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.service.permission.impl +package top.fatweb.oxygen.api.service.permission.impl import com.baomidou.dynamic.datasource.annotation.DS import com.baomidou.mybatisplus.core.metadata.OrderItem @@ -10,22 +10,22 @@ import org.springframework.security.access.AccessDeniedException import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import top.fatweb.api.converter.permission.UserConverter -import top.fatweb.api.entity.permission.User -import top.fatweb.api.entity.permission.UserGroup -import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.entity.permission.UserRole -import top.fatweb.api.exception.NoRecordFoundException -import top.fatweb.api.mapper.permission.UserMapper -import top.fatweb.api.param.permission.user.* -import top.fatweb.api.service.permission.* -import top.fatweb.api.util.PageUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.util.StrUtil -import top.fatweb.api.util.WebUtil -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo -import top.fatweb.api.vo.permission.UserWithRoleInfoVo +import top.fatweb.oxygen.api.converter.permission.UserConverter +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.entity.permission.UserGroup +import top.fatweb.oxygen.api.entity.permission.UserInfo +import top.fatweb.oxygen.api.entity.permission.UserRole +import top.fatweb.oxygen.api.exception.NoRecordFoundException +import top.fatweb.oxygen.api.mapper.permission.UserMapper +import top.fatweb.oxygen.api.param.permission.user.* +import top.fatweb.oxygen.api.service.permission.* +import top.fatweb.oxygen.api.util.PageUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.util.StrUtil +import top.fatweb.oxygen.api.util.WebUtil +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.permission.UserWithPasswordRoleInfoVo +import top.fatweb.oxygen.api.vo.permission.UserWithRoleInfoVo import java.time.LocalDateTime import java.time.ZoneOffset import java.util.* diff --git a/src/main/kotlin/top/fatweb/api/service/system/IEventLogService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IEventLogService.kt similarity index 64% rename from src/main/kotlin/top/fatweb/api/service/system/IEventLogService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/IEventLogService.kt index ae45841..9925086 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/IEventLogService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IEventLogService.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.service.system +package top.fatweb.oxygen.api.service.system import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.annotation.EventLogRecord -import top.fatweb.api.entity.system.EventLog +import top.fatweb.oxygen.api.annotation.EventLogRecord +import top.fatweb.oxygen.api.entity.system.EventLog /** * Event log service interface diff --git a/src/main/kotlin/top/fatweb/api/service/system/ISettingsService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/ISettingsService.kt similarity index 80% rename from src/main/kotlin/top/fatweb/api/service/system/ISettingsService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/ISettingsService.kt index 0e8d29d..0e7eee6 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/ISettingsService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/ISettingsService.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.system +package top.fatweb.oxygen.api.service.system -import top.fatweb.api.param.system.BaseSettingsParam -import top.fatweb.api.param.system.MailSendParam -import top.fatweb.api.param.system.MailSettingsParam -import top.fatweb.api.vo.system.BaseSettingsVo -import top.fatweb.api.vo.system.MailSettingsVo +import top.fatweb.oxygen.api.param.system.BaseSettingsParam +import top.fatweb.oxygen.api.param.system.MailSendParam +import top.fatweb.oxygen.api.param.system.MailSettingsParam +import top.fatweb.oxygen.api.vo.system.BaseSettingsVo +import top.fatweb.oxygen.api.vo.system.MailSettingsVo /** * Settings service interface diff --git a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsLogService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsLogService.kt similarity index 68% rename from src/main/kotlin/top/fatweb/api/service/system/IStatisticsLogService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsLogService.kt index e6cb5de..571149a 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsLogService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsLogService.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.service.system +package top.fatweb.oxygen.api.service.system import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.system.StatisticsLog +import top.fatweb.oxygen.api.entity.system.StatisticsLog /** * Statistics log service interface diff --git a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsService.kt similarity index 87% rename from src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsService.kt index b28ee1d..c698c8d 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/IStatisticsService.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.service.system +package top.fatweb.oxygen.api.service.system -import top.fatweb.api.param.system.ActiveInfoGetParam -import top.fatweb.api.param.system.OnlineInfoGetParam -import top.fatweb.api.vo.system.* +import top.fatweb.oxygen.api.param.system.ActiveInfoGetParam +import top.fatweb.oxygen.api.param.system.OnlineInfoGetParam +import top.fatweb.oxygen.api.vo.system.* /** * Statistics service interface @@ -50,7 +50,7 @@ interface IStatisticsService { * @see StorageInfoVo */ fun storage(): StorageInfoVo - + /** * Get the history of online users information * diff --git a/src/main/kotlin/top/fatweb/api/service/system/ISysLogService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/ISysLogService.kt similarity index 71% rename from src/main/kotlin/top/fatweb/api/service/system/ISysLogService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/ISysLogService.kt index 034450d..16430ca 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/ISysLogService.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/ISysLogService.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.service.system +package top.fatweb.oxygen.api.service.system import com.baomidou.mybatisplus.extension.service.IService -import top.fatweb.api.entity.system.SysLog -import top.fatweb.api.param.system.SysLogGetParam -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.system.SysLogVo +import top.fatweb.oxygen.api.entity.system.SysLog +import top.fatweb.oxygen.api.param.system.SysLogGetParam +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.system.SysLogVo /** * System log service interface diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/EventLogServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/EventLogServiceImpl.kt similarity index 77% rename from src/main/kotlin/top/fatweb/api/service/system/impl/EventLogServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/EventLogServiceImpl.kt index 0f7e7a2..845b1b6 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/EventLogServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/EventLogServiceImpl.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.service.system.impl +package top.fatweb.oxygen.api.service.system.impl import com.baomidou.dynamic.datasource.annotation.DS import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl @@ -7,10 +7,10 @@ import org.slf4j.LoggerFactory import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional -import top.fatweb.api.annotation.EventLogRecord -import top.fatweb.api.entity.system.EventLog -import top.fatweb.api.mapper.system.EventLogMapper -import top.fatweb.api.service.system.IEventLogService +import top.fatweb.oxygen.api.annotation.EventLogRecord +import top.fatweb.oxygen.api.entity.system.EventLog +import top.fatweb.oxygen.api.mapper.system.EventLogMapper +import top.fatweb.oxygen.api.service.system.IEventLogService @DS("sqlite") @Service diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/SettingsServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt similarity index 80% rename from src/main/kotlin/top/fatweb/api/service/system/impl/SettingsServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt index 6a1da9c..c107aa4 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/SettingsServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt @@ -1,18 +1,18 @@ -package top.fatweb.api.service.system.impl +package top.fatweb.oxygen.api.service.system.impl import org.springframework.stereotype.Service -import top.fatweb.api.param.system.BaseSettingsParam -import top.fatweb.api.param.system.MailSendParam -import top.fatweb.api.param.system.MailSettingsParam -import top.fatweb.api.properties.ServerProperties -import top.fatweb.api.service.system.ISettingsService -import top.fatweb.api.settings.BaseSettings -import top.fatweb.api.settings.MailSettings -import top.fatweb.api.settings.SettingsOperator -import top.fatweb.api.util.MailUtil -import top.fatweb.api.util.StrUtil -import top.fatweb.api.vo.system.BaseSettingsVo -import top.fatweb.api.vo.system.MailSettingsVo +import top.fatweb.oxygen.api.param.system.BaseSettingsParam +import top.fatweb.oxygen.api.param.system.MailSendParam +import top.fatweb.oxygen.api.param.system.MailSettingsParam +import top.fatweb.oxygen.api.properties.ServerProperties +import top.fatweb.oxygen.api.service.system.ISettingsService +import top.fatweb.oxygen.api.settings.BaseSettings +import top.fatweb.oxygen.api.settings.MailSettings +import top.fatweb.oxygen.api.settings.SettingsOperator +import top.fatweb.oxygen.api.util.MailUtil +import top.fatweb.oxygen.api.util.StrUtil +import top.fatweb.oxygen.api.vo.system.BaseSettingsVo +import top.fatweb.oxygen.api.vo.system.MailSettingsVo /** * Settings service implement diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsLogServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsLogServiceImpl.kt similarity index 55% rename from src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsLogServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsLogServiceImpl.kt index 212ceee..ada1265 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsLogServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsLogServiceImpl.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.service.system.impl +package top.fatweb.oxygen.api.service.system.impl import com.baomidou.dynamic.datasource.annotation.DS import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.entity.system.StatisticsLog -import top.fatweb.api.mapper.system.StatisticsLogMapper -import top.fatweb.api.service.system.IStatisticsLogService +import top.fatweb.oxygen.api.entity.system.StatisticsLog +import top.fatweb.oxygen.api.mapper.system.StatisticsLogMapper +import top.fatweb.oxygen.api.service.system.IStatisticsLogService @DS("sqlite") @Service diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt index 4100a69..e6394f8 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt @@ -1,22 +1,22 @@ -package top.fatweb.api.service.system.impl +package top.fatweb.oxygen.api.service.system.impl import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import org.springframework.stereotype.Service import oshi.SystemInfo import oshi.hardware.CentralProcessor -import top.fatweb.api.entity.system.EventLog -import top.fatweb.api.entity.system.StatisticsLog -import top.fatweb.api.param.system.ActiveInfoGetParam -import top.fatweb.api.param.system.OnlineInfoGetParam -import top.fatweb.api.properties.SecurityProperties -import top.fatweb.api.properties.ServerProperties -import top.fatweb.api.service.system.IEventLogService -import top.fatweb.api.service.system.IStatisticsLogService -import top.fatweb.api.service.system.IStatisticsService -import top.fatweb.api.util.ByteUtil -import top.fatweb.api.util.RedisUtil -import top.fatweb.api.vo.system.* +import top.fatweb.oxygen.api.entity.system.EventLog +import top.fatweb.oxygen.api.entity.system.StatisticsLog +import top.fatweb.oxygen.api.param.system.ActiveInfoGetParam +import top.fatweb.oxygen.api.param.system.OnlineInfoGetParam +import top.fatweb.oxygen.api.properties.SecurityProperties +import top.fatweb.oxygen.api.properties.ServerProperties +import top.fatweb.oxygen.api.service.system.IEventLogService +import top.fatweb.oxygen.api.service.system.IStatisticsLogService +import top.fatweb.oxygen.api.service.system.IStatisticsService +import top.fatweb.oxygen.api.util.ByteUtil +import top.fatweb.oxygen.api.util.RedisUtil +import top.fatweb.oxygen.api.vo.system.* import java.time.LocalDate import java.time.LocalDateTime import java.time.ZoneOffset @@ -190,7 +190,7 @@ class StatisticsServiceImpl( return OnlineInfoVo( current = redisUtil.keys("${SecurityProperties.jwtIssuer}_login_*") - .distinctBy { Regex("FatWeb_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull(1) }.size.toLong(), + .distinctBy { Regex("${SecurityProperties.jwtIssuer}_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull(1) }.size.toLong(), history = history ) } diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/SysLogServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt similarity index 67% rename from src/main/kotlin/top/fatweb/api/service/system/impl/SysLogServiceImpl.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt index 6f596a9..2ad005f 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/SysLogServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.service.system.impl +package top.fatweb.oxygen.api.service.system.impl import com.baomidou.dynamic.datasource.annotation.DS import com.baomidou.mybatisplus.core.metadata.OrderItem @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service -import top.fatweb.api.converter.system.SysLogConverter -import top.fatweb.api.entity.permission.User -import top.fatweb.api.entity.system.SysLog -import top.fatweb.api.mapper.system.SysLogMapper -import top.fatweb.api.param.system.SysLogGetParam -import top.fatweb.api.service.permission.IUserService -import top.fatweb.api.service.system.ISysLogService -import top.fatweb.api.util.PageUtil -import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.system.SysLogVo +import top.fatweb.oxygen.api.converter.system.SysLogConverter +import top.fatweb.oxygen.api.entity.permission.User +import top.fatweb.oxygen.api.entity.system.SysLog +import top.fatweb.oxygen.api.mapper.system.SysLogMapper +import top.fatweb.oxygen.api.param.system.SysLogGetParam +import top.fatweb.oxygen.api.service.permission.IUserService +import top.fatweb.oxygen.api.service.system.ISysLogService +import top.fatweb.oxygen.api.util.PageUtil +import top.fatweb.oxygen.api.vo.PageVo +import top.fatweb.oxygen.api.vo.system.SysLogVo /** * System log service implement @@ -52,13 +52,14 @@ class SysLogServiceImpl( if (sysLogIPage.records.isNotEmpty()) { val userIds = sysLogIPage.records.map { it.operateUserId } - userService.list(KtQueryWrapper(User()).select(User::id, User::username).`in`(User::id, userIds)).forEach { user -> - sysLogIPage.records.forEach { - if (it.operateUserId == user.id) { - it.operateUsername = user.username + userService.list(KtQueryWrapper(User()).select(User::id, User::username).`in`(User::id, userIds)) + .forEach { user -> + sysLogIPage.records.forEach { + if (it.operateUserId == user.id) { + it.operateUsername = user.username + } } } - } } return SysLogConverter.sysLogPageToSysLogPageVo(sysLogIPage) diff --git a/src/main/kotlin/top/fatweb/api/settings/BaseSettings.kt b/src/main/kotlin/top/fatweb/oxygen/api/settings/BaseSettings.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/settings/BaseSettings.kt rename to src/main/kotlin/top/fatweb/oxygen/api/settings/BaseSettings.kt index b1479db..4de70bf 100644 --- a/src/main/kotlin/top/fatweb/api/settings/BaseSettings.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/settings/BaseSettings.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.settings +package top.fatweb.oxygen.api.settings import com.fasterxml.jackson.annotation.JsonInclude diff --git a/src/main/kotlin/top/fatweb/api/settings/MailSecurityType.kt b/src/main/kotlin/top/fatweb/oxygen/api/settings/MailSecurityType.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/settings/MailSecurityType.kt rename to src/main/kotlin/top/fatweb/oxygen/api/settings/MailSecurityType.kt index 7b2666d..ede4118 100644 --- a/src/main/kotlin/top/fatweb/api/settings/MailSecurityType.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/settings/MailSecurityType.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.settings +package top.fatweb.oxygen.api.settings import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/main/kotlin/top/fatweb/api/settings/MailSettings.kt b/src/main/kotlin/top/fatweb/oxygen/api/settings/MailSettings.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/settings/MailSettings.kt rename to src/main/kotlin/top/fatweb/oxygen/api/settings/MailSettings.kt index 4c0c0f2..5c2fa27 100644 --- a/src/main/kotlin/top/fatweb/api/settings/MailSettings.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/settings/MailSettings.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.settings +package top.fatweb.oxygen.api.settings import com.fasterxml.jackson.annotation.JsonInclude diff --git a/src/main/kotlin/top/fatweb/api/settings/SettingsOperator.kt b/src/main/kotlin/top/fatweb/oxygen/api/settings/SettingsOperator.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/settings/SettingsOperator.kt rename to src/main/kotlin/top/fatweb/oxygen/api/settings/SettingsOperator.kt index 8f346a9..7388b72 100644 --- a/src/main/kotlin/top/fatweb/api/settings/SettingsOperator.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/settings/SettingsOperator.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.settings +package top.fatweb.oxygen.api.settings import com.fasterxml.jackson.databind.exc.MismatchedInputException import com.fasterxml.jackson.dataformat.yaml.YAMLMapper import com.fasterxml.jackson.module.kotlin.readValue -import top.fatweb.api.util.StrUtil +import top.fatweb.oxygen.api.util.StrUtil import java.io.File import java.io.IOException import kotlin.reflect.KMutableProperty1 @@ -114,7 +114,8 @@ object SettingsOperator { * @see KMutableProperty1 * @see BaseSettings */ - fun getAppValue(field: KMutableProperty1, default: V): V = systemSettings.base?.let(field) ?: default + fun getAppValue(field: KMutableProperty1, default: V): V = + systemSettings.base?.let(field) ?: default /** * Set mail settings value @@ -166,5 +167,6 @@ object SettingsOperator { * @see KMutableProperty1 * @see MailSettings */ - fun getMailValue(field: KMutableProperty1, default: V): V = systemSettings.mail?.let(field) ?: default + fun getMailValue(field: KMutableProperty1, default: V): V = + systemSettings.mail?.let(field) ?: default } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/settings/SystemSettings.kt b/src/main/kotlin/top/fatweb/oxygen/api/settings/SystemSettings.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/settings/SystemSettings.kt rename to src/main/kotlin/top/fatweb/oxygen/api/settings/SystemSettings.kt index d186a21..b15a9f7 100644 --- a/src/main/kotlin/top/fatweb/api/settings/SystemSettings.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/settings/SystemSettings.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.settings +package top.fatweb.oxygen.api.settings import com.fasterxml.jackson.annotation.JsonInclude diff --git a/src/main/kotlin/top/fatweb/api/util/ApiResponseMappingHandlerMapping.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt similarity index 90% rename from src/main/kotlin/top/fatweb/api/util/ApiResponseMappingHandlerMapping.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt index df7c23c..03f2bda 100644 --- a/src/main/kotlin/top/fatweb/api/util/ApiResponseMappingHandlerMapping.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import org.springframework.web.servlet.mvc.condition.RequestCondition import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping -import top.fatweb.api.annotation.ApiController +import top.fatweb.oxygen.api.annotation.ApiController import java.lang.reflect.Method /** diff --git a/src/main/kotlin/top/fatweb/api/util/ApiVersionCondition.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/ApiVersionCondition.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/util/ApiVersionCondition.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/ApiVersionCondition.kt index b5a4a83..90411cf 100644 --- a/src/main/kotlin/top/fatweb/api/util/ApiVersionCondition.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/ApiVersionCondition.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import jakarta.servlet.http.HttpServletRequest import org.springframework.web.servlet.mvc.condition.RequestCondition diff --git a/src/main/kotlin/top/fatweb/api/util/ByteUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/ByteUtil.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/util/ByteUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/ByteUtil.kt index 5e2747a..c18a46e 100644 --- a/src/main/kotlin/top/fatweb/api/util/ByteUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/ByteUtil.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import kotlin.math.floor diff --git a/src/main/kotlin/top/fatweb/api/util/JwtUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/JwtUtil.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/util/JwtUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/JwtUtil.kt index 5d78472..a831d5f 100644 --- a/src/main/kotlin/top/fatweb/api/util/JwtUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/JwtUtil.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import com.auth0.jwt.JWT import com.auth0.jwt.algorithms.Algorithm import com.auth0.jwt.interfaces.DecodedJWT -import top.fatweb.api.properties.SecurityProperties +import top.fatweb.oxygen.api.properties.SecurityProperties import java.util.* import java.util.concurrent.TimeUnit import javax.crypto.spec.SecretKeySpec diff --git a/src/main/kotlin/top/fatweb/api/util/MailUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/MailUtil.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/util/MailUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/MailUtil.kt index bf1ba4a..d89d02c 100644 --- a/src/main/kotlin/top/fatweb/api/util/MailUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/MailUtil.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import org.springframework.mail.javamail.JavaMailSenderImpl import org.springframework.mail.javamail.MimeMessageHelper -import top.fatweb.api.exception.NoEmailConfigException -import top.fatweb.api.settings.MailSecurityType -import top.fatweb.api.settings.MailSettings -import top.fatweb.api.settings.SettingsOperator +import top.fatweb.oxygen.api.exception.NoEmailConfigException +import top.fatweb.oxygen.api.settings.MailSecurityType +import top.fatweb.oxygen.api.settings.MailSettings +import top.fatweb.oxygen.api.settings.SettingsOperator import java.util.* /** diff --git a/src/main/kotlin/top/fatweb/api/util/NumberUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/NumberUtil.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/util/NumberUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/NumberUtil.kt index 41bb694..48db483 100644 --- a/src/main/kotlin/top/fatweb/api/util/NumberUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/NumberUtil.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util /** * Number util diff --git a/src/main/kotlin/top/fatweb/api/util/PageUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/PageUtil.kt similarity index 85% rename from src/main/kotlin/top/fatweb/api/util/PageUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/PageUtil.kt index c785e09..4de5005 100644 --- a/src/main/kotlin/top/fatweb/api/util/PageUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/PageUtil.kt @@ -1,8 +1,8 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import com.baomidou.mybatisplus.core.metadata.OrderItem import com.baomidou.mybatisplus.extension.plugins.pagination.Page -import top.fatweb.api.param.PageSortParam +import top.fatweb.oxygen.api.param.PageSortParam /** * Page util @@ -23,7 +23,7 @@ object PageUtil { * @see PageSortParam * @see OrderItem */ - fun > setPageSort(pageSortParam: PageSortParam?, page: T, defaultOrder: OrderItem? = null) { + fun > setPageSort(pageSortParam: PageSortParam?, page: T, defaultOrder: OrderItem? = null) { if (pageSortParam?.sortField != null || pageSortParam?.sortOrder != null) { page.addOrder( if (pageSortParam.sortOrder?.startsWith( diff --git a/src/main/kotlin/top/fatweb/api/util/RedisUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/RedisUtil.kt similarity index 99% rename from src/main/kotlin/top/fatweb/api/util/RedisUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/RedisUtil.kt index 784fc1b..67dd99e 100644 --- a/src/main/kotlin/top/fatweb/api/util/RedisUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/RedisUtil.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import org.springframework.data.redis.core.BoundSetOperations import org.springframework.data.redis.core.RedisTemplate diff --git a/src/main/kotlin/top/fatweb/api/util/StrUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/StrUtil.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/util/StrUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/StrUtil.kt index e9787cd..bb356ad 100644 --- a/src/main/kotlin/top/fatweb/api/util/StrUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/StrUtil.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import java.security.MessageDigest diff --git a/src/main/kotlin/top/fatweb/api/util/WebUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/util/WebUtil.kt rename to src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt index 9fb1432..4e0838c 100644 --- a/src/main/kotlin/top/fatweb/api/util/WebUtil.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.util +package top.fatweb.oxygen.api.util import jakarta.servlet.http.HttpServletRequest import org.springframework.security.core.context.SecurityContextHolder -import top.fatweb.api.entity.permission.LoginUser -import top.fatweb.api.properties.SecurityProperties +import top.fatweb.oxygen.api.entity.permission.LoginUser +import top.fatweb.oxygen.api.properties.SecurityProperties /** * Web util diff --git a/src/main/kotlin/top/fatweb/api/vo/PageVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/PageVo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/vo/PageVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/PageVo.kt index 2f20efd..3990b58 100644 --- a/src/main/kotlin/top/fatweb/api/vo/PageVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/PageVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo +package top.fatweb.oxygen.api.vo import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/api/v1/avatar/AvatarBase64Vo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/api/v1/avatar/AvatarBase64Vo.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/vo/api/v1/avatar/AvatarBase64Vo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/api/v1/avatar/AvatarBase64Vo.kt index 9266517..34bb7bd 100644 --- a/src/main/kotlin/top/fatweb/api/vo/api/v1/avatar/AvatarBase64Vo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/api/v1/avatar/AvatarBase64Vo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.api.v1.avatar +package top.fatweb.oxygen.api.vo.api.v1.avatar import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/GroupWithRoleVo.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/GroupWithRoleVo.kt index 7675cbf..7d5c28b 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/GroupWithRoleVo.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.RoleVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/LoginVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/LoginVo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/vo/permission/LoginVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/LoginVo.kt index 8b130eb..b49a3fd 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/LoginVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/LoginVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/PowerSetVo.kt similarity index 80% rename from src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/PowerSetVo.kt index 270c800..b3be209 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/PowerSetVo.kt @@ -1,10 +1,10 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.FuncVo -import top.fatweb.api.vo.permission.base.MenuVo -import top.fatweb.api.vo.permission.base.ModuleVo -import top.fatweb.api.vo.permission.base.OperationVo +import top.fatweb.oxygen.api.vo.permission.base.FuncVo +import top.fatweb.oxygen.api.vo.permission.base.MenuVo +import top.fatweb.oxygen.api.vo.permission.base.ModuleVo +import top.fatweb.oxygen.api.vo.permission.base.OperationVo /** * Set of power value object diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/RegisterVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RegisterVo.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/vo/permission/RegisterVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RegisterVo.kt index 7561b0e..c33581b 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/RegisterVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RegisterVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RoleWithPowerVo.kt similarity index 89% rename from src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RoleWithPowerVo.kt index 3b072ce..d86b0cb 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/RoleWithPowerVo.kt @@ -1,12 +1,12 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.FuncVo -import top.fatweb.api.vo.permission.base.MenuVo -import top.fatweb.api.vo.permission.base.ModuleVo -import top.fatweb.api.vo.permission.base.OperationVo +import top.fatweb.oxygen.api.vo.permission.base.FuncVo +import top.fatweb.oxygen.api.vo.permission.base.MenuVo +import top.fatweb.oxygen.api.vo.permission.base.ModuleVo +import top.fatweb.oxygen.api.vo.permission.base.OperationVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/TokenVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/TokenVo.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/vo/permission/TokenVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/TokenVo.kt index 7e1b501..669ea6e 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/TokenVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/TokenVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithInfoVo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithInfoVo.kt index fc55b20..f1f14f7 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithInfoVo.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.UserInfoVo +import top.fatweb.oxygen.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPasswordRoleInfoVo.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPasswordRoleInfoVo.kt index 0fdc030..945bbdd 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPasswordRoleInfoVo.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.GroupVo -import top.fatweb.api.vo.permission.base.RoleVo -import top.fatweb.api.vo.permission.base.UserInfoVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo +import top.fatweb.oxygen.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPowerInfoVo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPowerInfoVo.kt index c8409c8..7fd460c 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithPowerInfoVo.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.* +import top.fatweb.oxygen.api.vo.permission.base.* import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithRoleInfoVo.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithRoleInfoVo.kt index 9f6b115..edc69db 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/UserWithRoleInfoVo.kt @@ -1,11 +1,11 @@ -package top.fatweb.api.vo.permission +package top.fatweb.oxygen.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.permission.base.GroupVo -import top.fatweb.api.vo.permission.base.RoleVo -import top.fatweb.api.vo.permission.base.UserInfoVo +import top.fatweb.oxygen.api.vo.permission.base.GroupVo +import top.fatweb.oxygen.api.vo.permission.base.RoleVo +import top.fatweb.oxygen.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/FuncVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/FuncVo.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/FuncVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/FuncVo.kt index 1e859ee..656723f 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/FuncVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/FuncVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/GroupVo.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/GroupVo.kt index 98baf46..2e3da98 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/GroupVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/MenuVo.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/MenuVo.kt index 7fb3b84..78b26bc 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/MenuVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/ModuleVo.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/ModuleVo.kt index a3d7fbe..2bb4af0 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/ModuleVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/OperationVo.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/OperationVo.kt index 0221c52..cb28ebb 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/OperationVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/RoleVo.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/RoleVo.kt index ffe5e60..2bcd01d 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/RoleVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/UserInfoVo.kt similarity index 94% rename from src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/UserInfoVo.kt index d3721b5..a6edbb8 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/permission/base/UserInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission.base +package top.fatweb.oxygen.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer @@ -56,7 +56,7 @@ data class UserInfoVo( * @author FatttSnake, fatttsnake@gmail.com * @since 1.0.0 */ - @Schema(description = "邮箱", example = "user@fatweb.top") + @Schema(description = "邮箱", example = "user@mail.com") val email: String?, /** diff --git a/src/main/kotlin/top/fatweb/api/vo/system/ActiveInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/ActiveInfoVo.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/vo/system/ActiveInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/ActiveInfoVo.kt index 65f4b60..1394ced 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/ActiveInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/ActiveInfoVo.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.system.ActiveInfoVo.HistoryVo +import top.fatweb.oxygen.api.vo.system.ActiveInfoVo.HistoryVo import java.time.LocalDate /** diff --git a/src/main/kotlin/top/fatweb/api/vo/system/BaseSettingsVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/BaseSettingsVo.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/vo/system/BaseSettingsVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/BaseSettingsVo.kt index 80193b6..1d70fd0 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/BaseSettingsVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/BaseSettingsVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/CpuInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/CpuInfoVo.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/vo/system/CpuInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/CpuInfoVo.kt index de37e4c..17e843a 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/CpuInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/CpuInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import com.fasterxml.jackson.annotation.JsonInclude import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/FileStoreInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/FileStoreInfoVo.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/vo/system/FileStoreInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/FileStoreInfoVo.kt index 0fa6320..e98b4c1 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/FileStoreInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/FileStoreInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/HardwareInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/HardwareInfoVo.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/vo/system/HardwareInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/HardwareInfoVo.kt index 8868595..8f1e6a8 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/HardwareInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/HardwareInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/MailSettingsVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/MailSettingsVo.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/vo/system/MailSettingsVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/MailSettingsVo.kt index 503d2c5..cf14853 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/MailSettingsVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/MailSettingsVo.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.settings.MailSecurityType +import top.fatweb.oxygen.api.settings.MailSecurityType /** * Mail settings value object diff --git a/src/main/kotlin/top/fatweb/api/vo/system/OnlineInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/OnlineInfoVo.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/vo/system/OnlineInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/OnlineInfoVo.kt index 8e043d5..4e76b70 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/OnlineInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/OnlineInfoVo.kt @@ -1,7 +1,7 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.vo.system.OnlineInfoVo.HistoryVo +import top.fatweb.oxygen.api.vo.system.OnlineInfoVo.HistoryVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/system/SettingsVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SettingsVo.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/vo/system/SettingsVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/SettingsVo.kt index 03cd0e8..7555b6b 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/SettingsVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SettingsVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/SoftwareInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SoftwareInfoVo.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/vo/system/SoftwareInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/SoftwareInfoVo.kt index 1caf962..6a96097 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/SoftwareInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SoftwareInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema import java.time.LocalDateTime diff --git a/src/main/kotlin/top/fatweb/api/vo/system/StorageInfoVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/StorageInfoVo.kt similarity index 98% rename from src/main/kotlin/top/fatweb/api/vo/system/StorageInfoVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/StorageInfoVo.kt index ca62096..2a467a0 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/StorageInfoVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/StorageInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/system/SysLogVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SysLogVo.kt similarity index 97% rename from src/main/kotlin/top/fatweb/api/vo/system/SysLogVo.kt rename to src/main/kotlin/top/fatweb/oxygen/api/vo/system/SysLogVo.kt index 28e5483..4c44028 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/SysLogVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SysLogVo.kt @@ -1,9 +1,9 @@ -package top.fatweb.api.vo.system +package top.fatweb.oxygen.api.vo.system import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema -import top.fatweb.api.entity.system.SysLog +import top.fatweb.oxygen.api.entity.system.SysLog import java.time.LocalDateTime /** diff --git a/src/main/resources/application-config-template.yml b/src/main/resources/application-config-template.yml index 1b87aa3..2ca9240 100644 --- a/src/main/resources/application-config-template.yml +++ b/src/main/resources/application-config-template.yml @@ -3,14 +3,14 @@ app: # username: admin # Username of administrator # password: admin # Default password of administrator # nickname: Administrator # Nickname of administrator -# email: admin@fatweb.top # Email of administrator +# email: admin@mail.com # Email of administrator security: # header-string: "Authorization" # The key of head to get token # token-prefix: "Bearer " # Token prefix # jwt-ttl: 2 # The life of token # jwt-ttl-unit: hours # Unit of life of token [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days] jwt-key: $uuid$ # Key to generate token (Only numbers and letters allow) -# jwt-issuer: FatWeb # Token issuer +# jwt-issuer: Oxygen # Token issuer # redis-ttl: 20 # The life of token in redis # redis-ttl-unit: minutes # Unit of life of token in redis [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days] diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3117780..b8d5746 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -35,7 +35,7 @@ mybatis-plus: logic-not-delete-value: 0 logic-delete-value: id id-type: assign_id - type-aliases-package: top.fatweb.api.entity + type-aliases-package: top.fatweb.oxygen.api.entity logging: level: diff --git a/src/main/resources/mapper/permission/FuncMapper.xml b/src/main/resources/mapper/permission/FuncMapper.xml index f2211cb..ef0e20e 100644 --- a/src/main/resources/mapper/permission/FuncMapper.xml +++ b/src/main/resources/mapper/permission/FuncMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/permission/GroupMapper.xml b/src/main/resources/mapper/permission/GroupMapper.xml index e32fae4..24d6e8a 100644 --- a/src/main/resources/mapper/permission/GroupMapper.xml +++ b/src/main/resources/mapper/permission/GroupMapper.xml @@ -1,6 +1,6 @@ - + select id from t_role @@ -101,9 +101,9 @@ - - - - + + + + diff --git a/src/main/resources/mapper/permission/UserGroupMapper.xml b/src/main/resources/mapper/permission/UserGroupMapper.xml index 9eaaad8..ba22a76 100644 --- a/src/main/resources/mapper/permission/UserGroupMapper.xml +++ b/src/main/resources/mapper/permission/UserGroupMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/permission/UserInfoMapper.xml b/src/main/resources/mapper/permission/UserInfoMapper.xml index bdaf75a..de8ac7a 100644 --- a/src/main/resources/mapper/permission/UserInfoMapper.xml +++ b/src/main/resources/mapper/permission/UserInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/permission/UserMapper.xml b/src/main/resources/mapper/permission/UserMapper.xml index 9242428..6e4642e 100644 --- a/src/main/resources/mapper/permission/UserMapper.xml +++ b/src/main/resources/mapper/permission/UserMapper.xml @@ -1,6 +1,6 @@ - + select t_sys_log.id as sys_log_id, t_sys_log.log_type as sys_log_log_type, diff --git a/src/test/kotlin/top/fatweb/api/FatWebApiApplicationTests.kt b/src/test/kotlin/top/fatweb/oxygen/api/OxygenApiApplicationTests.kt similarity index 84% rename from src/test/kotlin/top/fatweb/api/FatWebApiApplicationTests.kt rename to src/test/kotlin/top/fatweb/oxygen/api/OxygenApiApplicationTests.kt index 929c673..660eae7 100644 --- a/src/test/kotlin/top/fatweb/api/FatWebApiApplicationTests.kt +++ b/src/test/kotlin/top/fatweb/oxygen/api/OxygenApiApplicationTests.kt @@ -1,4 +1,4 @@ -package top.fatweb.api +package top.fatweb.oxygen.api import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test @@ -6,14 +6,14 @@ import org.junit.jupiter.api.extension.ExtendWith import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.test.context.junit.jupiter.SpringExtension -import top.fatweb.api.properties.SecurityProperties -import top.fatweb.api.util.ByteUtil -import top.fatweb.api.util.JwtUtil -import top.fatweb.api.util.StrUtil +import top.fatweb.oxygen.api.properties.SecurityProperties +import top.fatweb.oxygen.api.util.ByteUtil +import top.fatweb.oxygen.api.util.JwtUtil +import top.fatweb.oxygen.api.util.StrUtil @ExtendWith(SpringExtension::class) -class FatWebApiApplicationTests { +class OxygenApiApplicationTests { private val logger: Logger = LoggerFactory.getLogger(this::class.java) @Test