From 287c9ab1a30e6889ebfdbd568096b548d89ccc09 Mon Sep 17 00:00:00 2001 From: ronger Date: Thu, 19 Nov 2020 11:52:13 +0800 Subject: [PATCH] =?UTF-8?q?:truck:=20=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A7=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++--- .../ForestApplication.java} | 6 ++-- .../ServletInitializer.java | 4 +-- .../config/BaseExceptionHandler.java | 10 +++--- .../config/BaseSessionManager.java | 2 +- .../config/BaseShiroFilterFactoryBean.java | 2 +- .../config/BaseShiroRealm.java | 22 ++++++------- .../config/MybatisConfigurer.java | 6 ++-- .../config/RedisProperties.java | 2 +- .../config/ShiroConfig.java | 2 +- .../config/ShiroLoginFilter.java | 4 +-- .../config/UsernamePasswordToken.java | 2 +- .../config/WebMvcConfigurer.java | 4 +-- .../config/WebSocketStompConfig.java | 2 +- .../core/constant/NotificationConstant.java | 2 +- .../core/constant/ProjectConstant.java | 4 +-- .../core/constant/ShiroConstants.java | 2 +- .../core/exception/CaptchaException.java | 2 +- .../core/exception/ServiceException.java | 4 +-- .../core/mapper/Mapper.java | 2 +- .../core/mapper/TreeMapper.java | 2 +- .../core/result/GlobalResult.java | 2 +- .../core/result/GlobalResultGenerator.java | 4 +-- .../core/result/GlobalResultMessage.java | 2 +- .../core/result/ResultCode.java | 2 +- .../core/service/AbstractService.java | 6 ++-- .../core/service/Service.java | 4 +-- .../core/service/log/VisitAspect.java | 20 ++++++------ .../service/log/annotation/VisitLogger.java | 2 +- .../service/log/constant/LoggerConstant.java | 2 +- .../core/service/redis/RedisResult.java | 4 +-- .../core/service/redis/RedisService.java | 2 +- .../service/redis/impl/RedisKeyHelper.java | 2 +- .../service/redis/impl/RedisServiceImpl.java | 8 ++--- .../{vertical => forest}/dto/ArticleDTO.java | 2 +- .../dto/ArticleSearchDTO.java | 2 +- .../dto/ArticleTagDTO.java | 2 +- .../{vertical => forest}/dto/Author.java | 2 +- .../dto/ChangeEmailDTO.java | 2 +- .../{vertical => forest}/dto/CommentDTO.java | 2 +- .../dto/ForgetPasswordDTO.java | 2 +- .../{vertical => forest}/dto/LabelModel.java | 2 +- .../dto/LinkToImageUrlDTO.java | 2 +- .../{vertical => forest}/dto/MenuDTO.java | 2 +- .../dto/NotificationDTO.java | 4 +-- .../dto/PortfolioArticleDTO.java | 2 +- .../dto/PortfolioDTO.java | 2 +- .../{vertical => forest}/dto/RoleDTO.java | 2 +- .../{vertical => forest}/dto/TokenUser.java | 2 +- .../dto/UpdatePasswordDTO.java | 2 +- .../{vertical => forest}/dto/UserDTO.java | 2 +- .../{vertical => forest}/dto/UserInfoDTO.java | 2 +- .../dto/UserRegisterInfoDTO.java | 2 +- .../dto/admin/Dashboard.java | 2 +- .../dto/admin/DashboardData.java | 2 +- .../dto/admin/TagDTO.java | 4 +-- .../dto/admin/TopicDTO.java | 3 +- .../dto/admin/TopicTagDTO.java | 2 +- .../dto/admin/UserRoleDTO.java | 2 +- .../dto/baidu/TagNlpDTO.java | 2 +- .../{vertical => forest}/entity/Article.java | 2 +- .../entity/ArticleContent.java | 2 +- .../{vertical => forest}/entity/BaseDO.java | 2 +- .../{vertical => forest}/entity/Comment.java | 2 +- .../{vertical => forest}/entity/Follow.java | 2 +- .../entity/Notification.java | 2 +- .../entity/Permission.java | 4 +-- .../entity/Portfolio.java | 2 +- .../{vertical => forest}/entity/Role.java | 2 +- .../entity/SpecialDay.java | 2 +- .../{vertical => forest}/entity/Tag.java | 2 +- .../{vertical => forest}/entity/Topic.java | 2 +- .../{vertical => forest}/entity/User.java | 2 +- .../entity/UserExtend.java | 2 +- .../{vertical => forest}/entity/Visit.java | 2 +- .../{vertical => forest}/entity/WxUser.java | 2 +- .../jwt/aop/RestAuthTokenInterceptor.java | 14 ++++---- .../jwt/def/JwtConstants.java | 2 +- .../jwt/model/TokenModel.java | 2 +- .../jwt/service/RedisTokenManager.java | 6 ++-- .../jwt/service/TokenManager.java | 4 +-- .../jwt/util/oConvertUtils.java | 2 +- .../mapper/ArticleMapper.java | 14 ++++---- .../mapper/CommentMapper.java | 10 +++--- .../mapper/DashboardMapper.java | 5 ++- .../mapper/FollowMapper.java | 8 ++--- .../mapper/NotificationMapper.java | 6 ++-- .../mapper/PermissionMapper.java | 6 ++-- .../mapper/PortfolioMapper.java | 8 ++--- .../mapper/RoleMapper.java | 7 ++-- .../rymcu/forest/mapper/SpecialDayMapper.java | 10 ++++++ .../mapper/TagMapper.java | 8 ++--- .../mapper/TopicMapper.java | 12 +++---- .../mapper/UserExtendMapper.java | 6 ++-- .../mapper/UserMapper.java | 14 ++++---- .../com/rymcu/forest/mapper/VisitMapper.java | 10 ++++++ .../com/rymcu/forest/mapper/WxUserMapper.java | 10 ++++++ .../service/ArticleService.java | 12 +++---- .../service/CommentService.java | 8 ++--- .../service/DashboardService.java | 4 +-- .../service/FollowService.java | 10 +++--- .../service/JavaMailService.java | 2 +- .../service/NotificationService.java | 8 ++--- .../service/PermissionService.java | 8 ++--- .../service/PortfolioService.java | 14 ++++---- .../service/RoleService.java | 8 ++--- .../forest/service/SpecialDayService.java | 10 ++++++ .../service/TagService.java | 12 +++---- .../service/TopicService.java | 10 +++--- .../service/UserService.java | 10 +++--- .../rymcu/forest/service/VisitService.java | 10 ++++++ .../service/WxUserService.java | 6 ++-- .../service/impl/ArticleServiceImpl.java | 32 +++++++++---------- .../service/impl/CommentServiceImpl.java | 26 +++++++-------- .../service/impl/DashboardServiceImpl.java | 10 +++--- .../service/impl/FollowServiceImpl.java | 22 ++++++------- .../service/impl/JavaMailServiceImpl.java | 10 +++--- .../service/impl/NotificationServiceImpl.java | 24 +++++++------- .../service/impl/PermissionServiceImpl.java | 17 +++++----- .../service/impl/PortfolioServiceImpl.java | 24 +++++++------- .../service/impl/RoleServiceImpl.java | 12 +++---- .../service/impl/SpecialDayServiceImpl.java | 10 +++--- .../service/impl/TagServiceImpl.java | 30 ++++++++--------- .../service/impl/TopicServiceImpl.java | 18 +++++------ .../service/impl/UserServiceImpl.java | 30 ++++++++--------- .../forest/service/impl/VisitServiceImpl.java | 13 ++++++++ .../service/impl/WxUserServiceImpl.java | 10 +++--- .../task/BaiDuCronTask.java | 6 ++-- .../util/BaiDuAipUtils.java | 4 +-- .../{vertical => forest}/util/BaiDuUtils.java | 2 +- .../util/BeanCopierUtil.java | 2 +- .../{vertical => forest}/util/CacheUtils.java | 2 +- .../util/ContextHolderUtils.java | 2 +- .../{vertical => forest}/util/Digests.java | 2 +- .../{vertical => forest}/util/Encodes.java | 2 +- .../{vertical => forest}/util/ErrorCode.java | 2 +- .../{vertical => forest}/util/Exceptions.java | 2 +- .../{vertical => forest}/util/FileUtils.java | 2 +- .../util/Html2TextUtil.java | 2 +- .../util/NotificationUtils.java | 16 +++++----- .../util/SpringContextHolder.java | 6 +--- .../{vertical => forest}/util/UserUtils.java | 18 +++++------ .../{vertical => forest}/util/Utils.java | 10 +++--- .../util/oConvertUtils.java | 2 +- .../web/api/admin/AdminController.java | 16 +++++----- .../web/api/admin/DashboardController.java | 10 +++--- .../web/api/article/ArticleController.java | 20 ++++++------ .../web/api/comment/CommentController.java | 12 +++---- .../web/api/common/CommonApiController.java | 26 +++++++-------- .../web/api/common/UploadController.java | 24 +++++++------- .../web/api/common/WebSocketController.java | 3 +- .../web/api/exception/BaseApiException.java | 2 +- .../exception/BaseApiExceptionHandler.java | 8 ++--- .../web/api/exception/ErrorCode.java | 2 +- .../web/api/follow/FollowController.java | 16 ++++------ .../notification/NotificationController.java | 20 ++++++------ .../api/portfolio/PortfolioController.java | 16 +++++----- .../web/api/tag/TagController.java | 16 +++++----- .../web/api/topic/TopicController.java | 18 +++++------ .../web/api/user/UserController.java | 26 +++++++-------- .../web/api/user/UserInfoController.java | 13 ++++---- .../wx/miniapp/config/WxMaConfiguration.java | 2 +- .../wx/miniapp/config/WxMaProperties.java | 2 +- .../controller/WxMaMediaController.java | 4 +-- .../controller/WxMaUserController.java | 6 ++-- .../wx/miniapp/utils/JsonUtils.java | 2 +- .../wx/mp/builder/AbstractBuilder.java | 2 +- .../wx/mp/builder/ImageBuilder.java | 2 +- .../wx/mp/builder/TextBuilder.java | 2 +- .../wx/mp/config/WxMpConfiguration.java | 4 +-- .../wx/mp/config/WxMpProperties.java | 4 +-- .../wx/mp/controller/WxMenuController.java | 7 +--- .../wx/mp/controller/WxPortalController.java | 6 +--- .../mp/controller/WxRedirectController.java | 2 +- .../wx/mp/controller/WxoAuthController.java | 6 ++-- .../wx/mp/error/ErrorController.java | 2 +- .../wx/mp/error/ErrorPageConfiguration.java | 2 +- .../wx/mp/handler/AbstractHandler.java | 2 +- .../wx/mp/handler/KfSessionHandler.java | 2 +- .../wx/mp/handler/LocationHandler.java | 4 +-- .../wx/mp/handler/LogHandler.java | 4 +-- .../wx/mp/handler/MenuHandler.java | 2 +- .../wx/mp/handler/MsgHandler.java | 4 +-- .../wx/mp/handler/NullHandler.java | 2 +- .../wx/mp/handler/ScanHandler.java | 2 +- .../mp/handler/StoreCheckNotifyHandler.java | 2 +- .../wx/mp/handler/SubscribeHandler.java | 4 +-- .../wx/mp/handler/UnsubscribeHandler.java | 2 +- .../wx/mp/utils/JsonUtils.java | 2 +- .../wx/open/config/WxOpenProperties.java | 2 +- .../open/controller/WxOpenApiController.java | 4 +-- .../controller/WxOpenNotifyController.java | 4 +-- .../wx/open/handler/WxOpenServiceHandler.java | 6 ++-- .../vertical/mapper/SpecialDayMapper.java | 10 ------ .../rymcu/vertical/mapper/VisitMapper.java | 10 ------ .../rymcu/vertical/mapper/WxUserMapper.java | 10 ------ .../vertical/service/SpecialDayService.java | 10 ------ .../rymcu/vertical/service/VisitService.java | 10 ------ .../service/impl/VisitServiceImpl.java | 13 -------- src/main/java/mapper/ArticleMapper.xml | 12 +++---- src/main/java/mapper/CommentMapper.xml | 8 ++--- src/main/java/mapper/DashboardMapper.xml | 4 +-- src/main/java/mapper/FollowMapper.xml | 4 +-- src/main/java/mapper/NotificationMapper.xml | 4 +-- src/main/java/mapper/PermissionMapper.xml | 4 +-- src/main/java/mapper/PortfolioMapper.xml | 6 ++-- src/main/java/mapper/RoleMapper.xml | 4 +-- src/main/java/mapper/SpecialDayMapper.xml | 4 +-- src/main/java/mapper/TagMapper.xml | 6 ++-- src/main/java/mapper/TopicMapper.xml | 10 +++--- src/main/java/mapper/UserExtendMapper.xml | 4 +-- src/main/java/mapper/UserMapper.xml | 10 +++--- src/main/java/mapper/VisitMapper.xml | 2 +- src/main/java/mapper/WxUserMapper.xml | 4 +-- src/main/resources/application.yml | 10 +++--- .../ForestApplicationTests.java} | 4 +-- 216 files changed, 699 insertions(+), 726 deletions(-) rename src/main/java/com/rymcu/{vertical/VerticalApplication.java => forest/ForestApplication.java} (61%) rename src/main/java/com/rymcu/{vertical => forest}/ServletInitializer.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/config/BaseExceptionHandler.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/config/BaseSessionManager.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/config/BaseShiroFilterFactoryBean.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/config/BaseShiroRealm.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/config/MybatisConfigurer.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/config/RedisProperties.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/config/ShiroConfig.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/config/ShiroLoginFilter.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/config/UsernamePasswordToken.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/config/WebMvcConfigurer.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/config/WebSocketStompConfig.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/core/constant/NotificationConstant.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/core/constant/ProjectConstant.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/core/constant/ShiroConstants.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/core/exception/CaptchaException.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/core/exception/ServiceException.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/core/mapper/Mapper.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/core/mapper/TreeMapper.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/core/result/GlobalResult.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/core/result/GlobalResultGenerator.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/core/result/GlobalResultMessage.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/core/result/ResultCode.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/AbstractService.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/Service.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/log/VisitAspect.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/log/annotation/VisitLogger.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/log/constant/LoggerConstant.java (75%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/redis/RedisResult.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/redis/RedisService.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/redis/impl/RedisKeyHelper.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/core/service/redis/impl/RedisServiceImpl.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/dto/ArticleDTO.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/dto/ArticleSearchDTO.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/dto/ArticleTagDTO.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/dto/Author.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/dto/ChangeEmailDTO.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/dto/CommentDTO.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/dto/ForgetPasswordDTO.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/dto/LabelModel.java (85%) rename src/main/java/com/rymcu/{vertical => forest}/dto/LinkToImageUrlDTO.java (81%) rename src/main/java/com/rymcu/{vertical => forest}/dto/MenuDTO.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/dto/NotificationDTO.java (79%) rename src/main/java/com/rymcu/{vertical => forest}/dto/PortfolioArticleDTO.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/dto/PortfolioDTO.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/dto/RoleDTO.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/dto/TokenUser.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/dto/UpdatePasswordDTO.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/dto/UserDTO.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/dto/UserInfoDTO.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/dto/UserRegisterInfoDTO.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/Dashboard.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/DashboardData.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/TagDTO.java (79%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/TopicDTO.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/TopicTagDTO.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/dto/admin/UserRoleDTO.java (78%) rename src/main/java/com/rymcu/{vertical => forest}/dto/baidu/TagNlpDTO.java (81%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Article.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/ArticleContent.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/entity/BaseDO.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Comment.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Follow.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Notification.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Permission.java (85%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Portfolio.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Role.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/SpecialDay.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Tag.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Topic.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/entity/User.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/entity/UserExtend.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/entity/Visit.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/entity/WxUser.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/aop/RestAuthTokenInterceptor.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/def/JwtConstants.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/model/TokenModel.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/service/RedisTokenManager.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/service/TokenManager.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/jwt/util/oConvertUtils.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/ArticleMapper.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/CommentMapper.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/DashboardMapper.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/FollowMapper.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/NotificationMapper.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/PermissionMapper.java (61%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/PortfolioMapper.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/RoleMapper.java (75%) create mode 100644 src/main/java/com/rymcu/forest/mapper/SpecialDayMapper.java rename src/main/java/com/rymcu/{vertical => forest}/mapper/TagMapper.java (91%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/TopicMapper.java (86%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/UserExtendMapper.java (70%) rename src/main/java/com/rymcu/{vertical => forest}/mapper/UserMapper.java (92%) create mode 100644 src/main/java/com/rymcu/forest/mapper/VisitMapper.java create mode 100644 src/main/java/com/rymcu/forest/mapper/WxUserMapper.java rename src/main/java/com/rymcu/{vertical => forest}/service/ArticleService.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/service/CommentService.java (64%) rename src/main/java/com/rymcu/{vertical => forest}/service/DashboardService.java (80%) rename src/main/java/com/rymcu/{vertical => forest}/service/FollowService.java (83%) rename src/main/java/com/rymcu/{vertical => forest}/service/JavaMailService.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/service/NotificationService.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/service/PermissionService.java (63%) rename src/main/java/com/rymcu/{vertical => forest}/service/PortfolioService.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/service/RoleService.java (80%) create mode 100644 src/main/java/com/rymcu/forest/service/SpecialDayService.java rename src/main/java/com/rymcu/{vertical => forest}/service/TagService.java (74%) rename src/main/java/com/rymcu/{vertical => forest}/service/TopicService.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/service/UserService.java (93%) create mode 100644 src/main/java/com/rymcu/forest/service/VisitService.java rename src/main/java/com/rymcu/{vertical => forest}/service/WxUserService.java (60%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/ArticleServiceImpl.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/CommentServiceImpl.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/DashboardServiceImpl.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/FollowServiceImpl.java (79%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/JavaMailServiceImpl.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/NotificationServiceImpl.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/PermissionServiceImpl.java (66%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/PortfolioServiceImpl.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/RoleServiceImpl.java (86%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/SpecialDayServiceImpl.java (53%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/TagServiceImpl.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/TopicServiceImpl.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/service/impl/UserServiceImpl.java (92%) create mode 100644 src/main/java/com/rymcu/forest/service/impl/VisitServiceImpl.java rename src/main/java/com/rymcu/{vertical => forest}/service/impl/WxUserServiceImpl.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/task/BaiDuCronTask.java (82%) rename src/main/java/com/rymcu/{vertical => forest}/util/BaiDuAipUtils.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/util/BaiDuUtils.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/util/BeanCopierUtil.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/util/CacheUtils.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/util/ContextHolderUtils.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/util/Digests.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/util/Encodes.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/util/ErrorCode.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/util/Exceptions.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/util/FileUtils.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/util/Html2TextUtil.java (97%) rename src/main/java/com/rymcu/{vertical => forest}/util/NotificationUtils.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/util/SpringContextHolder.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/util/UserUtils.java (85%) rename src/main/java/com/rymcu/{vertical => forest}/util/Utils.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/util/oConvertUtils.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/admin/AdminController.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/admin/DashboardController.java (79%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/article/ArticleController.java (86%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/comment/CommentController.java (73%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/common/CommonApiController.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/common/UploadController.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/common/WebSocketController.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/exception/BaseApiException.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/exception/BaseApiExceptionHandler.java (83%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/exception/ErrorCode.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/follow/FollowController.java (66%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/notification/NotificationController.java (79%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/portfolio/PortfolioController.java (86%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/tag/TagController.java (74%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/topic/TopicController.java (71%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/user/UserController.java (87%) rename src/main/java/com/rymcu/{vertical => forest}/web/api/user/UserInfoController.java (84%) rename src/main/java/com/rymcu/{vertical => forest}/wx/miniapp/config/WxMaConfiguration.java (99%) rename src/main/java/com/rymcu/{vertical => forest}/wx/miniapp/config/WxMaProperties.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/miniapp/controller/WxMaMediaController.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/wx/miniapp/controller/WxMaUserController.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/miniapp/utils/JsonUtils.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/builder/AbstractBuilder.java (92%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/builder/ImageBuilder.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/builder/TextBuilder.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/config/WxMpConfiguration.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/config/WxMpProperties.java (90%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/controller/WxMenuController.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/controller/WxPortalController.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/controller/WxRedirectController.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/controller/WxoAuthController.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/error/ErrorController.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/error/ErrorPageConfiguration.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/AbstractHandler.java (88%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/KfSessionHandler.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/LocationHandler.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/LogHandler.java (89%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/MenuHandler.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/MsgHandler.java (93%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/NullHandler.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/ScanHandler.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/StoreCheckNotifyHandler.java (94%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/SubscribeHandler.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/handler/UnsubscribeHandler.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/mp/utils/JsonUtils.java (80%) rename src/main/java/com/rymcu/{vertical => forest}/wx/open/config/WxOpenProperties.java (95%) rename src/main/java/com/rymcu/{vertical => forest}/wx/open/controller/WxOpenApiController.java (96%) rename src/main/java/com/rymcu/{vertical => forest}/wx/open/controller/WxOpenNotifyController.java (98%) rename src/main/java/com/rymcu/{vertical => forest}/wx/open/handler/WxOpenServiceHandler.java (94%) delete mode 100644 src/main/java/com/rymcu/vertical/mapper/SpecialDayMapper.java delete mode 100644 src/main/java/com/rymcu/vertical/mapper/VisitMapper.java delete mode 100644 src/main/java/com/rymcu/vertical/mapper/WxUserMapper.java delete mode 100644 src/main/java/com/rymcu/vertical/service/SpecialDayService.java delete mode 100644 src/main/java/com/rymcu/vertical/service/VisitService.java delete mode 100644 src/main/java/com/rymcu/vertical/service/impl/VisitServiceImpl.java rename src/test/java/com/rymcu/{vertical/VerticalApplicationTests.java => forest/ForestApplicationTests.java} (72%) diff --git a/pom.xml b/pom.xml index 23ed1bc..f9af47d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,11 +9,11 @@ com.rymcu - vertical + forest 0.0.1 war - vertical - 一个用 Java 实现的现代化社区（论坛 / BBS / 社交网络 / 博客）平台，“下一代的社区系统，为未来而构建”。 + forest + forest(森林) —— 一款现代化的知识社区后台项目，使用 SpringBoot + Shrio + MyBatis + JWT + Redis 实现。 1.8 @@ -94,7 +94,7 @@ com.alibaba fastjson - 1.2.60 + 1.2.67 diff --git a/src/main/java/com/rymcu/vertical/VerticalApplication.java b/src/main/java/com/rymcu/forest/ForestApplication.java similarity index 61% rename from src/main/java/com/rymcu/vertical/VerticalApplication.java rename to src/main/java/com/rymcu/forest/ForestApplication.java index 207d93f..9a945f8 100644 --- a/src/main/java/com/rymcu/vertical/VerticalApplication.java +++ b/src/main/java/com/rymcu/forest/ForestApplication.java @@ -1,13 +1,13 @@ -package com.rymcu.vertical; +package com.rymcu.forest; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class VerticalApplication { +public class ForestApplication { public static void main(String[] args) { - SpringApplication.run(VerticalApplication.class, args); + SpringApplication.run(ForestApplication.class, args); } } diff --git a/src/main/java/com/rymcu/vertical/ServletInitializer.java b/src/main/java/com/rymcu/forest/ServletInitializer.java similarity index 78% rename from src/main/java/com/rymcu/vertical/ServletInitializer.java rename to src/main/java/com/rymcu/forest/ServletInitializer.java index 9db7b2d..9938b4b 100644 --- a/src/main/java/com/rymcu/vertical/ServletInitializer.java +++ b/src/main/java/com/rymcu/forest/ServletInitializer.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical; +package com.rymcu.forest; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(VerticalApplication.class); + return application.sources(ForestApplication.class); } } diff --git a/src/main/java/com/rymcu/vertical/config/BaseExceptionHandler.java b/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java similarity index 95% rename from src/main/java/com/rymcu/vertical/config/BaseExceptionHandler.java rename to src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java index 1f7d6b5..5d60bf3 100644 --- a/src/main/java/com/rymcu/vertical/config/BaseExceptionHandler.java +++ b/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import com.alibaba.fastjson.support.spring.FastJsonJsonView; -import com.rymcu.vertical.core.exception.ServiceException; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.ResultCode; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.exception.ServiceException; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.ResultCode; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.shiro.authz.UnauthenticatedException; import org.apache.shiro.authz.UnauthorizedException; import org.slf4j.Logger; diff --git a/src/main/java/com/rymcu/vertical/config/BaseSessionManager.java b/src/main/java/com/rymcu/forest/config/BaseSessionManager.java similarity index 97% rename from src/main/java/com/rymcu/vertical/config/BaseSessionManager.java rename to src/main/java/com/rymcu/forest/config/BaseSessionManager.java index aab4e3d..7d76213 100644 --- a/src/main/java/com/rymcu/vertical/config/BaseSessionManager.java +++ b/src/main/java/com/rymcu/forest/config/BaseSessionManager.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import org.apache.shiro.web.servlet.ShiroHttpServletRequest; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; diff --git a/src/main/java/com/rymcu/vertical/config/BaseShiroFilterFactoryBean.java b/src/main/java/com/rymcu/forest/config/BaseShiroFilterFactoryBean.java similarity index 99% rename from src/main/java/com/rymcu/vertical/config/BaseShiroFilterFactoryBean.java rename to src/main/java/com/rymcu/forest/config/BaseShiroFilterFactoryBean.java index ab7deab..8215885 100644 --- a/src/main/java/com/rymcu/vertical/config/BaseShiroFilterFactoryBean.java +++ b/src/main/java/com/rymcu/forest/config/BaseShiroFilterFactoryBean.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; diff --git a/src/main/java/com/rymcu/vertical/config/BaseShiroRealm.java b/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java similarity index 90% rename from src/main/java/com/rymcu/vertical/config/BaseShiroRealm.java rename to src/main/java/com/rymcu/forest/config/BaseShiroRealm.java index 1a0126b..46aa766 100644 --- a/src/main/java/com/rymcu/vertical/config/BaseShiroRealm.java +++ b/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java @@ -1,15 +1,15 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; -import com.rymcu.vertical.core.constant.ShiroConstants; -import com.rymcu.vertical.core.exception.CaptchaException; -import com.rymcu.vertical.entity.Permission; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.service.PermissionService; -import com.rymcu.vertical.service.RoleService; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.Encodes; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.constant.ShiroConstants; +import com.rymcu.forest.core.exception.CaptchaException; +import com.rymcu.forest.entity.Permission; +import com.rymcu.forest.entity.Role; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.service.PermissionService; +import com.rymcu.forest.service.RoleService; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.Encodes; +import com.rymcu.forest.util.Utils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.exceptions.TooManyResultsException; import org.apache.shiro.authc.*; diff --git a/src/main/java/com/rymcu/vertical/config/MybatisConfigurer.java b/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java similarity index 93% rename from src/main/java/com/rymcu/vertical/config/MybatisConfigurer.java rename to src/main/java/com/rymcu/forest/config/MybatisConfigurer.java index b983130..594882c 100644 --- a/src/main/java/com/rymcu/vertical/config/MybatisConfigurer.java +++ b/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import com.github.pagehelper.PageInterceptor; import org.apache.ibatis.plugin.Interceptor; @@ -13,7 +13,7 @@ import tk.mybatis.spring.mapper.MapperScannerConfigurer; import javax.sql.DataSource; import java.util.Properties; -import static com.rymcu.vertical.core.constant.ProjectConstant.*; +import static com.rymcu.forest.core.constant.ProjectConstant.*; /** @@ -45,7 +45,7 @@ public class MybatisConfigurer { //添加XML目录 ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); factory.setMapperLocations(resolver.getResources("classpath:mapper/**/*.xml")); - factory.setTypeHandlersPackage("com.rymcu.vertical.util.handlers"); + factory.setTypeHandlersPackage("com.rymcu.forest.util.handlers"); return factory.getObject(); } diff --git a/src/main/java/com/rymcu/vertical/config/RedisProperties.java b/src/main/java/com/rymcu/forest/config/RedisProperties.java similarity index 98% rename from src/main/java/com/rymcu/vertical/config/RedisProperties.java rename to src/main/java/com/rymcu/forest/config/RedisProperties.java index 02ae5d2..5e0332e 100644 --- a/src/main/java/com/rymcu/vertical/config/RedisProperties.java +++ b/src/main/java/com/rymcu/forest/config/RedisProperties.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import org.springframework.boot.context.properties.ConfigurationProperties; import redis.clients.jedis.JedisPoolConfig; diff --git a/src/main/java/com/rymcu/vertical/config/ShiroConfig.java b/src/main/java/com/rymcu/forest/config/ShiroConfig.java similarity index 99% rename from src/main/java/com/rymcu/vertical/config/ShiroConfig.java rename to src/main/java/com/rymcu/forest/config/ShiroConfig.java index 25b48ce..c539574 100644 --- a/src/main/java/com/rymcu/vertical/config/ShiroConfig.java +++ b/src/main/java/com/rymcu/forest/config/ShiroConfig.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.mgt.SecurityManager; diff --git a/src/main/java/com/rymcu/vertical/config/ShiroLoginFilter.java b/src/main/java/com/rymcu/forest/config/ShiroLoginFilter.java similarity index 96% rename from src/main/java/com/rymcu/vertical/config/ShiroLoginFilter.java rename to src/main/java/com/rymcu/forest/config/ShiroLoginFilter.java index 3a0b831..6f6d87d 100644 --- a/src/main/java/com/rymcu/vertical/config/ShiroLoginFilter.java +++ b/src/main/java/com/rymcu/forest/config/ShiroLoginFilter.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import com.alibaba.fastjson.JSONObject; -import com.rymcu.vertical.core.result.GlobalResultGenerator; +import com.rymcu.forest.core.result.GlobalResultGenerator; import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/rymcu/vertical/config/UsernamePasswordToken.java b/src/main/java/com/rymcu/forest/config/UsernamePasswordToken.java similarity index 95% rename from src/main/java/com/rymcu/vertical/config/UsernamePasswordToken.java rename to src/main/java/com/rymcu/forest/config/UsernamePasswordToken.java index 4022e18..3225b52 100644 --- a/src/main/java/com/rymcu/vertical/config/UsernamePasswordToken.java +++ b/src/main/java/com/rymcu/forest/config/UsernamePasswordToken.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; /** * 用户和密码（包含验证码）令牌类 diff --git a/src/main/java/com/rymcu/vertical/config/WebMvcConfigurer.java b/src/main/java/com/rymcu/forest/config/WebMvcConfigurer.java similarity index 97% rename from src/main/java/com/rymcu/vertical/config/WebMvcConfigurer.java rename to src/main/java/com/rymcu/forest/config/WebMvcConfigurer.java index 8c053f0..f671a9a 100644 --- a/src/main/java/com/rymcu/vertical/config/WebMvcConfigurer.java +++ b/src/main/java/com/rymcu/forest/config/WebMvcConfigurer.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.rymcu.vertical.jwt.aop.RestAuthTokenInterceptor; +import com.rymcu.forest.jwt.aop.RestAuthTokenInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/rymcu/vertical/config/WebSocketStompConfig.java b/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java similarity index 97% rename from src/main/java/com/rymcu/vertical/config/WebSocketStompConfig.java rename to src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java index a0fb1c8..a158e49 100644 --- a/src/main/java/com/rymcu/vertical/config/WebSocketStompConfig.java +++ b/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.config; +package com.rymcu.forest.config; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; diff --git a/src/main/java/com/rymcu/vertical/core/constant/NotificationConstant.java b/src/main/java/com/rymcu/forest/core/constant/NotificationConstant.java similarity index 87% rename from src/main/java/com/rymcu/vertical/core/constant/NotificationConstant.java rename to src/main/java/com/rymcu/forest/core/constant/NotificationConstant.java index d7076c3..a61571b 100644 --- a/src/main/java/com/rymcu/vertical/core/constant/NotificationConstant.java +++ b/src/main/java/com/rymcu/forest/core/constant/NotificationConstant.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.constant; +package com.rymcu.forest.core.constant; /** * 消息通知类型 diff --git a/src/main/java/com/rymcu/vertical/core/constant/ProjectConstant.java b/src/main/java/com/rymcu/forest/core/constant/ProjectConstant.java similarity index 89% rename from src/main/java/com/rymcu/vertical/core/constant/ProjectConstant.java rename to src/main/java/com/rymcu/forest/core/constant/ProjectConstant.java index db5d098..8cdb8b3 100644 --- a/src/main/java/com/rymcu/vertical/core/constant/ProjectConstant.java +++ b/src/main/java/com/rymcu/forest/core/constant/ProjectConstant.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.constant; +package com.rymcu.forest.core.constant; /** * 项目常量 @@ -8,7 +8,7 @@ public final class ProjectConstant { /**当前环境*/ public static final String ENV = "dev"; /**项目基础包名称，根据自己公司的项目修改*/ - public static final String BASE_PACKAGE = "com.rymcu.vertical"; + public static final String BASE_PACKAGE = "com.rymcu.forest"; /**DTO所在包*/ public static final String DTO_PACKAGE = BASE_PACKAGE + ".dto"; /**Model所在包*/ diff --git a/src/main/java/com/rymcu/vertical/core/constant/ShiroConstants.java b/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java similarity index 96% rename from src/main/java/com/rymcu/vertical/core/constant/ShiroConstants.java rename to src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java index 22ff54d..8b7476d 100644 --- a/src/main/java/com/rymcu/vertical/core/constant/ShiroConstants.java +++ b/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.constant; +package com.rymcu.forest.core.constant; /** * Shiro通用常量 diff --git a/src/main/java/com/rymcu/vertical/core/exception/CaptchaException.java b/src/main/java/com/rymcu/forest/core/exception/CaptchaException.java similarity index 87% rename from src/main/java/com/rymcu/vertical/core/exception/CaptchaException.java rename to src/main/java/com/rymcu/forest/core/exception/CaptchaException.java index e20d4d5..2049460 100644 --- a/src/main/java/com/rymcu/vertical/core/exception/CaptchaException.java +++ b/src/main/java/com/rymcu/forest/core/exception/CaptchaException.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.exception; +package com.rymcu.forest.core.exception; import org.apache.shiro.authc.AuthenticationException; diff --git a/src/main/java/com/rymcu/vertical/core/exception/ServiceException.java b/src/main/java/com/rymcu/forest/core/exception/ServiceException.java similarity index 91% rename from src/main/java/com/rymcu/vertical/core/exception/ServiceException.java rename to src/main/java/com/rymcu/forest/core/exception/ServiceException.java index cf57b64..d5e837a 100644 --- a/src/main/java/com/rymcu/vertical/core/exception/ServiceException.java +++ b/src/main/java/com/rymcu/forest/core/exception/ServiceException.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.core.exception; +package com.rymcu.forest.core.exception; -import com.rymcu.vertical.core.result.ResultCode; +import com.rymcu.forest.core.result.ResultCode; /** * 服务（业务）异常如“ 账号或密码错误 ”，该异常只做INFO级别的日志记录 @see WebMvcConfigurer diff --git a/src/main/java/com/rymcu/vertical/core/mapper/Mapper.java b/src/main/java/com/rymcu/forest/core/mapper/Mapper.java similarity index 91% rename from src/main/java/com/rymcu/vertical/core/mapper/Mapper.java rename to src/main/java/com/rymcu/forest/core/mapper/Mapper.java index dc9744a..300787d 100644 --- a/src/main/java/com/rymcu/vertical/core/mapper/Mapper.java +++ b/src/main/java/com/rymcu/forest/core/mapper/Mapper.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.mapper; +package com.rymcu.forest.core.mapper; import tk.mybatis.mapper.common.BaseMapper; import tk.mybatis.mapper.common.ConditionMapper; diff --git a/src/main/java/com/rymcu/vertical/core/mapper/TreeMapper.java b/src/main/java/com/rymcu/forest/core/mapper/TreeMapper.java similarity index 89% rename from src/main/java/com/rymcu/vertical/core/mapper/TreeMapper.java rename to src/main/java/com/rymcu/forest/core/mapper/TreeMapper.java index e339783..fbbf885 100644 --- a/src/main/java/com/rymcu/vertical/core/mapper/TreeMapper.java +++ b/src/main/java/com/rymcu/forest/core/mapper/TreeMapper.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.mapper; +package com.rymcu.forest.core.mapper; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/core/result/GlobalResult.java b/src/main/java/com/rymcu/forest/core/result/GlobalResult.java similarity index 88% rename from src/main/java/com/rymcu/vertical/core/result/GlobalResult.java rename to src/main/java/com/rymcu/forest/core/result/GlobalResult.java index c1cb6d4..1c4f942 100644 --- a/src/main/java/com/rymcu/vertical/core/result/GlobalResult.java +++ b/src/main/java/com/rymcu/forest/core/result/GlobalResult.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.result; +package com.rymcu.forest.core.result; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/core/result/GlobalResultGenerator.java b/src/main/java/com/rymcu/forest/core/result/GlobalResultGenerator.java similarity index 95% rename from src/main/java/com/rymcu/vertical/core/result/GlobalResultGenerator.java rename to src/main/java/com/rymcu/forest/core/result/GlobalResultGenerator.java index 1e16b17..c06a5d4 100644 --- a/src/main/java/com/rymcu/vertical/core/result/GlobalResultGenerator.java +++ b/src/main/java/com/rymcu/forest/core/result/GlobalResultGenerator.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.core.result; +package com.rymcu.forest.core.result; -import com.rymcu.vertical.util.ErrorCode; +import com.rymcu.forest.util.ErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/rymcu/vertical/core/result/GlobalResultMessage.java b/src/main/java/com/rymcu/forest/core/result/GlobalResultMessage.java similarity index 89% rename from src/main/java/com/rymcu/vertical/core/result/GlobalResultMessage.java rename to src/main/java/com/rymcu/forest/core/result/GlobalResultMessage.java index 54cf5cd..a5ab146 100644 --- a/src/main/java/com/rymcu/vertical/core/result/GlobalResultMessage.java +++ b/src/main/java/com/rymcu/forest/core/result/GlobalResultMessage.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.result; +package com.rymcu.forest.core.result; import lombok.Getter; diff --git a/src/main/java/com/rymcu/vertical/core/result/ResultCode.java b/src/main/java/com/rymcu/forest/core/result/ResultCode.java similarity index 94% rename from src/main/java/com/rymcu/vertical/core/result/ResultCode.java rename to src/main/java/com/rymcu/forest/core/result/ResultCode.java index b284cd0..c0f894e 100644 --- a/src/main/java/com/rymcu/vertical/core/result/ResultCode.java +++ b/src/main/java/com/rymcu/forest/core/result/ResultCode.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.result; +package com.rymcu.forest.core.result; /** * 响应码枚举，参考HTTP状态码的语义 diff --git a/src/main/java/com/rymcu/vertical/core/service/AbstractService.java b/src/main/java/com/rymcu/forest/core/service/AbstractService.java similarity index 93% rename from src/main/java/com/rymcu/vertical/core/service/AbstractService.java rename to src/main/java/com/rymcu/forest/core/service/AbstractService.java index 6b4ea6f..a1e2eb2 100644 --- a/src/main/java/com/rymcu/vertical/core/service/AbstractService.java +++ b/src/main/java/com/rymcu/forest/core/service/AbstractService.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.core.service; +package com.rymcu.forest.core.service; -import com.rymcu.vertical.core.exception.ServiceException; -import com.rymcu.vertical.core.mapper.Mapper; +import com.rymcu.forest.core.exception.ServiceException; +import com.rymcu.forest.core.mapper.Mapper; import org.apache.ibatis.exceptions.TooManyResultsException; import org.springframework.beans.factory.annotation.Autowired; import tk.mybatis.mapper.entity.Condition; diff --git a/src/main/java/com/rymcu/vertical/core/service/Service.java b/src/main/java/com/rymcu/forest/core/service/Service.java similarity index 90% rename from src/main/java/com/rymcu/vertical/core/service/Service.java rename to src/main/java/com/rymcu/forest/core/service/Service.java index c09523f..bf69a13 100644 --- a/src/main/java/com/rymcu/vertical/core/service/Service.java +++ b/src/main/java/com/rymcu/forest/core/service/Service.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.core.service; +package com.rymcu.forest.core.service; -import com.rymcu.vertical.core.exception.ServiceException; +import com.rymcu.forest.core.exception.ServiceException; import org.apache.ibatis.exceptions.TooManyResultsException; import tk.mybatis.mapper.entity.Condition; diff --git a/src/main/java/com/rymcu/vertical/core/service/log/VisitAspect.java b/src/main/java/com/rymcu/forest/core/service/log/VisitAspect.java similarity index 87% rename from src/main/java/com/rymcu/vertical/core/service/log/VisitAspect.java rename to src/main/java/com/rymcu/forest/core/service/log/VisitAspect.java index f85d977..0f51467 100644 --- a/src/main/java/com/rymcu/vertical/core/service/log/VisitAspect.java +++ b/src/main/java/com/rymcu/forest/core/service/log/VisitAspect.java @@ -1,13 +1,13 @@ -package com.rymcu.vertical.core.service.log; +package com.rymcu.forest.core.service.log; -import com.rymcu.vertical.core.service.log.constant.LoggerConstant; -import com.rymcu.vertical.dto.TokenUser; -import com.rymcu.vertical.entity.Visit; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.VisitService; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.service.log.constant.LoggerConstant; +import com.rymcu.forest.dto.TokenUser; +import com.rymcu.forest.entity.Visit; +import com.rymcu.forest.jwt.def.JwtConstants; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.VisitService; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.Utils; import org.apache.commons.lang.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -42,7 +42,7 @@ public class VisitAspect { @Resource private VisitService visitService; - @Pointcut("@annotation(com.rymcu.vertical.core.service.log.annotation.VisitLogger)") + @Pointcut("@annotation(com.rymcu.forest.core.service.log.annotation.VisitLogger)") public void pointCut() {} /** diff --git a/src/main/java/com/rymcu/vertical/core/service/log/annotation/VisitLogger.java b/src/main/java/com/rymcu/forest/core/service/log/annotation/VisitLogger.java similarity index 78% rename from src/main/java/com/rymcu/vertical/core/service/log/annotation/VisitLogger.java rename to src/main/java/com/rymcu/forest/core/service/log/annotation/VisitLogger.java index b0c746c..cd920ab 100644 --- a/src/main/java/com/rymcu/vertical/core/service/log/annotation/VisitLogger.java +++ b/src/main/java/com/rymcu/forest/core/service/log/annotation/VisitLogger.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.service.log.annotation; +package com.rymcu.forest.core.service.log.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/com/rymcu/vertical/core/service/log/constant/LoggerConstant.java b/src/main/java/com/rymcu/forest/core/service/log/constant/LoggerConstant.java similarity index 75% rename from src/main/java/com/rymcu/vertical/core/service/log/constant/LoggerConstant.java rename to src/main/java/com/rymcu/forest/core/service/log/constant/LoggerConstant.java index 5905a5b..c95a5d9 100644 --- a/src/main/java/com/rymcu/vertical/core/service/log/constant/LoggerConstant.java +++ b/src/main/java/com/rymcu/forest/core/service/log/constant/LoggerConstant.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.service.log.constant; +package com.rymcu.forest.core.service.log.constant; /** * @author ronger diff --git a/src/main/java/com/rymcu/vertical/core/service/redis/RedisResult.java b/src/main/java/com/rymcu/forest/core/service/redis/RedisResult.java similarity index 93% rename from src/main/java/com/rymcu/vertical/core/service/redis/RedisResult.java rename to src/main/java/com/rymcu/forest/core/service/redis/RedisResult.java index 7e63652..880329b 100644 --- a/src/main/java/com/rymcu/vertical/core/service/redis/RedisResult.java +++ b/src/main/java/com/rymcu/forest/core/service/redis/RedisResult.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.core.service.redis; +package com.rymcu.forest.core.service.redis; -import com.rymcu.vertical.entity.BaseDO; +import com.rymcu.forest.entity.BaseDO; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/core/service/redis/RedisService.java b/src/main/java/com/rymcu/forest/core/service/redis/RedisService.java similarity index 99% rename from src/main/java/com/rymcu/vertical/core/service/redis/RedisService.java rename to src/main/java/com/rymcu/forest/core/service/redis/RedisService.java index 7ccb19b..a5a1841 100644 --- a/src/main/java/com/rymcu/vertical/core/service/redis/RedisService.java +++ b/src/main/java/com/rymcu/forest/core/service/redis/RedisService.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.service.redis; +package com.rymcu.forest.core.service.redis; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisKeyHelper.java b/src/main/java/com/rymcu/forest/core/service/redis/impl/RedisKeyHelper.java similarity index 99% rename from src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisKeyHelper.java rename to src/main/java/com/rymcu/forest/core/service/redis/impl/RedisKeyHelper.java index d3fbb0b..a3cec25 100644 --- a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisKeyHelper.java +++ b/src/main/java/com/rymcu/forest/core/service/redis/impl/RedisKeyHelper.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.core.service.redis.impl; +package com.rymcu.forest.core.service.redis.impl; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java b/src/main/java/com/rymcu/forest/core/service/redis/impl/RedisServiceImpl.java similarity index 98% rename from src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java rename to src/main/java/com/rymcu/forest/core/service/redis/impl/RedisServiceImpl.java index 85dc35a..7bb1192 100644 --- a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java +++ b/src/main/java/com/rymcu/forest/core/service/redis/impl/RedisServiceImpl.java @@ -1,11 +1,11 @@ -package com.rymcu.vertical.core.service.redis.impl; +package com.rymcu.forest.core.service.redis.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.fasterxml.jackson.databind.JavaType; -import com.rymcu.vertical.config.RedisProperties; -import com.rymcu.vertical.core.service.redis.RedisResult; -import com.rymcu.vertical.core.service.redis.RedisService; +import com.rymcu.forest.config.RedisProperties; +import com.rymcu.forest.core.service.redis.RedisResult; +import com.rymcu.forest.core.service.redis.RedisService; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/rymcu/vertical/dto/ArticleDTO.java b/src/main/java/com/rymcu/forest/dto/ArticleDTO.java similarity index 97% rename from src/main/java/com/rymcu/vertical/dto/ArticleDTO.java rename to src/main/java/com/rymcu/forest/dto/ArticleDTO.java index ac89644..0950118 100644 --- a/src/main/java/com/rymcu/vertical/dto/ArticleDTO.java +++ b/src/main/java/com/rymcu/forest/dto/ArticleDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/ArticleSearchDTO.java b/src/main/java/com/rymcu/forest/dto/ArticleSearchDTO.java similarity index 84% rename from src/main/java/com/rymcu/vertical/dto/ArticleSearchDTO.java rename to src/main/java/com/rymcu/forest/dto/ArticleSearchDTO.java index 1e3bb6f..9702853 100644 --- a/src/main/java/com/rymcu/vertical/dto/ArticleSearchDTO.java +++ b/src/main/java/com/rymcu/forest/dto/ArticleSearchDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/ArticleTagDTO.java b/src/main/java/com/rymcu/forest/dto/ArticleTagDTO.java similarity index 91% rename from src/main/java/com/rymcu/vertical/dto/ArticleTagDTO.java rename to src/main/java/com/rymcu/forest/dto/ArticleTagDTO.java index ed69468..c825537 100644 --- a/src/main/java/com/rymcu/vertical/dto/ArticleTagDTO.java +++ b/src/main/java/com/rymcu/forest/dto/ArticleTagDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/Author.java b/src/main/java/com/rymcu/forest/dto/Author.java similarity index 87% rename from src/main/java/com/rymcu/vertical/dto/Author.java rename to src/main/java/com/rymcu/forest/dto/Author.java index 9b40ee3..5dca54e 100644 --- a/src/main/java/com/rymcu/vertical/dto/Author.java +++ b/src/main/java/com/rymcu/forest/dto/Author.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/ChangeEmailDTO.java b/src/main/java/com/rymcu/forest/dto/ChangeEmailDTO.java similarity index 84% rename from src/main/java/com/rymcu/vertical/dto/ChangeEmailDTO.java rename to src/main/java/com/rymcu/forest/dto/ChangeEmailDTO.java index e1d7cdd..e3a9e06 100644 --- a/src/main/java/com/rymcu/vertical/dto/ChangeEmailDTO.java +++ b/src/main/java/com/rymcu/forest/dto/ChangeEmailDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/CommentDTO.java b/src/main/java/com/rymcu/forest/dto/CommentDTO.java similarity index 97% rename from src/main/java/com/rymcu/vertical/dto/CommentDTO.java rename to src/main/java/com/rymcu/forest/dto/CommentDTO.java index 3ffb30d..1f93a53 100644 --- a/src/main/java/com/rymcu/vertical/dto/CommentDTO.java +++ b/src/main/java/com/rymcu/forest/dto/CommentDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/ForgetPasswordDTO.java b/src/main/java/com/rymcu/forest/dto/ForgetPasswordDTO.java similarity index 78% rename from src/main/java/com/rymcu/vertical/dto/ForgetPasswordDTO.java rename to src/main/java/com/rymcu/forest/dto/ForgetPasswordDTO.java index d65be2e..49d6112 100644 --- a/src/main/java/com/rymcu/vertical/dto/ForgetPasswordDTO.java +++ b/src/main/java/com/rymcu/forest/dto/ForgetPasswordDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/LabelModel.java b/src/main/java/com/rymcu/forest/dto/LabelModel.java similarity index 85% rename from src/main/java/com/rymcu/vertical/dto/LabelModel.java rename to src/main/java/com/rymcu/forest/dto/LabelModel.java index ed70e92..6654be8 100644 --- a/src/main/java/com/rymcu/vertical/dto/LabelModel.java +++ b/src/main/java/com/rymcu/forest/dto/LabelModel.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/LinkToImageUrlDTO.java b/src/main/java/com/rymcu/forest/dto/LinkToImageUrlDTO.java similarity index 81% rename from src/main/java/com/rymcu/vertical/dto/LinkToImageUrlDTO.java rename to src/main/java/com/rymcu/forest/dto/LinkToImageUrlDTO.java index 8a0ab8f..4f444db 100644 --- a/src/main/java/com/rymcu/vertical/dto/LinkToImageUrlDTO.java +++ b/src/main/java/com/rymcu/forest/dto/LinkToImageUrlDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/MenuDTO.java b/src/main/java/com/rymcu/forest/dto/MenuDTO.java similarity index 91% rename from src/main/java/com/rymcu/vertical/dto/MenuDTO.java rename to src/main/java/com/rymcu/forest/dto/MenuDTO.java index 1174b21..44e7d70 100644 --- a/src/main/java/com/rymcu/vertical/dto/MenuDTO.java +++ b/src/main/java/com/rymcu/forest/dto/MenuDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/NotificationDTO.java b/src/main/java/com/rymcu/forest/dto/NotificationDTO.java similarity index 79% rename from src/main/java/com/rymcu/vertical/dto/NotificationDTO.java rename to src/main/java/com/rymcu/forest/dto/NotificationDTO.java index 4384763..d661521 100644 --- a/src/main/java/com/rymcu/vertical/dto/NotificationDTO.java +++ b/src/main/java/com/rymcu/forest/dto/NotificationDTO.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; -import com.rymcu.vertical.entity.Notification; +import com.rymcu.forest.entity.Notification; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/rymcu/vertical/dto/PortfolioArticleDTO.java b/src/main/java/com/rymcu/forest/dto/PortfolioArticleDTO.java similarity index 91% rename from src/main/java/com/rymcu/vertical/dto/PortfolioArticleDTO.java rename to src/main/java/com/rymcu/forest/dto/PortfolioArticleDTO.java index 1916dd6..6a37646 100644 --- a/src/main/java/com/rymcu/vertical/dto/PortfolioArticleDTO.java +++ b/src/main/java/com/rymcu/forest/dto/PortfolioArticleDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/PortfolioDTO.java b/src/main/java/com/rymcu/forest/dto/PortfolioDTO.java similarity index 95% rename from src/main/java/com/rymcu/vertical/dto/PortfolioDTO.java rename to src/main/java/com/rymcu/forest/dto/PortfolioDTO.java index 2b6b486..bf8cbd1 100644 --- a/src/main/java/com/rymcu/vertical/dto/PortfolioDTO.java +++ b/src/main/java/com/rymcu/forest/dto/PortfolioDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/RoleDTO.java b/src/main/java/com/rymcu/forest/dto/RoleDTO.java similarity index 88% rename from src/main/java/com/rymcu/vertical/dto/RoleDTO.java rename to src/main/java/com/rymcu/forest/dto/RoleDTO.java index 6c3a3c8..b12a133 100644 --- a/src/main/java/com/rymcu/vertical/dto/RoleDTO.java +++ b/src/main/java/com/rymcu/forest/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/TokenUser.java b/src/main/java/com/rymcu/forest/dto/TokenUser.java similarity index 90% rename from src/main/java/com/rymcu/vertical/dto/TokenUser.java rename to src/main/java/com/rymcu/forest/dto/TokenUser.java index 69501de..387f770 100644 --- a/src/main/java/com/rymcu/vertical/dto/TokenUser.java +++ b/src/main/java/com/rymcu/forest/dto/TokenUser.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/UpdatePasswordDTO.java b/src/main/java/com/rymcu/forest/dto/UpdatePasswordDTO.java similarity index 82% rename from src/main/java/com/rymcu/vertical/dto/UpdatePasswordDTO.java rename to src/main/java/com/rymcu/forest/dto/UpdatePasswordDTO.java index 3a42008..8e8ab47 100644 --- a/src/main/java/com/rymcu/vertical/dto/UpdatePasswordDTO.java +++ b/src/main/java/com/rymcu/forest/dto/UpdatePasswordDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/UserDTO.java b/src/main/java/com/rymcu/forest/dto/UserDTO.java similarity index 89% rename from src/main/java/com/rymcu/vertical/dto/UserDTO.java rename to src/main/java/com/rymcu/forest/dto/UserDTO.java index fa6c87f..a4d755e 100644 --- a/src/main/java/com/rymcu/vertical/dto/UserDTO.java +++ b/src/main/java/com/rymcu/forest/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java b/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java similarity index 94% rename from src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java rename to src/main/java/com/rymcu/forest/dto/UserInfoDTO.java index f500e86..a510a12 100644 --- a/src/main/java/com/rymcu/vertical/dto/UserInfoDTO.java +++ b/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/UserRegisterInfoDTO.java b/src/main/java/com/rymcu/forest/dto/UserRegisterInfoDTO.java similarity index 84% rename from src/main/java/com/rymcu/vertical/dto/UserRegisterInfoDTO.java rename to src/main/java/com/rymcu/forest/dto/UserRegisterInfoDTO.java index 740fa08..f53987f 100644 --- a/src/main/java/com/rymcu/vertical/dto/UserRegisterInfoDTO.java +++ b/src/main/java/com/rymcu/forest/dto/UserRegisterInfoDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto; +package com.rymcu.forest.dto; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/admin/Dashboard.java b/src/main/java/com/rymcu/forest/dto/admin/Dashboard.java similarity index 88% rename from src/main/java/com/rymcu/vertical/dto/admin/Dashboard.java rename to src/main/java/com/rymcu/forest/dto/admin/Dashboard.java index 4a9ba87..1adac17 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/Dashboard.java +++ b/src/main/java/com/rymcu/forest/dto/admin/Dashboard.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/admin/DashboardData.java b/src/main/java/com/rymcu/forest/dto/admin/DashboardData.java similarity index 78% rename from src/main/java/com/rymcu/vertical/dto/admin/DashboardData.java rename to src/main/java/com/rymcu/forest/dto/admin/DashboardData.java index 76f5225..dba8b12 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/DashboardData.java +++ b/src/main/java/com/rymcu/forest/dto/admin/DashboardData.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/admin/TagDTO.java b/src/main/java/com/rymcu/forest/dto/admin/TagDTO.java similarity index 79% rename from src/main/java/com/rymcu/vertical/dto/admin/TagDTO.java rename to src/main/java/com/rymcu/forest/dto/admin/TagDTO.java index 27960bf..7ee4b36 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/TagDTO.java +++ b/src/main/java/com/rymcu/forest/dto/admin/TagDTO.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; -import com.rymcu.vertical.dto.Author; +import com.rymcu.forest.dto.Author; import lombok.Data; /** diff --git a/src/main/java/com/rymcu/vertical/dto/admin/TopicDTO.java b/src/main/java/com/rymcu/forest/dto/admin/TopicDTO.java similarity index 82% rename from src/main/java/com/rymcu/vertical/dto/admin/TopicDTO.java rename to src/main/java/com/rymcu/forest/dto/admin/TopicDTO.java index ec73a6c..f8cafbc 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/TopicDTO.java +++ b/src/main/java/com/rymcu/forest/dto/admin/TopicDTO.java @@ -1,6 +1,5 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; -import com.rymcu.vertical.dto.Author; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/dto/admin/TopicTagDTO.java b/src/main/java/com/rymcu/forest/dto/admin/TopicTagDTO.java similarity index 78% rename from src/main/java/com/rymcu/vertical/dto/admin/TopicTagDTO.java rename to src/main/java/com/rymcu/forest/dto/admin/TopicTagDTO.java index dc7b5fb..3bad3b5 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/TopicTagDTO.java +++ b/src/main/java/com/rymcu/forest/dto/admin/TopicTagDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/admin/UserRoleDTO.java b/src/main/java/com/rymcu/forest/dto/admin/UserRoleDTO.java similarity index 78% rename from src/main/java/com/rymcu/vertical/dto/admin/UserRoleDTO.java rename to src/main/java/com/rymcu/forest/dto/admin/UserRoleDTO.java index ed325c8..a33f8c5 100644 --- a/src/main/java/com/rymcu/vertical/dto/admin/UserRoleDTO.java +++ b/src/main/java/com/rymcu/forest/dto/admin/UserRoleDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto.admin; +package com.rymcu.forest.dto.admin; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/dto/baidu/TagNlpDTO.java b/src/main/java/com/rymcu/forest/dto/baidu/TagNlpDTO.java similarity index 81% rename from src/main/java/com/rymcu/vertical/dto/baidu/TagNlpDTO.java rename to src/main/java/com/rymcu/forest/dto/baidu/TagNlpDTO.java index 2dcd19d..14f156f 100644 --- a/src/main/java/com/rymcu/vertical/dto/baidu/TagNlpDTO.java +++ b/src/main/java/com/rymcu/forest/dto/baidu/TagNlpDTO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.dto.baidu; +package com.rymcu.forest.dto.baidu; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Article.java b/src/main/java/com/rymcu/forest/entity/Article.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Article.java rename to src/main/java/com/rymcu/forest/entity/Article.java index 6aefb49..3fded31 100644 --- a/src/main/java/com/rymcu/vertical/entity/Article.java +++ b/src/main/java/com/rymcu/forest/entity/Article.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/ArticleContent.java b/src/main/java/com/rymcu/forest/entity/ArticleContent.java similarity index 93% rename from src/main/java/com/rymcu/vertical/entity/ArticleContent.java rename to src/main/java/com/rymcu/forest/entity/ArticleContent.java index baf2790..26bf9d9 100644 --- a/src/main/java/com/rymcu/vertical/entity/ArticleContent.java +++ b/src/main/java/com/rymcu/forest/entity/ArticleContent.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/BaseDO.java b/src/main/java/com/rymcu/forest/entity/BaseDO.java similarity index 93% rename from src/main/java/com/rymcu/vertical/entity/BaseDO.java rename to src/main/java/com/rymcu/forest/entity/BaseDO.java index 650d48b..2a353bd 100644 --- a/src/main/java/com/rymcu/vertical/entity/BaseDO.java +++ b/src/main/java/com/rymcu/forest/entity/BaseDO.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/src/main/java/com/rymcu/vertical/entity/Comment.java b/src/main/java/com/rymcu/forest/entity/Comment.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Comment.java rename to src/main/java/com/rymcu/forest/entity/Comment.java index d9b71cc..6f59d9b 100644 --- a/src/main/java/com/rymcu/vertical/entity/Comment.java +++ b/src/main/java/com/rymcu/forest/entity/Comment.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Follow.java b/src/main/java/com/rymcu/forest/entity/Follow.java similarity index 95% rename from src/main/java/com/rymcu/vertical/entity/Follow.java rename to src/main/java/com/rymcu/forest/entity/Follow.java index 679f0bd..b87855c 100644 --- a/src/main/java/com/rymcu/vertical/entity/Follow.java +++ b/src/main/java/com/rymcu/forest/entity/Follow.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Notification.java b/src/main/java/com/rymcu/forest/entity/Notification.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Notification.java rename to src/main/java/com/rymcu/forest/entity/Notification.java index 83ade86..ceb4b6c 100644 --- a/src/main/java/com/rymcu/vertical/entity/Notification.java +++ b/src/main/java/com/rymcu/forest/entity/Notification.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Permission.java b/src/main/java/com/rymcu/forest/entity/Permission.java similarity index 85% rename from src/main/java/com/rymcu/vertical/entity/Permission.java rename to src/main/java/com/rymcu/forest/entity/Permission.java index aba2aef..e24ce23 100644 --- a/src/main/java/com/rymcu/vertical/entity/Permission.java +++ b/src/main/java/com/rymcu/forest/entity/Permission.java @@ -1,7 +1,6 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; -import org.apache.ibatis.type.JdbcType; import tk.mybatis.mapper.annotation.ColumnType; import javax.persistence.Column; @@ -9,7 +8,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; -import java.util.Date; /** * @author ronger diff --git a/src/main/java/com/rymcu/vertical/entity/Portfolio.java b/src/main/java/com/rymcu/forest/entity/Portfolio.java similarity index 96% rename from src/main/java/com/rymcu/vertical/entity/Portfolio.java rename to src/main/java/com/rymcu/forest/entity/Portfolio.java index 3cd2482..c0ad005 100644 --- a/src/main/java/com/rymcu/vertical/entity/Portfolio.java +++ b/src/main/java/com/rymcu/forest/entity/Portfolio.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Role.java b/src/main/java/com/rymcu/forest/entity/Role.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Role.java rename to src/main/java/com/rymcu/forest/entity/Role.java index c83c25b..ec8ce28 100644 --- a/src/main/java/com/rymcu/vertical/entity/Role.java +++ b/src/main/java/com/rymcu/forest/entity/Role.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/SpecialDay.java b/src/main/java/com/rymcu/forest/entity/SpecialDay.java similarity index 96% rename from src/main/java/com/rymcu/vertical/entity/SpecialDay.java rename to src/main/java/com/rymcu/forest/entity/SpecialDay.java index 7c8dafb..e221995 100644 --- a/src/main/java/com/rymcu/vertical/entity/SpecialDay.java +++ b/src/main/java/com/rymcu/forest/entity/SpecialDay.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Tag.java b/src/main/java/com/rymcu/forest/entity/Tag.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Tag.java rename to src/main/java/com/rymcu/forest/entity/Tag.java index 9184f90..42119ec 100644 --- a/src/main/java/com/rymcu/vertical/entity/Tag.java +++ b/src/main/java/com/rymcu/forest/entity/Tag.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Topic.java b/src/main/java/com/rymcu/forest/entity/Topic.java similarity index 96% rename from src/main/java/com/rymcu/vertical/entity/Topic.java rename to src/main/java/com/rymcu/forest/entity/Topic.java index 0011dda..49bc120 100644 --- a/src/main/java/com/rymcu/vertical/entity/Topic.java +++ b/src/main/java/com/rymcu/forest/entity/Topic.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/User.java b/src/main/java/com/rymcu/forest/entity/User.java similarity index 98% rename from src/main/java/com/rymcu/vertical/entity/User.java rename to src/main/java/com/rymcu/forest/entity/User.java index 1faaf98..a5ef26a 100644 --- a/src/main/java/com/rymcu/vertical/entity/User.java +++ b/src/main/java/com/rymcu/forest/entity/User.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/UserExtend.java b/src/main/java/com/rymcu/forest/entity/UserExtend.java similarity index 90% rename from src/main/java/com/rymcu/vertical/entity/UserExtend.java rename to src/main/java/com/rymcu/forest/entity/UserExtend.java index a945dac..a45962f 100644 --- a/src/main/java/com/rymcu/vertical/entity/UserExtend.java +++ b/src/main/java/com/rymcu/forest/entity/UserExtend.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/Visit.java b/src/main/java/com/rymcu/forest/entity/Visit.java similarity index 97% rename from src/main/java/com/rymcu/vertical/entity/Visit.java rename to src/main/java/com/rymcu/forest/entity/Visit.java index 6cc1f24..94e251a 100644 --- a/src/main/java/com/rymcu/vertical/entity/Visit.java +++ b/src/main/java/com/rymcu/forest/entity/Visit.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/entity/WxUser.java b/src/main/java/com/rymcu/forest/entity/WxUser.java similarity index 95% rename from src/main/java/com/rymcu/vertical/entity/WxUser.java rename to src/main/java/com/rymcu/forest/entity/WxUser.java index e9d4103..2748754 100644 --- a/src/main/java/com/rymcu/vertical/entity/WxUser.java +++ b/src/main/java/com/rymcu/forest/entity/WxUser.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.entity; +package com.rymcu.forest.entity; import lombok.Data; diff --git a/src/main/java/com/rymcu/vertical/jwt/aop/RestAuthTokenInterceptor.java b/src/main/java/com/rymcu/forest/jwt/aop/RestAuthTokenInterceptor.java similarity index 87% rename from src/main/java/com/rymcu/vertical/jwt/aop/RestAuthTokenInterceptor.java rename to src/main/java/com/rymcu/forest/jwt/aop/RestAuthTokenInterceptor.java index 99ea3dd..b3ee752 100644 --- a/src/main/java/com/rymcu/vertical/jwt/aop/RestAuthTokenInterceptor.java +++ b/src/main/java/com/rymcu/forest/jwt/aop/RestAuthTokenInterceptor.java @@ -1,13 +1,13 @@ -package com.rymcu.vertical.jwt.aop; +package com.rymcu.forest.jwt.aop; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.jwt.model.TokenModel; -import com.rymcu.vertical.jwt.service.TokenManager; -import com.rymcu.vertical.jwt.util.oConvertUtils; -import com.rymcu.vertical.web.api.exception.ErrorCode; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.jwt.def.JwtConstants; +import com.rymcu.forest.jwt.model.TokenModel; +import com.rymcu.forest.jwt.service.TokenManager; +import com.rymcu.forest.jwt.util.oConvertUtils; +import com.rymcu.forest.web.api.exception.ErrorCode; +import com.rymcu.forest.web.api.exception.BaseApiException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureException; diff --git a/src/main/java/com/rymcu/vertical/jwt/def/JwtConstants.java b/src/main/java/com/rymcu/forest/jwt/def/JwtConstants.java similarity index 93% rename from src/main/java/com/rymcu/vertical/jwt/def/JwtConstants.java rename to src/main/java/com/rymcu/forest/jwt/def/JwtConstants.java index cdee8a1..07fcf21 100644 --- a/src/main/java/com/rymcu/vertical/jwt/def/JwtConstants.java +++ b/src/main/java/com/rymcu/forest/jwt/def/JwtConstants.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.jwt.def; +package com.rymcu.forest.jwt.def; /** * @author ronger diff --git a/src/main/java/com/rymcu/vertical/jwt/model/TokenModel.java b/src/main/java/com/rymcu/forest/jwt/model/TokenModel.java similarity index 94% rename from src/main/java/com/rymcu/vertical/jwt/model/TokenModel.java rename to src/main/java/com/rymcu/forest/jwt/model/TokenModel.java index 85e7f7f..55918c6 100644 --- a/src/main/java/com/rymcu/vertical/jwt/model/TokenModel.java +++ b/src/main/java/com/rymcu/forest/jwt/model/TokenModel.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.jwt.model; +package com.rymcu.forest.jwt.model; /** * Token的Model类，可以增加字段提高安全性，例如时间戳、url签名 diff --git a/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java b/src/main/java/com/rymcu/forest/jwt/service/RedisTokenManager.java similarity index 92% rename from src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java rename to src/main/java/com/rymcu/forest/jwt/service/RedisTokenManager.java index fbb3232..5a20136 100644 --- a/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java +++ b/src/main/java/com/rymcu/forest/jwt/service/RedisTokenManager.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.jwt.service; +package com.rymcu.forest.jwt.service; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.jwt.model.TokenModel; +import com.rymcu.forest.jwt.def.JwtConstants; +import com.rymcu.forest.jwt.model.TokenModel; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java b/src/main/java/com/rymcu/forest/jwt/service/TokenManager.java similarity index 88% rename from src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java rename to src/main/java/com/rymcu/forest/jwt/service/TokenManager.java index 577c37a..66ac47d 100644 --- a/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java +++ b/src/main/java/com/rymcu/forest/jwt/service/TokenManager.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.jwt.service; +package com.rymcu.forest.jwt.service; -import com.rymcu.vertical.jwt.model.TokenModel; +import com.rymcu.forest.jwt.model.TokenModel; /** * 对token进行操作的接口 diff --git a/src/main/java/com/rymcu/vertical/jwt/util/oConvertUtils.java b/src/main/java/com/rymcu/forest/jwt/util/oConvertUtils.java similarity index 99% rename from src/main/java/com/rymcu/vertical/jwt/util/oConvertUtils.java rename to src/main/java/com/rymcu/forest/jwt/util/oConvertUtils.java index 2de6f60..0d3a5c8 100644 --- a/src/main/java/com/rymcu/vertical/jwt/util/oConvertUtils.java +++ b/src/main/java/com/rymcu/forest/jwt/util/oConvertUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.jwt.util; +package com.rymcu.forest.jwt.util; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/rymcu/vertical/mapper/ArticleMapper.java b/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java similarity index 93% rename from src/main/java/com/rymcu/vertical/mapper/ArticleMapper.java rename to src/main/java/com/rymcu/forest/mapper/ArticleMapper.java index 1c51297..bb54796 100644 --- a/src/main/java/com/rymcu/vertical/mapper/ArticleMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java @@ -1,11 +1,11 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.ArticleTagDTO; -import com.rymcu.vertical.dto.PortfolioArticleDTO; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.entity.ArticleContent; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.ArticleTagDTO; +import com.rymcu.forest.dto.PortfolioArticleDTO; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.entity.ArticleContent; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/CommentMapper.java b/src/main/java/com/rymcu/forest/mapper/CommentMapper.java similarity index 82% rename from src/main/java/com/rymcu/vertical/mapper/CommentMapper.java rename to src/main/java/com/rymcu/forest/mapper/CommentMapper.java index 21dde41..aa369ac 100644 --- a/src/main/java/com/rymcu/vertical/mapper/CommentMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/CommentMapper.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.Author; -import com.rymcu.vertical.dto.CommentDTO; -import com.rymcu.vertical.entity.Comment; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.Author; +import com.rymcu.forest.dto.CommentDTO; +import com.rymcu.forest.entity.Comment; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/DashboardMapper.java b/src/main/java/com/rymcu/forest/mapper/DashboardMapper.java similarity index 90% rename from src/main/java/com/rymcu/vertical/mapper/DashboardMapper.java rename to src/main/java/com/rymcu/forest/mapper/DashboardMapper.java index 1245e72..ce2a08e 100644 --- a/src/main/java/com/rymcu/vertical/mapper/DashboardMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/DashboardMapper.java @@ -1,7 +1,6 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.dto.admin.DashboardData; -import org.apache.ibatis.annotations.Param; +import com.rymcu.forest.dto.admin.DashboardData; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/FollowMapper.java b/src/main/java/com/rymcu/forest/mapper/FollowMapper.java similarity index 82% rename from src/main/java/com/rymcu/vertical/mapper/FollowMapper.java rename to src/main/java/com/rymcu/forest/mapper/FollowMapper.java index ec1e638..a99a955 100644 --- a/src/main/java/com/rymcu/vertical/mapper/FollowMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/FollowMapper.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.entity.Follow; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.entity.Follow; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/NotificationMapper.java b/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java similarity index 90% rename from src/main/java/com/rymcu/vertical/mapper/NotificationMapper.java rename to src/main/java/com/rymcu/forest/mapper/NotificationMapper.java index 6f504c2..8a3dd6f 100644 --- a/src/main/java/com/rymcu/vertical/mapper/NotificationMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.Notification; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.Notification; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/PermissionMapper.java b/src/main/java/com/rymcu/forest/mapper/PermissionMapper.java similarity index 61% rename from src/main/java/com/rymcu/vertical/mapper/PermissionMapper.java rename to src/main/java/com/rymcu/forest/mapper/PermissionMapper.java index a880b4d..1db3cb3 100644 --- a/src/main/java/com/rymcu/vertical/mapper/PermissionMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/PermissionMapper.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.Permission; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.Permission; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/PortfolioMapper.java b/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java similarity index 91% rename from src/main/java/com/rymcu/vertical/mapper/PortfolioMapper.java rename to src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java index 58f40e2..7439e31 100644 --- a/src/main/java/com/rymcu/vertical/mapper/PortfolioMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.PortfolioDTO; -import com.rymcu.vertical.entity.Portfolio; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.PortfolioDTO; +import com.rymcu.forest.entity.Portfolio; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/RoleMapper.java b/src/main/java/com/rymcu/forest/mapper/RoleMapper.java similarity index 75% rename from src/main/java/com/rymcu/vertical/mapper/RoleMapper.java rename to src/main/java/com/rymcu/forest/mapper/RoleMapper.java index 6d498c8..813d7fd 100644 --- a/src/main/java/com/rymcu/vertical/mapper/RoleMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/RoleMapper.java @@ -1,8 +1,7 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.Role; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/forest/mapper/SpecialDayMapper.java b/src/main/java/com/rymcu/forest/mapper/SpecialDayMapper.java new file mode 100644 index 0000000..2b08438 --- /dev/null +++ b/src/main/java/com/rymcu/forest/mapper/SpecialDayMapper.java @@ -0,0 +1,10 @@ +package com.rymcu.forest.mapper; + +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.SpecialDay; + +/** + * @author ronger + */ +public interface SpecialDayMapper extends Mapper { +} diff --git a/src/main/java/com/rymcu/vertical/mapper/TagMapper.java b/src/main/java/com/rymcu/forest/mapper/TagMapper.java similarity index 91% rename from src/main/java/com/rymcu/vertical/mapper/TagMapper.java rename to src/main/java/com/rymcu/forest/mapper/TagMapper.java index f2643a6..bc53ff5 100644 --- a/src/main/java/com/rymcu/vertical/mapper/TagMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/TagMapper.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.LabelModel; -import com.rymcu.vertical.entity.Tag; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.LabelModel; +import com.rymcu.forest.entity.Tag; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/TopicMapper.java b/src/main/java/com/rymcu/forest/mapper/TopicMapper.java similarity index 86% rename from src/main/java/com/rymcu/vertical/mapper/TopicMapper.java rename to src/main/java/com/rymcu/forest/mapper/TopicMapper.java index d1dbd99..3c348cc 100644 --- a/src/main/java/com/rymcu/vertical/mapper/TopicMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/TopicMapper.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.admin.TagDTO; -import com.rymcu.vertical.dto.admin.TopicDTO; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.entity.Topic; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.admin.TagDTO; +import com.rymcu.forest.dto.admin.TopicDTO; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.entity.Topic; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/mapper/UserExtendMapper.java b/src/main/java/com/rymcu/forest/mapper/UserExtendMapper.java similarity index 70% rename from src/main/java/com/rymcu/vertical/mapper/UserExtendMapper.java rename to src/main/java/com/rymcu/forest/mapper/UserExtendMapper.java index e8ec1a3..ba5372c 100644 --- a/src/main/java/com/rymcu/vertical/mapper/UserExtendMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/UserExtendMapper.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.UserExtend; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.UserExtend; import org.apache.ibatis.annotations.Param; /** diff --git a/src/main/java/com/rymcu/vertical/mapper/UserMapper.java b/src/main/java/com/rymcu/forest/mapper/UserMapper.java similarity index 92% rename from src/main/java/com/rymcu/vertical/mapper/UserMapper.java rename to src/main/java/com/rymcu/forest/mapper/UserMapper.java index 4bb394b..901e765 100644 --- a/src/main/java/com/rymcu/vertical/mapper/UserMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/UserMapper.java @@ -1,14 +1,12 @@ -package com.rymcu.vertical.mapper; +package com.rymcu.forest.mapper; -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.dto.Author; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.dto.UserInfoDTO; -import com.rymcu.vertical.entity.User; +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.Author; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.dto.UserInfoDTO; +import com.rymcu.forest.entity.User; import org.apache.ibatis.annotations.Param; -import java.util.Map; - /** * @author ronger */ diff --git a/src/main/java/com/rymcu/forest/mapper/VisitMapper.java b/src/main/java/com/rymcu/forest/mapper/VisitMapper.java new file mode 100644 index 0000000..05b49d6 --- /dev/null +++ b/src/main/java/com/rymcu/forest/mapper/VisitMapper.java @@ -0,0 +1,10 @@ +package com.rymcu.forest.mapper; + +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.Visit; + +/** + * @author ronger + */ +public interface VisitMapper extends Mapper { +} diff --git a/src/main/java/com/rymcu/forest/mapper/WxUserMapper.java b/src/main/java/com/rymcu/forest/mapper/WxUserMapper.java new file mode 100644 index 0000000..f831966 --- /dev/null +++ b/src/main/java/com/rymcu/forest/mapper/WxUserMapper.java @@ -0,0 +1,10 @@ +package com.rymcu.forest.mapper; + +import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.entity.WxUser; + +/** + * @author ronger + */ +public interface WxUserMapper extends Mapper { +} diff --git a/src/main/java/com/rymcu/vertical/service/ArticleService.java b/src/main/java/com/rymcu/forest/service/ArticleService.java similarity index 89% rename from src/main/java/com/rymcu/vertical/service/ArticleService.java rename to src/main/java/com/rymcu/forest/service/ArticleService.java index 74ead8d..9454bad 100644 --- a/src/main/java/com/rymcu/vertical/service/ArticleService.java +++ b/src/main/java/com/rymcu/forest/service/ArticleService.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.ArticleSearchDTO; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.ArticleSearchDTO; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.web.api.exception.BaseApiException; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/rymcu/vertical/service/CommentService.java b/src/main/java/com/rymcu/forest/service/CommentService.java similarity index 64% rename from src/main/java/com/rymcu/vertical/service/CommentService.java rename to src/main/java/com/rymcu/forest/service/CommentService.java index f859f25..9199b90 100644 --- a/src/main/java/com/rymcu/vertical/service/CommentService.java +++ b/src/main/java/com/rymcu/forest/service/CommentService.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.CommentDTO; -import com.rymcu.vertical.entity.Comment; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.CommentDTO; +import com.rymcu.forest.entity.Comment; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/service/DashboardService.java b/src/main/java/com/rymcu/forest/service/DashboardService.java similarity index 80% rename from src/main/java/com/rymcu/vertical/service/DashboardService.java rename to src/main/java/com/rymcu/forest/service/DashboardService.java index abc1a15..2a1639a 100644 --- a/src/main/java/com/rymcu/vertical/service/DashboardService.java +++ b/src/main/java/com/rymcu/forest/service/DashboardService.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.dto.admin.Dashboard; +import com.rymcu.forest.dto.admin.Dashboard; import java.util.Map; diff --git a/src/main/java/com/rymcu/vertical/service/FollowService.java b/src/main/java/com/rymcu/forest/service/FollowService.java similarity index 83% rename from src/main/java/com/rymcu/vertical/service/FollowService.java rename to src/main/java/com/rymcu/forest/service/FollowService.java index 1745702..d821fcc 100644 --- a/src/main/java/com/rymcu/vertical/service/FollowService.java +++ b/src/main/java/com/rymcu/forest/service/FollowService.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.entity.Follow; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.entity.Follow; +import com.rymcu.forest.web.api.exception.BaseApiException; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/service/JavaMailService.java b/src/main/java/com/rymcu/forest/service/JavaMailService.java similarity index 93% rename from src/main/java/com/rymcu/vertical/service/JavaMailService.java rename to src/main/java/com/rymcu/forest/service/JavaMailService.java index bb4e8cb..269cd20 100644 --- a/src/main/java/com/rymcu/vertical/service/JavaMailService.java +++ b/src/main/java/com/rymcu/forest/service/JavaMailService.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; import javax.mail.MessagingException; diff --git a/src/main/java/com/rymcu/vertical/service/NotificationService.java b/src/main/java/com/rymcu/forest/service/NotificationService.java similarity index 84% rename from src/main/java/com/rymcu/vertical/service/NotificationService.java rename to src/main/java/com/rymcu/forest/service/NotificationService.java index 14537b5..4cf634b 100644 --- a/src/main/java/com/rymcu/vertical/service/NotificationService.java +++ b/src/main/java/com/rymcu/forest/service/NotificationService.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.NotificationDTO; -import com.rymcu.vertical.entity.Notification; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.NotificationDTO; +import com.rymcu.forest.entity.Notification; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/service/PermissionService.java b/src/main/java/com/rymcu/forest/service/PermissionService.java similarity index 63% rename from src/main/java/com/rymcu/vertical/service/PermissionService.java rename to src/main/java/com/rymcu/forest/service/PermissionService.java index bf577d1..53cabba 100644 --- a/src/main/java/com/rymcu/vertical/service/PermissionService.java +++ b/src/main/java/com/rymcu/forest/service/PermissionService.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.entity.Permission; -import com.rymcu.vertical.entity.User; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.entity.Permission; +import com.rymcu.forest.entity.User; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/service/PortfolioService.java b/src/main/java/com/rymcu/forest/service/PortfolioService.java similarity index 82% rename from src/main/java/com/rymcu/vertical/service/PortfolioService.java rename to src/main/java/com/rymcu/forest/service/PortfolioService.java index 504b687..9413ccd 100644 --- a/src/main/java/com/rymcu/vertical/service/PortfolioService.java +++ b/src/main/java/com/rymcu/forest/service/PortfolioService.java @@ -1,11 +1,11 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.PortfolioArticleDTO; -import com.rymcu.vertical.dto.PortfolioDTO; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.entity.Portfolio; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.PortfolioArticleDTO; +import com.rymcu.forest.dto.PortfolioDTO; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.entity.Portfolio; +import com.rymcu.forest.web.api.exception.BaseApiException; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/rymcu/vertical/service/RoleService.java b/src/main/java/com/rymcu/forest/service/RoleService.java similarity index 80% rename from src/main/java/com/rymcu/vertical/service/RoleService.java rename to src/main/java/com/rymcu/forest/service/RoleService.java index 0bac4f7..f5db02d 100644 --- a/src/main/java/com/rymcu/vertical/service/RoleService.java +++ b/src/main/java/com/rymcu/forest/service/RoleService.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.entity.Role; +import com.rymcu.forest.entity.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/rymcu/forest/service/SpecialDayService.java b/src/main/java/com/rymcu/forest/service/SpecialDayService.java new file mode 100644 index 0000000..19cbe45 --- /dev/null +++ b/src/main/java/com/rymcu/forest/service/SpecialDayService.java @@ -0,0 +1,10 @@ +package com.rymcu.forest.service; + +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.entity.SpecialDay; + +/** + * @author ronger + */ +public interface SpecialDayService extends Service { +} diff --git a/src/main/java/com/rymcu/vertical/service/TagService.java b/src/main/java/com/rymcu/forest/service/TagService.java similarity index 74% rename from src/main/java/com/rymcu/vertical/service/TagService.java rename to src/main/java/com/rymcu/forest/service/TagService.java index 9dc4300..0b36b76 100644 --- a/src/main/java/com/rymcu/vertical/service/TagService.java +++ b/src/main/java/com/rymcu/forest/service/TagService.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.LabelModel; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.LabelModel; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.web.api.exception.BaseApiException; import java.io.UnsupportedEncodingException; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/service/TopicService.java b/src/main/java/com/rymcu/forest/service/TopicService.java similarity index 84% rename from src/main/java/com/rymcu/vertical/service/TopicService.java rename to src/main/java/com/rymcu/forest/service/TopicService.java index 60bbd27..4fda791 100644 --- a/src/main/java/com/rymcu/vertical/service/TopicService.java +++ b/src/main/java/com/rymcu/forest/service/TopicService.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.admin.TopicTagDTO; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.entity.Topic; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.admin.TopicTagDTO; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.entity.Topic; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/rymcu/vertical/service/UserService.java b/src/main/java/com/rymcu/forest/service/UserService.java similarity index 93% rename from src/main/java/com/rymcu/vertical/service/UserService.java rename to src/main/java/com/rymcu/forest/service/UserService.java index 54f8246..87530c4 100644 --- a/src/main/java/com/rymcu/vertical/service/UserService.java +++ b/src/main/java/com/rymcu/forest/service/UserService.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.entity.UserExtend; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.entity.UserExtend; import org.apache.ibatis.exceptions.TooManyResultsException; import java.util.Map; diff --git a/src/main/java/com/rymcu/forest/service/VisitService.java b/src/main/java/com/rymcu/forest/service/VisitService.java new file mode 100644 index 0000000..fea0bc1 --- /dev/null +++ b/src/main/java/com/rymcu/forest/service/VisitService.java @@ -0,0 +1,10 @@ +package com.rymcu.forest.service; + +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.entity.Visit; + +/** + * @author ronger + */ +public interface VisitService extends Service { +} diff --git a/src/main/java/com/rymcu/vertical/service/WxUserService.java b/src/main/java/com/rymcu/forest/service/WxUserService.java similarity index 60% rename from src/main/java/com/rymcu/vertical/service/WxUserService.java rename to src/main/java/com/rymcu/forest/service/WxUserService.java index 59e8527..89a546d 100644 --- a/src/main/java/com/rymcu/vertical/service/WxUserService.java +++ b/src/main/java/com/rymcu/forest/service/WxUserService.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.service; +package com.rymcu.forest.service; -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.entity.WxUser; +import com.rymcu.forest.core.service.Service; +import com.rymcu.forest.entity.WxUser; import me.chanjar.weixin.mp.bean.result.WxMpUser; /** diff --git a/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java similarity index 95% rename from src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java index 756bb39..a9ba491 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java @@ -1,20 +1,20 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.constant.NotificationConstant; -import com.rymcu.vertical.core.constant.ProjectConstant; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.entity.ArticleContent; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.ArticleMapper; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.CommentService; -import com.rymcu.vertical.service.TagService; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.*; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.constant.NotificationConstant; +import com.rymcu.forest.core.constant.ProjectConstant; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.entity.ArticleContent; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.ArticleMapper; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.CommentService; +import com.rymcu.forest.service.TagService; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.*; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.commons.lang.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java similarity index 88% rename from src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java index 378c37b..174e66e 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/CommentServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/CommentServiceImpl.java @@ -1,17 +1,17 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.constant.NotificationConstant; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.Author; -import com.rymcu.vertical.dto.CommentDTO; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.entity.Comment; -import com.rymcu.vertical.mapper.CommentMapper; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.CommentService; -import com.rymcu.vertical.util.Html2TextUtil; -import com.rymcu.vertical.util.NotificationUtils; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.constant.NotificationConstant; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.Author; +import com.rymcu.forest.dto.CommentDTO; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.entity.Comment; +import com.rymcu.forest.mapper.CommentMapper; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.CommentService; +import com.rymcu.forest.util.Html2TextUtil; +import com.rymcu.forest.util.NotificationUtils; +import com.rymcu.forest.util.Utils; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rymcu/vertical/service/impl/DashboardServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/DashboardServiceImpl.java similarity index 96% rename from src/main/java/com/rymcu/vertical/service/impl/DashboardServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/DashboardServiceImpl.java index 71efb0e..dd02b84 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/DashboardServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/DashboardServiceImpl.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.dto.admin.Dashboard; -import com.rymcu.vertical.dto.admin.DashboardData; -import com.rymcu.vertical.mapper.DashboardMapper; -import com.rymcu.vertical.service.DashboardService; +import com.rymcu.forest.dto.admin.Dashboard; +import com.rymcu.forest.dto.admin.DashboardData; +import com.rymcu.forest.mapper.DashboardMapper; +import com.rymcu.forest.service.DashboardService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/service/impl/FollowServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/FollowServiceImpl.java similarity index 79% rename from src/main/java/com/rymcu/vertical/service/impl/FollowServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/FollowServiceImpl.java index a603d0b..5985562 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/FollowServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/FollowServiceImpl.java @@ -1,15 +1,15 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.constant.NotificationConstant; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.entity.Follow; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.FollowMapper; -import com.rymcu.vertical.service.FollowService; -import com.rymcu.vertical.util.NotificationUtils; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.constant.NotificationConstant; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.entity.Follow; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.FollowMapper; +import com.rymcu.forest.service.FollowService; +import com.rymcu.forest.util.NotificationUtils; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/service/impl/JavaMailServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java similarity index 96% rename from src/main/java/com/rymcu/vertical/service/impl/JavaMailServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java index d5c0395..0b40654 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/JavaMailServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.redis.RedisService; -import com.rymcu.vertical.service.JavaMailService; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.service.redis.RedisService; +import com.rymcu.forest.service.JavaMailService; +import com.rymcu.forest.util.Utils; import org.apache.commons.lang.time.StopWatch; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; @@ -69,7 +69,7 @@ public class JavaMailServiceImpl implements JavaMailService { props.put("mail.smtp.host", SERVER_HOST); props.put("mail.smtp.port", SERVER_PORT); // 如果使用ssl，则去掉使用25端口的配置，进行如下配置, - props.put("mail.smtp.socketFactory.class", "com.rymcu.vertical.util.MailSSLSocketFactory"); + props.put("mail.smtp.socketFactory.class", "com.rymcu.forest.util.MailSSLSocketFactory"); props.put("mail.smtp.socketFactory.port", SERVER_PORT); // 发件人的账号，填写控制台配置的发信地址,比如xxx@xxx.com props.put("mail.user", USERNAME); diff --git a/src/main/java/com/rymcu/vertical/service/impl/NotificationServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java similarity index 92% rename from src/main/java/com/rymcu/vertical/service/impl/NotificationServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java index 6d22435..7aef442 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/NotificationServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java @@ -1,16 +1,16 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.Author; -import com.rymcu.vertical.dto.NotificationDTO; -import com.rymcu.vertical.entity.Comment; -import com.rymcu.vertical.entity.Follow; -import com.rymcu.vertical.entity.Notification; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.NotificationMapper; -import com.rymcu.vertical.service.*; -import com.rymcu.vertical.util.BeanCopierUtil; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.Author; +import com.rymcu.forest.dto.NotificationDTO; +import com.rymcu.forest.entity.Comment; +import com.rymcu.forest.entity.Follow; +import com.rymcu.forest.entity.Notification; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.NotificationMapper; +import com.rymcu.forest.service.*; +import com.rymcu.forest.util.BeanCopierUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rymcu/vertical/service/impl/PermissionServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/PermissionServiceImpl.java similarity index 66% rename from src/main/java/com/rymcu/vertical/service/impl/PermissionServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/PermissionServiceImpl.java index 4e42d2b..17f1cd9 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/PermissionServiceImpl.java @@ -1,14 +1,13 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.entity.Permission; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.PermissionMapper; -import com.rymcu.vertical.service.PermissionService; -import com.rymcu.vertical.service.RoleService; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.entity.Permission; +import com.rymcu.forest.entity.Role; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.PermissionMapper; +import com.rymcu.forest.service.PermissionService; +import com.rymcu.forest.service.RoleService; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/src/main/java/com/rymcu/vertical/service/impl/PortfolioServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java similarity index 92% rename from src/main/java/com/rymcu/vertical/service/impl/PortfolioServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java index fdf75db..6172e14 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java @@ -1,18 +1,18 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.Portfolio; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.PortfolioMapper; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.PortfolioService; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.util.Utils; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.Portfolio; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.PortfolioMapper; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.PortfolioService; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.Utils; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/service/impl/RoleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/RoleServiceImpl.java similarity index 86% rename from src/main/java/com/rymcu/vertical/service/impl/RoleServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/RoleServiceImpl.java index 785f154..cc0e387 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/RoleServiceImpl.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.RoleMapper; -import com.rymcu.vertical.service.RoleService; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.entity.Role; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.RoleMapper; +import com.rymcu.forest.service.RoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rymcu/vertical/service/impl/SpecialDayServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/SpecialDayServiceImpl.java similarity index 53% rename from src/main/java/com/rymcu/vertical/service/impl/SpecialDayServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/SpecialDayServiceImpl.java index b959b36..7b6283d 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/SpecialDayServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/SpecialDayServiceImpl.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.entity.SpecialDay; -import com.rymcu.vertical.mapper.SpecialDayMapper; -import com.rymcu.vertical.service.SpecialDayService; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.entity.SpecialDay; +import com.rymcu.forest.mapper.SpecialDayMapper; +import com.rymcu.forest.service.SpecialDayService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java similarity index 90% rename from src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java index 2b9b65f..2a0c314 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java @@ -1,19 +1,19 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.ArticleTagDTO; -import com.rymcu.vertical.dto.LabelModel; -import com.rymcu.vertical.dto.baidu.TagNlpDTO; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.mapper.ArticleMapper; -import com.rymcu.vertical.mapper.TagMapper; -import com.rymcu.vertical.service.TagService; -import com.rymcu.vertical.util.BaiDuAipUtils; -import com.rymcu.vertical.util.CacheUtils; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.ArticleTagDTO; +import com.rymcu.forest.dto.LabelModel; +import com.rymcu.forest.dto.baidu.TagNlpDTO; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.mapper.ArticleMapper; +import com.rymcu.forest.mapper.TagMapper; +import com.rymcu.forest.service.TagService; +import com.rymcu.forest.util.BaiDuAipUtils; +import com.rymcu.forest.util.CacheUtils; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rymcu/vertical/service/impl/TopicServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java similarity index 92% rename from src/main/java/com/rymcu/vertical/service/impl/TopicServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java index 64af131..9a184d2 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/TopicServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java @@ -1,15 +1,15 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.dto.admin.TagDTO; -import com.rymcu.vertical.dto.admin.TopicDTO; -import com.rymcu.vertical.dto.admin.TopicTagDTO; -import com.rymcu.vertical.entity.Tag; -import com.rymcu.vertical.entity.Topic; -import com.rymcu.vertical.mapper.TopicMapper; -import com.rymcu.vertical.service.TopicService; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.dto.admin.TagDTO; +import com.rymcu.forest.dto.admin.TopicDTO; +import com.rymcu.forest.dto.admin.TopicTagDTO; +import com.rymcu.forest.entity.Tag; +import com.rymcu.forest.entity.Topic; +import com.rymcu.forest.mapper.TopicMapper; +import com.rymcu.forest.service.TopicService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/rymcu/vertical/service/impl/UserServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java similarity index 92% rename from src/main/java/com/rymcu/vertical/service/impl/UserServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java index d735122..c416375 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/UserServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java @@ -1,19 +1,19 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.core.service.redis.RedisService; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.Role; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.entity.UserExtend; -import com.rymcu.vertical.jwt.service.TokenManager; -import com.rymcu.vertical.mapper.RoleMapper; -import com.rymcu.vertical.mapper.UserExtendMapper; -import com.rymcu.vertical.mapper.UserMapper; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.BeanCopierUtil; -import com.rymcu.vertical.util.Utils; -import com.rymcu.vertical.web.api.common.UploadController; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.core.service.redis.RedisService; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.Role; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.entity.UserExtend; +import com.rymcu.forest.jwt.service.TokenManager; +import com.rymcu.forest.mapper.RoleMapper; +import com.rymcu.forest.mapper.UserExtendMapper; +import com.rymcu.forest.mapper.UserMapper; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.BeanCopierUtil; +import com.rymcu.forest.util.Utils; +import com.rymcu.forest.web.api.common.UploadController; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.exceptions.TooManyResultsException; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rymcu/forest/service/impl/VisitServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/VisitServiceImpl.java new file mode 100644 index 0000000..c5d4925 --- /dev/null +++ b/src/main/java/com/rymcu/forest/service/impl/VisitServiceImpl.java @@ -0,0 +1,13 @@ +package com.rymcu.forest.service.impl; + +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.entity.Visit; +import com.rymcu.forest.service.VisitService; +import org.springframework.stereotype.Service; + +/** + * @author ronger + */ +@Service +public class VisitServiceImpl extends AbstractService implements VisitService { +} diff --git a/src/main/java/com/rymcu/vertical/service/impl/WxUserServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java similarity index 89% rename from src/main/java/com/rymcu/vertical/service/impl/WxUserServiceImpl.java rename to src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java index 3309f0d..9a6c89a 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/WxUserServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.service.impl; +package com.rymcu.forest.service.impl; -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.entity.WxUser; -import com.rymcu.vertical.mapper.WxUserMapper; -import com.rymcu.vertical.service.WxUserService; +import com.rymcu.forest.core.service.AbstractService; +import com.rymcu.forest.entity.WxUser; +import com.rymcu.forest.mapper.WxUserMapper; +import com.rymcu.forest.service.WxUserService; import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/rymcu/vertical/task/BaiDuCronTask.java b/src/main/java/com/rymcu/forest/task/BaiDuCronTask.java similarity index 82% rename from src/main/java/com/rymcu/vertical/task/BaiDuCronTask.java rename to src/main/java/com/rymcu/forest/task/BaiDuCronTask.java index 36b8f89..097d7ff 100644 --- a/src/main/java/com/rymcu/vertical/task/BaiDuCronTask.java +++ b/src/main/java/com/rymcu/forest/task/BaiDuCronTask.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.task; +package com.rymcu.forest.task; -import com.rymcu.vertical.core.constant.ProjectConstant; -import com.rymcu.vertical.util.BaiDuUtils; +import com.rymcu.forest.core.constant.ProjectConstant; +import com.rymcu.forest.util.BaiDuUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/rymcu/vertical/util/BaiDuAipUtils.java b/src/main/java/com/rymcu/forest/util/BaiDuAipUtils.java similarity index 99% rename from src/main/java/com/rymcu/vertical/util/BaiDuAipUtils.java rename to src/main/java/com/rymcu/forest/util/BaiDuAipUtils.java index b5ea57f..a49c1e6 100644 --- a/src/main/java/com/rymcu/vertical/util/BaiDuAipUtils.java +++ b/src/main/java/com/rymcu/forest/util/BaiDuAipUtils.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import com.alibaba.fastjson.JSON; import com.baidu.aip.nlp.AipNlp; -import com.rymcu.vertical.dto.baidu.TagNlpDTO; +import com.rymcu.forest.dto.baidu.TagNlpDTO; import org.apache.commons.lang.StringUtils; import org.json.JSONObject; diff --git a/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java b/src/main/java/com/rymcu/forest/util/BaiDuUtils.java similarity index 99% rename from src/main/java/com/rymcu/vertical/util/BaiDuUtils.java rename to src/main/java/com/rymcu/forest/util/BaiDuUtils.java index 262c558..37443e6 100644 --- a/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java +++ b/src/main/java/com/rymcu/forest/util/BaiDuUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import jodd.http.HttpRequest; import jodd.http.HttpResponse; diff --git a/src/main/java/com/rymcu/vertical/util/BeanCopierUtil.java b/src/main/java/com/rymcu/forest/util/BeanCopierUtil.java similarity index 98% rename from src/main/java/com/rymcu/vertical/util/BeanCopierUtil.java rename to src/main/java/com/rymcu/forest/util/BeanCopierUtil.java index 18aac4f..6186f19 100644 --- a/src/main/java/com/rymcu/vertical/util/BeanCopierUtil.java +++ b/src/main/java/com/rymcu/forest/util/BeanCopierUtil.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import lombok.extern.slf4j.Slf4j; import org.springframework.cglib.beans.BeanCopier; diff --git a/src/main/java/com/rymcu/vertical/util/CacheUtils.java b/src/main/java/com/rymcu/forest/util/CacheUtils.java similarity index 98% rename from src/main/java/com/rymcu/vertical/util/CacheUtils.java rename to src/main/java/com/rymcu/forest/util/CacheUtils.java index c532cd7..2e99989 100644 --- a/src/main/java/com/rymcu/vertical/util/CacheUtils.java +++ b/src/main/java/com/rymcu/forest/util/CacheUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.CacheManager; diff --git a/src/main/java/com/rymcu/vertical/util/ContextHolderUtils.java b/src/main/java/com/rymcu/forest/util/ContextHolderUtils.java similarity index 98% rename from src/main/java/com/rymcu/vertical/util/ContextHolderUtils.java rename to src/main/java/com/rymcu/forest/util/ContextHolderUtils.java index 37e6743..e8fa42b 100644 --- a/src/main/java/com/rymcu/vertical/util/ContextHolderUtils.java +++ b/src/main/java/com/rymcu/forest/util/ContextHolderUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.lang.StringUtils; import org.springframework.web.context.request.RequestContextHolder; diff --git a/src/main/java/com/rymcu/vertical/util/Digests.java b/src/main/java/com/rymcu/forest/util/Digests.java similarity index 98% rename from src/main/java/com/rymcu/vertical/util/Digests.java rename to src/main/java/com/rymcu/forest/util/Digests.java index 2629d1a..52464cf 100644 --- a/src/main/java/com/rymcu/vertical/util/Digests.java +++ b/src/main/java/com/rymcu/forest/util/Digests.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/com/rymcu/vertical/util/Encodes.java b/src/main/java/com/rymcu/forest/util/Encodes.java similarity index 99% rename from src/main/java/com/rymcu/vertical/util/Encodes.java rename to src/main/java/com/rymcu/forest/util/Encodes.java index 8c42241..009cef7 100644 --- a/src/main/java/com/rymcu/vertical/util/Encodes.java +++ b/src/main/java/com/rymcu/forest/util/Encodes.java @@ -1,7 +1,7 @@ /** * Copyright © 2012-2016 zkjkgc All rights reserved. */ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/com/rymcu/vertical/util/ErrorCode.java b/src/main/java/com/rymcu/forest/util/ErrorCode.java similarity index 94% rename from src/main/java/com/rymcu/vertical/util/ErrorCode.java rename to src/main/java/com/rymcu/forest/util/ErrorCode.java index 86a36ad..79f818e 100644 --- a/src/main/java/com/rymcu/vertical/util/ErrorCode.java +++ b/src/main/java/com/rymcu/forest/util/ErrorCode.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; /** * diff --git a/src/main/java/com/rymcu/vertical/util/Exceptions.java b/src/main/java/com/rymcu/forest/util/Exceptions.java similarity index 98% rename from src/main/java/com/rymcu/vertical/util/Exceptions.java rename to src/main/java/com/rymcu/forest/util/Exceptions.java index 6d3c30d..97c1ede 100644 --- a/src/main/java/com/rymcu/vertical/util/Exceptions.java +++ b/src/main/java/com/rymcu/forest/util/Exceptions.java @@ -1,7 +1,7 @@ /** * Copyright © 2012-2016 zkjkgc All rights reserved. */ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import javax.servlet.http.HttpServletRequest; import java.io.PrintWriter; diff --git a/src/main/java/com/rymcu/vertical/util/FileUtils.java b/src/main/java/com/rymcu/forest/util/FileUtils.java similarity index 99% rename from src/main/java/com/rymcu/vertical/util/FileUtils.java rename to src/main/java/com/rymcu/forest/util/FileUtils.java index 137c0c3..7d87994 100644 --- a/src/main/java/com/rymcu/vertical/util/FileUtils.java +++ b/src/main/java/com/rymcu/forest/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/rymcu/vertical/util/Html2TextUtil.java b/src/main/java/com/rymcu/forest/util/Html2TextUtil.java similarity index 97% rename from src/main/java/com/rymcu/vertical/util/Html2TextUtil.java rename to src/main/java/com/rymcu/forest/util/Html2TextUtil.java index fb06f28..c4030cc 100644 --- a/src/main/java/com/rymcu/vertical/util/Html2TextUtil.java +++ b/src/main/java/com/rymcu/forest/util/Html2TextUtil.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.parser.ParserDelegator; diff --git a/src/main/java/com/rymcu/vertical/util/NotificationUtils.java b/src/main/java/com/rymcu/forest/util/NotificationUtils.java similarity index 89% rename from src/main/java/com/rymcu/vertical/util/NotificationUtils.java rename to src/main/java/com/rymcu/forest/util/NotificationUtils.java index 48e4ae1..b301bdd 100644 --- a/src/main/java/com/rymcu/vertical/util/NotificationUtils.java +++ b/src/main/java/com/rymcu/forest/util/NotificationUtils.java @@ -1,12 +1,12 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; -import com.rymcu.vertical.core.constant.NotificationConstant; -import com.rymcu.vertical.entity.Follow; -import com.rymcu.vertical.entity.Notification; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.service.FollowService; -import com.rymcu.vertical.service.NotificationService; -import com.rymcu.vertical.service.UserService; +import com.rymcu.forest.core.constant.NotificationConstant; +import com.rymcu.forest.entity.Follow; +import com.rymcu.forest.entity.Notification; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.service.FollowService; +import com.rymcu.forest.service.NotificationService; +import com.rymcu.forest.service.UserService; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/rymcu/vertical/util/SpringContextHolder.java b/src/main/java/com/rymcu/forest/util/SpringContextHolder.java similarity index 96% rename from src/main/java/com/rymcu/vertical/util/SpringContextHolder.java rename to src/main/java/com/rymcu/forest/util/SpringContextHolder.java index b5dbf14..9e99cf3 100644 --- a/src/main/java/com/rymcu/vertical/util/SpringContextHolder.java +++ b/src/main/java/com/rymcu/forest/util/SpringContextHolder.java @@ -1,7 +1,7 @@ /** * Copyright © 2012-2016 zkjkgc All rights reserved. */ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; @@ -13,10 +13,6 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Date; - /** * 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicaitonContext. * diff --git a/src/main/java/com/rymcu/vertical/util/UserUtils.java b/src/main/java/com/rymcu/forest/util/UserUtils.java similarity index 85% rename from src/main/java/com/rymcu/vertical/util/UserUtils.java rename to src/main/java/com/rymcu/forest/util/UserUtils.java index 502b6b0..9441268 100644 --- a/src/main/java/com/rymcu/vertical/util/UserUtils.java +++ b/src/main/java/com/rymcu/forest/util/UserUtils.java @@ -1,13 +1,13 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; -import com.rymcu.vertical.dto.TokenUser; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.jwt.model.TokenModel; -import com.rymcu.vertical.jwt.service.TokenManager; -import com.rymcu.vertical.mapper.UserMapper; -import com.rymcu.vertical.web.api.exception.ErrorCode; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.dto.TokenUser; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.jwt.def.JwtConstants; +import com.rymcu.forest.jwt.model.TokenModel; +import com.rymcu.forest.jwt.service.TokenManager; +import com.rymcu.forest.mapper.UserMapper; +import com.rymcu.forest.web.api.exception.ErrorCode; +import com.rymcu.forest.web.api.exception.BaseApiException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureException; diff --git a/src/main/java/com/rymcu/vertical/util/Utils.java b/src/main/java/com/rymcu/forest/util/Utils.java similarity index 96% rename from src/main/java/com/rymcu/vertical/util/Utils.java rename to src/main/java/com/rymcu/forest/util/Utils.java index 7b55a2f..2cd80da 100644 --- a/src/main/java/com/rymcu/vertical/util/Utils.java +++ b/src/main/java/com/rymcu/forest/util/Utils.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.NotificationDTO; -import com.rymcu.vertical.entity.Notification; -import com.rymcu.vertical.entity.User; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.NotificationDTO; +import com.rymcu.forest.entity.Notification; +import com.rymcu.forest.entity.User; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.InvalidSessionException; import org.apache.shiro.session.Session; diff --git a/src/main/java/com/rymcu/vertical/util/oConvertUtils.java b/src/main/java/com/rymcu/forest/util/oConvertUtils.java similarity index 99% rename from src/main/java/com/rymcu/vertical/util/oConvertUtils.java rename to src/main/java/com/rymcu/forest/util/oConvertUtils.java index 95ba686..782922b 100644 --- a/src/main/java/com/rymcu/vertical/util/oConvertUtils.java +++ b/src/main/java/com/rymcu/forest/util/oConvertUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.util; +package com.rymcu.forest.util; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/rymcu/vertical/web/api/admin/AdminController.java b/src/main/java/com/rymcu/forest/web/api/admin/AdminController.java similarity index 96% rename from src/main/java/com/rymcu/vertical/web/api/admin/AdminController.java rename to src/main/java/com/rymcu/forest/web/api/admin/AdminController.java index d2ca280..6dee51a 100644 --- a/src/main/java/com/rymcu/vertical/web/api/admin/AdminController.java +++ b/src/main/java/com/rymcu/forest/web/api/admin/AdminController.java @@ -1,14 +1,14 @@ -package com.rymcu.vertical.web.api.admin; +package com.rymcu.forest.web.api.admin; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.admin.TopicTagDTO; -import com.rymcu.vertical.dto.admin.UserRoleDTO; -import com.rymcu.vertical.entity.*; -import com.rymcu.vertical.service.*; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.admin.TopicTagDTO; +import com.rymcu.forest.dto.admin.UserRoleDTO; +import com.rymcu.forest.entity.*; +import com.rymcu.forest.service.*; +import com.rymcu.forest.util.Utils; import org.apache.commons.lang.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/rymcu/vertical/web/api/admin/DashboardController.java b/src/main/java/com/rymcu/forest/web/api/admin/DashboardController.java similarity index 79% rename from src/main/java/com/rymcu/vertical/web/api/admin/DashboardController.java rename to src/main/java/com/rymcu/forest/web/api/admin/DashboardController.java index f039f0d..c1e797f 100644 --- a/src/main/java/com/rymcu/vertical/web/api/admin/DashboardController.java +++ b/src/main/java/com/rymcu/forest/web/api/admin/DashboardController.java @@ -1,9 +1,9 @@ -package com.rymcu.vertical.web.api.admin; +package com.rymcu.forest.web.api.admin; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.admin.Dashboard; -import com.rymcu.vertical.service.DashboardService; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.admin.Dashboard; +import com.rymcu.forest.service.DashboardService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/rymcu/vertical/web/api/article/ArticleController.java b/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java similarity index 86% rename from src/main/java/com/rymcu/vertical/web/api/article/ArticleController.java rename to src/main/java/com/rymcu/forest/web/api/article/ArticleController.java index 1bf5b85..118bf38 100644 --- a/src/main/java/com/rymcu/vertical/web/api/article/ArticleController.java +++ b/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java @@ -1,16 +1,16 @@ -package com.rymcu.vertical.web.api.article; +package com.rymcu.forest.web.api.article; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.CommentDTO; -import com.rymcu.vertical.entity.Article; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.CommentService; -import com.rymcu.vertical.util.Utils; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.CommentDTO; +import com.rymcu.forest.entity.Article; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.CommentService; +import com.rymcu.forest.util.Utils; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java b/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java similarity index 73% rename from src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java rename to src/main/java/com/rymcu/forest/web/api/comment/CommentController.java index 07999fe..7ca1ed4 100644 --- a/src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java +++ b/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.web.api.comment; +package com.rymcu.forest.web.api.comment; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.entity.Comment; -import com.rymcu.vertical.service.CommentService; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.entity.Comment; +import com.rymcu.forest.service.CommentService; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/rymcu/vertical/web/api/common/CommonApiController.java b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java similarity index 88% rename from src/main/java/com/rymcu/vertical/web/api/common/CommonApiController.java rename to src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java index 89f91de..715f8de 100644 --- a/src/main/java/com/rymcu/vertical/web/api/common/CommonApiController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java @@ -1,19 +1,19 @@ -package com.rymcu.vertical.web.api.common; +package com.rymcu.forest.web.api.common; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.core.result.GlobalResultMessage; -import com.rymcu.vertical.core.service.log.annotation.VisitLogger; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.JavaMailService; -import com.rymcu.vertical.service.PortfolioService; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.core.result.GlobalResultMessage; +import com.rymcu.forest.core.service.log.annotation.VisitLogger; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.JavaMailService; +import com.rymcu.forest.service.PortfolioService; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.Utils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/common/UploadController.java b/src/main/java/com/rymcu/forest/web/api/common/UploadController.java similarity index 94% rename from src/main/java/com/rymcu/vertical/web/api/common/UploadController.java rename to src/main/java/com/rymcu/forest/web/api/common/UploadController.java index 59f7209..44a2a14 100644 --- a/src/main/java/com/rymcu/vertical/web/api/common/UploadController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/UploadController.java @@ -1,16 +1,16 @@ -package com.rymcu.vertical.web.api.common; +package com.rymcu.forest.web.api.common; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.LinkToImageUrlDTO; -import com.rymcu.vertical.dto.TokenUser; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.util.FileUtils; -import com.rymcu.vertical.util.SpringContextHolder; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.util.Utils; -import com.rymcu.vertical.web.api.exception.BaseApiException; -import com.rymcu.vertical.web.api.exception.ErrorCode; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.LinkToImageUrlDTO; +import com.rymcu.forest.dto.TokenUser; +import com.rymcu.forest.jwt.def.JwtConstants; +import com.rymcu.forest.util.FileUtils; +import com.rymcu.forest.util.SpringContextHolder; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.Utils; +import com.rymcu.forest.web.api.exception.BaseApiException; +import com.rymcu.forest.web.api.exception.ErrorCode; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.springframework.core.env.Environment; diff --git a/src/main/java/com/rymcu/vertical/web/api/common/WebSocketController.java b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java similarity index 94% rename from src/main/java/com/rymcu/vertical/web/api/common/WebSocketController.java rename to src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java index 5df9660..62f5e26 100644 --- a/src/main/java/com/rymcu/vertical/web/api/common/WebSocketController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java @@ -1,8 +1,7 @@ -package com.rymcu.vertical.web.api.common; +package com.rymcu.forest.web.api.common; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.handler.annotation.DestinationVariable; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/src/main/java/com/rymcu/vertical/web/api/exception/BaseApiException.java b/src/main/java/com/rymcu/forest/web/api/exception/BaseApiException.java similarity index 92% rename from src/main/java/com/rymcu/vertical/web/api/exception/BaseApiException.java rename to src/main/java/com/rymcu/forest/web/api/exception/BaseApiException.java index 9611c42..5140c70 100644 --- a/src/main/java/com/rymcu/vertical/web/api/exception/BaseApiException.java +++ b/src/main/java/com/rymcu/forest/web/api/exception/BaseApiException.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.web.api.exception; +package com.rymcu.forest.web.api.exception; /** * 服务（业务）异常如“ 账号或密码错误 ”，该异常只做INFO级别的日志记录 @see WebMvcConfigurer diff --git a/src/main/java/com/rymcu/vertical/web/api/exception/BaseApiExceptionHandler.java b/src/main/java/com/rymcu/forest/web/api/exception/BaseApiExceptionHandler.java similarity index 83% rename from src/main/java/com/rymcu/vertical/web/api/exception/BaseApiExceptionHandler.java rename to src/main/java/com/rymcu/forest/web/api/exception/BaseApiExceptionHandler.java index 7a6a34f..4291bda 100644 --- a/src/main/java/com/rymcu/vertical/web/api/exception/BaseApiExceptionHandler.java +++ b/src/main/java/com/rymcu/forest/web/api/exception/BaseApiExceptionHandler.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.web.api.exception; +package com.rymcu.forest.web.api.exception; -import com.rymcu.vertical.config.BaseExceptionHandler; -import com.rymcu.vertical.core.result.GlobalResult; +import com.rymcu.forest.config.BaseExceptionHandler; +import com.rymcu.forest.core.result.GlobalResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ControllerAdvice; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@ControllerAdvice(basePackages = {"com.rymcu.vertical.web.api", "com.rymcu.vertical.jwt"} ) +@ControllerAdvice(basePackages = {"com.rymcu.forest.web.api", "com.rymcu.forest.jwt"} ) public class BaseApiExceptionHandler { private final Logger logger = LoggerFactory.getLogger(BaseExceptionHandler.class); diff --git a/src/main/java/com/rymcu/vertical/web/api/exception/ErrorCode.java b/src/main/java/com/rymcu/forest/web/api/exception/ErrorCode.java similarity index 93% rename from src/main/java/com/rymcu/vertical/web/api/exception/ErrorCode.java rename to src/main/java/com/rymcu/forest/web/api/exception/ErrorCode.java index ebea4c3..45964a1 100644 --- a/src/main/java/com/rymcu/vertical/web/api/exception/ErrorCode.java +++ b/src/main/java/com/rymcu/forest/web/api/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.web.api.exception; +package com.rymcu.forest.web.api.exception; public enum ErrorCode { diff --git a/src/main/java/com/rymcu/vertical/web/api/follow/FollowController.java b/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java similarity index 66% rename from src/main/java/com/rymcu/vertical/web/api/follow/FollowController.java rename to src/main/java/com/rymcu/forest/web/api/follow/FollowController.java index 5e0fa28..673144a 100644 --- a/src/main/java/com/rymcu/vertical/web/api/follow/FollowController.java +++ b/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java @@ -1,17 +1,13 @@ -package com.rymcu.vertical.web.api.follow; +package com.rymcu.forest.web.api.follow; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.entity.Follow; -import com.rymcu.vertical.jwt.def.JwtConstants; -import com.rymcu.vertical.service.FollowService; -import com.rymcu.vertical.web.api.exception.BaseApiException; -import com.rymcu.vertical.web.api.exception.ErrorCode; -import org.apache.commons.lang.StringUtils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.entity.Follow; +import com.rymcu.forest.service.FollowService; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; /** * @author ronger diff --git a/src/main/java/com/rymcu/vertical/web/api/notification/NotificationController.java b/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java similarity index 79% rename from src/main/java/com/rymcu/vertical/web/api/notification/NotificationController.java rename to src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java index 7f8085e..e4509f1 100644 --- a/src/main/java/com/rymcu/vertical/web/api/notification/NotificationController.java +++ b/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java @@ -1,16 +1,16 @@ -package com.rymcu.vertical.web.api.notification; +package com.rymcu.forest.web.api.notification; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.NotificationDTO; -import com.rymcu.vertical.entity.Notification; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.service.NotificationService; -import com.rymcu.vertical.util.UserUtils; -import com.rymcu.vertical.util.Utils; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.NotificationDTO; +import com.rymcu.forest.entity.Notification; +import com.rymcu.forest.entity.User; +import com.rymcu.forest.service.NotificationService; +import com.rymcu.forest.util.UserUtils; +import com.rymcu.forest.util.Utils; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/portfolio/PortfolioController.java b/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java similarity index 86% rename from src/main/java/com/rymcu/vertical/web/api/portfolio/PortfolioController.java rename to src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java index 4a4b0a2..66251cb 100644 --- a/src/main/java/com/rymcu/vertical/web/api/portfolio/PortfolioController.java +++ b/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java @@ -1,12 +1,12 @@ -package com.rymcu.vertical.web.api.portfolio; +package com.rymcu.forest.web.api.portfolio; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.PortfolioArticleDTO; -import com.rymcu.vertical.dto.PortfolioDTO; -import com.rymcu.vertical.entity.Portfolio; -import com.rymcu.vertical.service.PortfolioService; -import com.rymcu.vertical.web.api.exception.BaseApiException; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.PortfolioArticleDTO; +import com.rymcu.forest.dto.PortfolioDTO; +import com.rymcu.forest.entity.Portfolio; +import com.rymcu.forest.service.PortfolioService; +import com.rymcu.forest.web.api.exception.BaseApiException; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/tag/TagController.java b/src/main/java/com/rymcu/forest/web/api/tag/TagController.java similarity index 74% rename from src/main/java/com/rymcu/vertical/web/api/tag/TagController.java rename to src/main/java/com/rymcu/forest/web/api/tag/TagController.java index aa185a9..dda3353 100644 --- a/src/main/java/com/rymcu/vertical/web/api/tag/TagController.java +++ b/src/main/java/com/rymcu/forest/web/api/tag/TagController.java @@ -1,14 +1,14 @@ -package com.rymcu.vertical.web.api.tag; +package com.rymcu.forest.web.api.tag; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.LabelModel; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.TagService; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.LabelModel; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.TagService; +import com.rymcu.forest.util.Utils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/topic/TopicController.java b/src/main/java/com/rymcu/forest/web/api/topic/TopicController.java similarity index 71% rename from src/main/java/com/rymcu/vertical/web/api/topic/TopicController.java rename to src/main/java/com/rymcu/forest/web/api/topic/TopicController.java index beed345..56d55f0 100644 --- a/src/main/java/com/rymcu/vertical/web/api/topic/TopicController.java +++ b/src/main/java/com/rymcu/forest/web/api/topic/TopicController.java @@ -1,15 +1,15 @@ -package com.rymcu.vertical.web.api.topic; +package com.rymcu.forest.web.api.topic; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.core.service.log.annotation.VisitLogger; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.entity.Topic; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.TopicService; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.core.service.log.annotation.VisitLogger; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.entity.Topic; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.TopicService; +import com.rymcu.forest.util.Utils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/user/UserController.java b/src/main/java/com/rymcu/forest/web/api/user/UserController.java similarity index 87% rename from src/main/java/com/rymcu/vertical/web/api/user/UserController.java rename to src/main/java/com/rymcu/forest/web/api/user/UserController.java index 5317747..f7e154e 100644 --- a/src/main/java/com/rymcu/vertical/web/api/user/UserController.java +++ b/src/main/java/com/rymcu/forest/web/api/user/UserController.java @@ -1,19 +1,19 @@ -package com.rymcu.vertical.web.api.user; +package com.rymcu.forest.web.api.user; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.core.service.log.annotation.VisitLogger; -import com.rymcu.vertical.dto.ArticleDTO; -import com.rymcu.vertical.dto.PortfolioDTO; -import com.rymcu.vertical.dto.UserDTO; -import com.rymcu.vertical.entity.UserExtend; -import com.rymcu.vertical.service.ArticleService; -import com.rymcu.vertical.service.FollowService; -import com.rymcu.vertical.service.PortfolioService; -import com.rymcu.vertical.service.UserService; -import com.rymcu.vertical.util.Utils; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.core.service.log.annotation.VisitLogger; +import com.rymcu.forest.dto.ArticleDTO; +import com.rymcu.forest.dto.PortfolioDTO; +import com.rymcu.forest.dto.UserDTO; +import com.rymcu.forest.entity.UserExtend; +import com.rymcu.forest.service.ArticleService; +import com.rymcu.forest.service.FollowService; +import com.rymcu.forest.service.PortfolioService; +import com.rymcu.forest.service.UserService; +import com.rymcu.forest.util.Utils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/web/api/user/UserInfoController.java b/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java similarity index 84% rename from src/main/java/com/rymcu/vertical/web/api/user/UserInfoController.java rename to src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java index 24c7a69..4b74209 100644 --- a/src/main/java/com/rymcu/vertical/web/api/user/UserInfoController.java +++ b/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java @@ -1,11 +1,10 @@ -package com.rymcu.vertical.web.api.user; +package com.rymcu.forest.web.api.user; -import com.rymcu.vertical.core.result.GlobalResult; -import com.rymcu.vertical.core.result.GlobalResultGenerator; -import com.rymcu.vertical.dto.*; -import com.rymcu.vertical.entity.User; -import com.rymcu.vertical.entity.UserExtend; -import com.rymcu.vertical.service.UserService; +import com.rymcu.forest.core.result.GlobalResult; +import com.rymcu.forest.core.result.GlobalResultGenerator; +import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.UserExtend; +import com.rymcu.forest.service.UserService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaConfiguration.java b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java similarity index 99% rename from src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaConfiguration.java rename to src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java index 691e6fa..73f28e6 100644 --- a/src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaConfiguration.java +++ b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.miniapp.config; +package com.rymcu.forest.wx.miniapp.config; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; diff --git a/src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaProperties.java b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaProperties.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaProperties.java rename to src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaProperties.java index 4ad9dc5..f91fbff 100644 --- a/src/main/java/com/rymcu/vertical/wx/miniapp/config/WxMaProperties.java +++ b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaProperties.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.miniapp.config; +package com.rymcu.forest.wx.miniapp.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaMediaController.java b/src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaMediaController.java similarity index 96% rename from src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaMediaController.java rename to src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaMediaController.java index 132e995..3fae69c 100644 --- a/src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaMediaController.java +++ b/src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaMediaController.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical.wx.miniapp.controller; +package com.rymcu.forest.wx.miniapp.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.constant.WxMaConstants; import com.google.common.collect.Lists; import com.google.common.io.Files; -import com.rymcu.vertical.wx.miniapp.config.WxMaConfiguration; +import com.rymcu.forest.wx.miniapp.config.WxMaConfiguration; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.error.WxErrorException; import org.slf4j.Logger; diff --git a/src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaUserController.java b/src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaUserController.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaUserController.java rename to src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaUserController.java index 1eaf208..e628940 100644 --- a/src/main/java/com/rymcu/vertical/wx/miniapp/controller/WxMaUserController.java +++ b/src/main/java/com/rymcu/forest/wx/miniapp/controller/WxMaUserController.java @@ -1,11 +1,11 @@ -package com.rymcu.vertical.wx.miniapp.controller; +package com.rymcu.forest.wx.miniapp.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; -import com.rymcu.vertical.wx.miniapp.config.WxMaConfiguration; -import com.rymcu.vertical.wx.miniapp.utils.JsonUtils; +import com.rymcu.forest.wx.miniapp.config.WxMaConfiguration; +import com.rymcu.forest.wx.miniapp.utils.JsonUtils; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/rymcu/vertical/wx/miniapp/utils/JsonUtils.java b/src/main/java/com/rymcu/forest/wx/miniapp/utils/JsonUtils.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/miniapp/utils/JsonUtils.java rename to src/main/java/com/rymcu/forest/wx/miniapp/utils/JsonUtils.java index d274870..3687ab9 100644 --- a/src/main/java/com/rymcu/vertical/wx/miniapp/utils/JsonUtils.java +++ b/src/main/java/com/rymcu/forest/wx/miniapp/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.miniapp.utils; +package com.rymcu.forest.wx.miniapp.utils; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/builder/AbstractBuilder.java b/src/main/java/com/rymcu/forest/wx/mp/builder/AbstractBuilder.java similarity index 92% rename from src/main/java/com/rymcu/vertical/wx/mp/builder/AbstractBuilder.java rename to src/main/java/com/rymcu/forest/wx/mp/builder/AbstractBuilder.java index 57207d4..0a0dc86 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/builder/AbstractBuilder.java +++ b/src/main/java/com/rymcu/forest/wx/mp/builder/AbstractBuilder.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.builder; +package com.rymcu.forest.wx.mp.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/builder/ImageBuilder.java b/src/main/java/com/rymcu/forest/wx/mp/builder/ImageBuilder.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/builder/ImageBuilder.java rename to src/main/java/com/rymcu/forest/wx/mp/builder/ImageBuilder.java index 922b3bb..7c12ec2 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/builder/ImageBuilder.java +++ b/src/main/java/com/rymcu/forest/wx/mp/builder/ImageBuilder.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.builder; +package com.rymcu.forest.wx.mp.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/builder/TextBuilder.java b/src/main/java/com/rymcu/forest/wx/mp/builder/TextBuilder.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/builder/TextBuilder.java rename to src/main/java/com/rymcu/forest/wx/mp/builder/TextBuilder.java index 83f0ea9..097d402 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/builder/TextBuilder.java +++ b/src/main/java/com/rymcu/forest/wx/mp/builder/TextBuilder.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.builder; +package com.rymcu.forest.wx.mp.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/config/WxMpConfiguration.java b/src/main/java/com/rymcu/forest/wx/mp/config/WxMpConfiguration.java similarity index 98% rename from src/main/java/com/rymcu/vertical/wx/mp/config/WxMpConfiguration.java rename to src/main/java/com/rymcu/forest/wx/mp/config/WxMpConfiguration.java index 94c1402..694b0f2 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/config/WxMpConfiguration.java +++ b/src/main/java/com/rymcu/forest/wx/mp/config/WxMpConfiguration.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.mp.config; +package com.rymcu.forest.wx.mp.config; -import com.rymcu.vertical.wx.mp.handler.*; +import com.rymcu.forest.wx.mp.handler.*; import lombok.AllArgsConstructor; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/config/WxMpProperties.java b/src/main/java/com/rymcu/forest/wx/mp/config/WxMpProperties.java similarity index 90% rename from src/main/java/com/rymcu/vertical/wx/mp/config/WxMpProperties.java rename to src/main/java/com/rymcu/forest/wx/mp/config/WxMpProperties.java index de1ee9d..234e0c6 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/config/WxMpProperties.java +++ b/src/main/java/com/rymcu/forest/wx/mp/config/WxMpProperties.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.mp.config; +package com.rymcu.forest.wx.mp.config; -import com.rymcu.vertical.wx.mp.utils.JsonUtils; +import com.rymcu.forest.wx.mp.utils.JsonUtils; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxMenuController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java similarity index 96% rename from src/main/java/com/rymcu/vertical/wx/mp/controller/WxMenuController.java rename to src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java index a85923a..09668aa 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxMenuController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java @@ -1,7 +1,6 @@ -package com.rymcu.vertical.wx.mp.controller; +package com.rymcu.forest.wx.mp.controller; import lombok.AllArgsConstructor; -import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.menu.WxMenu; import me.chanjar.weixin.common.bean.menu.WxMenuButton; import me.chanjar.weixin.common.error.WxErrorException; @@ -9,12 +8,8 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.menu.WxMpGetSelfMenuInfoResult; import me.chanjar.weixin.mp.bean.menu.WxMpMenu; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import java.net.MalformedURLException; -import java.net.URL; import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxPortalController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxPortalController.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/mp/controller/WxPortalController.java rename to src/main/java/com/rymcu/forest/wx/mp/controller/WxPortalController.java index 2462c67..c3fc4ae 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxPortalController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxPortalController.java @@ -1,13 +1,9 @@ -package com.rymcu.vertical.wx.mp.controller; +package com.rymcu.forest.wx.mp.controller; import lombok.AllArgsConstructor; -import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxRedirectController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java similarity index 96% rename from src/main/java/com/rymcu/vertical/wx/mp/controller/WxRedirectController.java rename to src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java index 6c63290..0395f65 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxRedirectController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.controller; +package com.rymcu.forest.wx.mp.controller; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxoAuthController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/mp/controller/WxoAuthController.java rename to src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java index 84883af..d302914 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/controller/WxoAuthController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.wx.mp.controller; +package com.rymcu.forest.wx.mp.controller; -import com.rymcu.vertical.service.WxUserService; -import com.rymcu.vertical.util.ContextHolderUtils; +import com.rymcu.forest.service.WxUserService; +import com.rymcu.forest.util.ContextHolderUtils; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.WxJsapiSignature; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/error/ErrorController.java b/src/main/java/com/rymcu/forest/wx/mp/error/ErrorController.java similarity index 93% rename from src/main/java/com/rymcu/vertical/wx/mp/error/ErrorController.java rename to src/main/java/com/rymcu/forest/wx/mp/error/ErrorController.java index 03b8bad..e345a88 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/error/ErrorController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/error/ErrorController.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.error; +package com.rymcu.forest.wx.mp.error; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/error/ErrorPageConfiguration.java b/src/main/java/com/rymcu/forest/wx/mp/error/ErrorPageConfiguration.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/mp/error/ErrorPageConfiguration.java rename to src/main/java/com/rymcu/forest/wx/mp/error/ErrorPageConfiguration.java index 2502a00..39dec24 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/error/ErrorPageConfiguration.java +++ b/src/main/java/com/rymcu/forest/wx/mp/error/ErrorPageConfiguration.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.error; +package com.rymcu.forest.wx.mp.error; import org.springframework.boot.web.server.ErrorPage; import org.springframework.boot.web.server.ErrorPageRegistrar; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/AbstractHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/AbstractHandler.java similarity index 88% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/AbstractHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/AbstractHandler.java index 2149b1c..f241032 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/AbstractHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/AbstractHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import org.slf4j.Logger; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/KfSessionHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/KfSessionHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/KfSessionHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/KfSessionHandler.java index 0423997..464a85d 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/KfSessionHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/KfSessionHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/LocationHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/LocationHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/LocationHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/LocationHandler.java index fd0330f..7502c6d 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/LocationHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/LocationHandler.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; -import com.rymcu.vertical.wx.mp.builder.TextBuilder; +import com.rymcu.forest.wx.mp.builder.TextBuilder; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/LogHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/LogHandler.java similarity index 89% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/LogHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/LogHandler.java index f405a19..8744d49 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/LogHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/LogHandler.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; -import com.rymcu.vertical.wx.mp.utils.JsonUtils; +import com.rymcu.forest.wx.mp.utils.JsonUtils; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/MenuHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/MenuHandler.java similarity index 96% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/MenuHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/MenuHandler.java index e100914..0faedf0 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/MenuHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/MenuHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/MsgHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/MsgHandler.java similarity index 93% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/MsgHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/MsgHandler.java index 28c6ac6..9aec3ec 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/MsgHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/MsgHandler.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; -import com.rymcu.vertical.wx.mp.builder.TextBuilder; +import com.rymcu.forest.wx.mp.builder.TextBuilder; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/NullHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/NullHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/NullHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/NullHandler.java index 23bbdad..907cba4 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/NullHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/NullHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/ScanHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/ScanHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/ScanHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/ScanHandler.java index 99bc85b..c4f3ab1 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/ScanHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/ScanHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import java.util.Map; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/StoreCheckNotifyHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/StoreCheckNotifyHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/StoreCheckNotifyHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/StoreCheckNotifyHandler.java index d036ea7..bcc973b 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/StoreCheckNotifyHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/StoreCheckNotifyHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/SubscribeHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/SubscribeHandler.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/SubscribeHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/SubscribeHandler.java index d4fac61..1e1f4da 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/SubscribeHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/SubscribeHandler.java @@ -1,8 +1,8 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import java.util.Map; -import com.rymcu.vertical.wx.mp.builder.TextBuilder; +import com.rymcu.forest.wx.mp.builder.TextBuilder; import org.springframework.stereotype.Component; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/handler/UnsubscribeHandler.java b/src/main/java/com/rymcu/forest/wx/mp/handler/UnsubscribeHandler.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/mp/handler/UnsubscribeHandler.java rename to src/main/java/com/rymcu/forest/wx/mp/handler/UnsubscribeHandler.java index 49cfa3d..1e84cee 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/handler/UnsubscribeHandler.java +++ b/src/main/java/com/rymcu/forest/wx/mp/handler/UnsubscribeHandler.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.handler; +package com.rymcu.forest.wx.mp.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/src/main/java/com/rymcu/vertical/wx/mp/utils/JsonUtils.java b/src/main/java/com/rymcu/forest/wx/mp/utils/JsonUtils.java similarity index 80% rename from src/main/java/com/rymcu/vertical/wx/mp/utils/JsonUtils.java rename to src/main/java/com/rymcu/forest/wx/mp/utils/JsonUtils.java index bda28aa..c0520b6 100644 --- a/src/main/java/com/rymcu/vertical/wx/mp/utils/JsonUtils.java +++ b/src/main/java/com/rymcu/forest/wx/mp/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.mp.utils; +package com.rymcu.forest.wx.mp.utils; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/rymcu/vertical/wx/open/config/WxOpenProperties.java b/src/main/java/com/rymcu/forest/wx/open/config/WxOpenProperties.java similarity index 95% rename from src/main/java/com/rymcu/vertical/wx/open/config/WxOpenProperties.java rename to src/main/java/com/rymcu/forest/wx/open/config/WxOpenProperties.java index 4fcce5d..184c738 100644 --- a/src/main/java/com/rymcu/vertical/wx/open/config/WxOpenProperties.java +++ b/src/main/java/com/rymcu/forest/wx/open/config/WxOpenProperties.java @@ -1,4 +1,4 @@ -package com.rymcu.vertical.wx.open.config; +package com.rymcu.forest.wx.open.config; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenApiController.java b/src/main/java/com/rymcu/forest/wx/open/controller/WxOpenApiController.java similarity index 96% rename from src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenApiController.java rename to src/main/java/com/rymcu/forest/wx/open/controller/WxOpenApiController.java index f613a4f..96837a6 100644 --- a/src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenApiController.java +++ b/src/main/java/com/rymcu/forest/wx/open/controller/WxOpenApiController.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.open.controller; +package com.rymcu.forest.wx.open.controller; -import com.rymcu.vertical.wx.open.handler.WxOpenServiceHandler; +import com.rymcu.forest.wx.open.handler.WxOpenServiceHandler; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult; import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult; diff --git a/src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenNotifyController.java b/src/main/java/com/rymcu/forest/wx/open/controller/WxOpenNotifyController.java similarity index 98% rename from src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenNotifyController.java rename to src/main/java/com/rymcu/forest/wx/open/controller/WxOpenNotifyController.java index d56334c..0a83d0e 100644 --- a/src/main/java/com/rymcu/vertical/wx/open/controller/WxOpenNotifyController.java +++ b/src/main/java/com/rymcu/forest/wx/open/controller/WxOpenNotifyController.java @@ -1,6 +1,6 @@ -package com.rymcu.vertical.wx.open.controller; +package com.rymcu.forest.wx.open.controller; -import com.rymcu.vertical.wx.open.handler.WxOpenServiceHandler; +import com.rymcu.forest.wx.open.handler.WxOpenServiceHandler; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; diff --git a/src/main/java/com/rymcu/vertical/wx/open/handler/WxOpenServiceHandler.java b/src/main/java/com/rymcu/forest/wx/open/handler/WxOpenServiceHandler.java similarity index 94% rename from src/main/java/com/rymcu/vertical/wx/open/handler/WxOpenServiceHandler.java rename to src/main/java/com/rymcu/forest/wx/open/handler/WxOpenServiceHandler.java index f038c2b..bbf2b33 100644 --- a/src/main/java/com/rymcu/vertical/wx/open/handler/WxOpenServiceHandler.java +++ b/src/main/java/com/rymcu/forest/wx/open/handler/WxOpenServiceHandler.java @@ -1,7 +1,7 @@ -package com.rymcu.vertical.wx.open.handler; +package com.rymcu.forest.wx.open.handler; -import com.rymcu.vertical.config.RedisProperties; -import com.rymcu.vertical.wx.open.config.WxOpenProperties; +import com.rymcu.forest.config.RedisProperties; +import com.rymcu.forest.wx.open.config.WxOpenProperties; import me.chanjar.weixin.open.api.impl.WxOpenInRedisConfigStorage; import me.chanjar.weixin.open.api.impl.WxOpenMessageRouter; import me.chanjar.weixin.open.api.impl.WxOpenServiceImpl; diff --git a/src/main/java/com/rymcu/vertical/mapper/SpecialDayMapper.java b/src/main/java/com/rymcu/vertical/mapper/SpecialDayMapper.java deleted file mode 100644 index 9e9a964..0000000 --- a/src/main/java/com/rymcu/vertical/mapper/SpecialDayMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.rymcu.vertical.mapper; - -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.SpecialDay; - -/** - * @author ronger - */ -public interface SpecialDayMapper extends Mapper { -} diff --git a/src/main/java/com/rymcu/vertical/mapper/VisitMapper.java b/src/main/java/com/rymcu/vertical/mapper/VisitMapper.java deleted file mode 100644 index 0a2bba6..0000000 --- a/src/main/java/com/rymcu/vertical/mapper/VisitMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.rymcu.vertical.mapper; - -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.Visit; - -/** - * @author ronger - */ -public interface VisitMapper extends Mapper { -} diff --git a/src/main/java/com/rymcu/vertical/mapper/WxUserMapper.java b/src/main/java/com/rymcu/vertical/mapper/WxUserMapper.java deleted file mode 100644 index 9e941d3..0000000 --- a/src/main/java/com/rymcu/vertical/mapper/WxUserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.rymcu.vertical.mapper; - -import com.rymcu.vertical.core.mapper.Mapper; -import com.rymcu.vertical.entity.WxUser; - -/** - * @author ronger - */ -public interface WxUserMapper extends Mapper { -} diff --git a/src/main/java/com/rymcu/vertical/service/SpecialDayService.java b/src/main/java/com/rymcu/vertical/service/SpecialDayService.java deleted file mode 100644 index e5a8ff0..0000000 --- a/src/main/java/com/rymcu/vertical/service/SpecialDayService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.rymcu.vertical.service; - -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.entity.SpecialDay; - -/** - * @author ronger - */ -public interface SpecialDayService extends Service { -} diff --git a/src/main/java/com/rymcu/vertical/service/VisitService.java b/src/main/java/com/rymcu/vertical/service/VisitService.java deleted file mode 100644 index 05b2327..0000000 --- a/src/main/java/com/rymcu/vertical/service/VisitService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.rymcu.vertical.service; - -import com.rymcu.vertical.core.service.Service; -import com.rymcu.vertical.entity.Visit; - -/** - * @author ronger - */ -public interface VisitService extends Service { -} diff --git a/src/main/java/com/rymcu/vertical/service/impl/VisitServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/VisitServiceImpl.java deleted file mode 100644 index 5ecb0f6..0000000 --- a/src/main/java/com/rymcu/vertical/service/impl/VisitServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.rymcu.vertical.service.impl; - -import com.rymcu.vertical.core.service.AbstractService; -import com.rymcu.vertical.entity.Visit; -import com.rymcu.vertical.service.VisitService; -import org.springframework.stereotype.Service; - -/** - * @author ronger - */ -@Service -public class VisitServiceImpl extends AbstractService implements VisitService { -} diff --git a/src/main/java/mapper/ArticleMapper.xml b/src/main/java/mapper/ArticleMapper.xml index b0fe802..e181ab9 100644 --- a/src/main/java/mapper/ArticleMapper.xml +++ b/src/main/java/mapper/ArticleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,7 +19,7 @@ - + @@ -39,14 +39,14 @@ - + - + @@ -55,7 +55,7 @@ - + diff --git a/src/main/java/mapper/CommentMapper.xml b/src/main/java/mapper/CommentMapper.xml index cbc5cbc..ffb41a9 100644 --- a/src/main/java/mapper/CommentMapper.xml +++ b/src/main/java/mapper/CommentMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/src/main/java/mapper/DashboardMapper.xml b/src/main/java/mapper/DashboardMapper.xml index a777165..4db3f61 100644 --- a/src/main/java/mapper/DashboardMapper.xml +++ b/src/main/java/mapper/DashboardMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/FollowMapper.xml b/src/main/java/mapper/FollowMapper.xml index c829ea7..8e82fe5 100644 --- a/src/main/java/mapper/FollowMapper.xml +++ b/src/main/java/mapper/FollowMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/NotificationMapper.xml b/src/main/java/mapper/NotificationMapper.xml index 063e356..a6e8dc2 100644 --- a/src/main/java/mapper/NotificationMapper.xml +++ b/src/main/java/mapper/NotificationMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/PermissionMapper.xml b/src/main/java/mapper/PermissionMapper.xml index 1120571..d0a9d8f 100644 --- a/src/main/java/mapper/PermissionMapper.xml +++ b/src/main/java/mapper/PermissionMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/PortfolioMapper.xml b/src/main/java/mapper/PortfolioMapper.xml index c7f93a4..d6f24d8 100644 --- a/src/main/java/mapper/PortfolioMapper.xml +++ b/src/main/java/mapper/PortfolioMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -10,7 +10,7 @@ - + diff --git a/src/main/java/mapper/RoleMapper.xml b/src/main/java/mapper/RoleMapper.xml index 95b5c0f..864639b 100644 --- a/src/main/java/mapper/RoleMapper.xml +++ b/src/main/java/mapper/RoleMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/SpecialDayMapper.xml b/src/main/java/mapper/SpecialDayMapper.xml index d4977b7..fecfeae 100644 --- a/src/main/java/mapper/SpecialDayMapper.xml +++ b/src/main/java/mapper/SpecialDayMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/TagMapper.xml b/src/main/java/mapper/TagMapper.xml index 6425fc0..108f4db 100644 --- a/src/main/java/mapper/TagMapper.xml +++ b/src/main/java/mapper/TagMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + diff --git a/src/main/java/mapper/TopicMapper.xml b/src/main/java/mapper/TopicMapper.xml index aebe73f..6c859f4 100644 --- a/src/main/java/mapper/TopicMapper.xml +++ b/src/main/java/mapper/TopicMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + @@ -27,14 +27,14 @@ - + - + diff --git a/src/main/java/mapper/UserExtendMapper.xml b/src/main/java/mapper/UserExtendMapper.xml index a1ec9e5..565428b 100644 --- a/src/main/java/mapper/UserExtendMapper.xml +++ b/src/main/java/mapper/UserExtendMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/java/mapper/UserMapper.xml b/src/main/java/mapper/UserMapper.xml index 72bed5c..6c770b7 100644 --- a/src/main/java/mapper/UserMapper.xml +++ b/src/main/java/mapper/UserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -20,7 +20,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/src/main/java/mapper/VisitMapper.xml b/src/main/java/mapper/VisitMapper.xml index d912756..ad7ba5e 100644 --- a/src/main/java/mapper/VisitMapper.xml +++ b/src/main/java/mapper/VisitMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/main/java/mapper/WxUserMapper.xml b/src/main/java/mapper/WxUserMapper.xml index 228a592..ebcfc65 100644 --- a/src/main/java/mapper/WxUserMapper.xml +++ b/src/main/java/mapper/WxUserMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1608661..74dcc06 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: -# profiles: -# active: pord + profiles: + active: dev thymeleaf: prefix: classpath:/templates/ suffix: .html @@ -22,7 +22,7 @@ spring: max-idle: 500 min-idle: 0 datasource: - url: jdbc:mysql://localhost:3306/vertical?characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/forest?characterEncoding=UTF-8&autoReconnect=true&useSSL=false username: root password: # 数据库密码 driver-class-name: com.mysql.cj.jdbc.Driver @@ -55,14 +55,14 @@ wx: env: dev logging: file: - path: /logs/vertical + path: /logs/forest level: com: rymcu: info server: port: 8099 servlet: - context-path: /vertical + context-path: /forest version: 1.0 resource: domain: http://yourdomain.com # 网站域名 diff --git a/src/test/java/com/rymcu/vertical/VerticalApplicationTests.java b/src/test/java/com/rymcu/forest/ForestApplicationTests.java similarity index 72% rename from src/test/java/com/rymcu/vertical/VerticalApplicationTests.java rename to src/test/java/com/rymcu/forest/ForestApplicationTests.java index b3e4934..e7d9cce 100644 --- a/src/test/java/com/rymcu/vertical/VerticalApplicationTests.java +++ b/src/test/java/com/rymcu/forest/ForestApplicationTests.java @@ -1,10 +1,10 @@ -package com.rymcu.vertical; +package com.rymcu.forest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class VerticalApplicationTests { +class ForestApplicationTests { @Test void contextLoads() {