diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java index 21ebf84e..f8c23949 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java @@ -1,4 +1,4 @@ -package com.hxkj.generator; +package com.hxkj.admin; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java index 41164ff0..abb83e30 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java @@ -1,10 +1,10 @@ -package com.hxkj.generator; +package com.hxkj.admin; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.HttpEnum; import com.hxkj.common.utils.RedisUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java index 6bff4fde..77ff28d2 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java @@ -1,4 +1,4 @@ -package com.hxkj.generator; +package com.hxkj.admin; import java.util.LinkedHashMap; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index a81e0cee..a3d19d33 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; /** * 后台公共配置 diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java index 4a5c8a38..08026f47 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java index 8d7a1602..1444be62 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; -import com.hxkj.generator.LikeAdminInterceptor; +import com.hxkj.admin.LikeAdminInterceptor; import com.hxkj.common.config.GlobalConfig; import com.hxkj.common.utils.YmlUtil; import org.springframework.context.annotation.Configuration; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java index 618b84a9..979e92a8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config.aop; +package com.hxkj.admin.config.aop; import java.lang.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java index 7d4c86b3..e4f31e22 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.config.aop; +package com.hxkj.admin.config.aop; import com.alibaba.fastjson.JSON; -import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.common.entity.system.SystemLogOperate; import com.hxkj.common.mapper.system.SystemLogOperateMapper; import com.hxkj.common.utils.IpUtil; @@ -36,7 +36,7 @@ public class LogAspect { /** * 声明切面点拦截那些类 */ - @Pointcut("@annotation(com.hxkj.generator.config.aop.Log)") + @Pointcut("@annotation(com.hxkj.admin.config.aop.Log)") private void pointCutMethodController() {} /** diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java index 53bf0d46..826742d0 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IAlbumService; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IAlbumService; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.ArrayUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java index b221082a..4c703705 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IArticleService; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IArticleService; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java index 43db587f..21f8a5e4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.service.IIndexService; +import com.hxkj.admin.service.IIndexService; import com.hxkj.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java index 6ee238bd..152ab16b 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IAlbumService; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IAlbumService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.AlbumEnum; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java index dee12f0f..73cb857a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.monitor; +package com.hxkj.admin.controller.monitor; -import com.hxkj.generator.config.aop.Log; +import com.hxkj.admin.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.utils.StringUtil; import org.springframework.data.redis.connection.RedisServerCommands; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java index e8e22115..a890c4f8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.controller.monitor; +package com.hxkj.admin.controller.monitor; -import com.hxkj.generator.config.aop.Log; +import com.hxkj.admin.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.ServerResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index eac566e4..3ae2cfff 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.setting; +package com.hxkj.admin.controller.setting; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IBasicsService; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java index 0345a3da..ca125b9f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java @@ -1,12 +1,12 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java index fccd88fe..85e9162a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.service.ISystemDeptService; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.service.ISystemDeptService; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java index 8c077e74..549de132 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemLogServer; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.service.ISystemLogServer; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java index 8e667ffb..817b41b3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemLoginService; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.exception.LoginException; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java index 642298ab..4539e97d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemMenuService; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemMenuService; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java index ef253d62..a3a6ec17 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemPostService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.service.ISystemPostService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java index 764a42f9..fcff8669 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java @@ -1,10 +1,10 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java index eb8127fc..09257fb2 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java similarity index 84% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java index f289041b..7ad505ac 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java index d84e9641..6ca9660d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java index 339eab32..eebf56db 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java index 8d5aaa9b..8047ae2f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java index ed87ce68..f0291401 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import java.util.List; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java similarity index 78% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java index a121310a..d7d45409 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java index dc2a61a5..5aa1c7b5 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.validate.system.SystemLoginParam; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java similarity index 86% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java index 9f4921a3..f5791fdd 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; /** * 系统菜单服务接口类 diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java index 6efb0340..4224dc53 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java index c40a5a19..1fa03f7f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java similarity index 83% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java index 1689b6b4..96451a6a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java index a62394f5..c3acf31f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.service.IAlbumService; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumCateVo; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.service.IAlbumService; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumCateVo; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Album; import com.hxkj.common.entity.AlbumCate; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java index 82862b29..f95d9022 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java @@ -1,16 +1,16 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.service.IArticleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.service.IArticleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Article; import com.hxkj.common.entity.ArticleCategory; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java index 26d61693..1aae9a21 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; -import com.hxkj.generator.service.IBasicsService; +import com.hxkj.admin.service.IBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java index 1a76cde5..af08b64b 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.generator.service.IIndexService; +import com.hxkj.admin.service.IIndexService; import com.hxkj.common.entity.Article; import com.hxkj.common.mapper.ArticleMapper; import com.hxkj.common.utils.ConfigUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java index 0b4101e1..11071690 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemRoleVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemMenu; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java index 76c07401..f4c1ced7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.generator.service.ISystemDeptService; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.service.ISystemDeptService; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemDept; import com.hxkj.common.mapper.system.SystemAdminMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java index 931f6cd5..e4fc3a3d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.service.ISystemLogServer; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.service.ISystemLogServer; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.entity.system.SystemLogOperate; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java index 0d04bd7e..bc1fe9d6 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemLoginService; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.enums.HttpEnum; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java index b7c6a0cd..6f766f13 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java @@ -1,14 +1,14 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemMenuService; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemMenuService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; import com.hxkj.common.utils.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java index d17350db..b9770414 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.service.ISystemPostService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.service.ISystemPostService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemPost; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java index 422117ca..f91a1200 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemRoleMenuService; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.entity.system.SystemRoleMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java index 262726a4..08e981a3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemRole; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java index cca10286..0900576d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java index a175e6a8..405a2428 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java index c294e7c3..f5693ef4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.article; +package com.hxkj.admin.validate.article; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java index e0cfc593..5965b8a7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.article; +package com.hxkj.admin.validate.article; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java index 9a07fec9..ce5abfb7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java index 8c4e8f36..c6a866ce 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java index 948fc335..90b412fb 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java index 638541ca..e9d1d43a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java index 90f1ae4e..77c18b4a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java index 12385f77..8952d480 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java index cc63b5ec..000ca700 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java index 12deb077..53dcb2ed 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java index dee859ac..4af833ee 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java index 5d251160..99361ab3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java index 3bef1641..76731fe8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java index 924e4885..04dd8406 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java index c65f8f69..320734f4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java index fb457381..9d91caae 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java similarity index 86% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java index 37bbf59c..97b76f1a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java index cda4a397..405b06a9 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java index 6543da39..6c1ca055 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java index bd5efe1e..9a894450 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java index 08bc1c93..fb9593bb 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java index 1297a6aa..1915a32e 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java similarity index 90% rename from server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java rename to server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java index e171a0a6..f3e2be36 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; public class GenConfig { diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java rename to server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java index 815698ed..92df954f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java @@ -1,14 +1,14 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; -import com.hxkj.generator.service.IGenerateService; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java rename to server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java index 4c848652..137d44b9 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.entity; +package com.hxkj.admin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java rename to server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java index 1b39cc4a..7f2fac31 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.entity; +package com.hxkj.admin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java similarity index 71% rename from server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java rename to server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java index 218db9e2..d217a96e 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.mapper; +package com.hxkj.admin.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.admin.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java rename to server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java index 52f6a924..dcfff793 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.mapper; +package com.hxkj.admin.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; -import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.admin.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java similarity index 85% rename from server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java rename to server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java index e4af40fd..e34daae4 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java @@ -1,12 +1,11 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.hxkj.common.core.PageResult; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenTableVo; -import java.util.List; import java.util.Map; /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java similarity index 93% rename from server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java rename to server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java index 5acb2dd7..b1ebaca2 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java @@ -1,31 +1,27 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; -import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; -import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; -import com.hxkj.common.utils.ToolsUtil; -import com.hxkj.generator.config.GenConfig; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; -import com.hxkj.generator.mapper.GenTableColumnMapper; -import com.hxkj.generator.mapper.GenTableMapper; -import com.hxkj.generator.service.IGenerateService; -import com.hxkj.generator.util.GenUtil; -import com.hxkj.generator.util.VelocityUtil; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenColumnVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.admin.mapper.GenTableColumnMapper; +import com.hxkj.admin.mapper.GenTableMapper; +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.util.GenUtil; +import com.hxkj.admin.util.VelocityUtil; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenColumnVo; +import com.hxkj.admin.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -329,10 +325,14 @@ public class GenerateServiceImpl implements IGenerateService { @Override public Map previewCode(Integer id) { GenTable table = genTableMapper.selectById(id); + List columns = genTableColumnMapper.selectList( + new QueryWrapper() + .eq("table_id", id) + .orderByAsc("sort")); // 初始模板 VelocityUtil.initVelocity(); - VelocityContext context = VelocityUtil.prepareContext(table); + VelocityContext context = VelocityUtil.prepareContext(table, columns); // 渲染模板 Map map = new LinkedHashMap<>(); @@ -342,6 +342,7 @@ public class GenerateServiceImpl implements IGenerateService { Template tpl = Velocity.getTemplate(template, "UTF-8"); tpl.merge(context, sw); map.put(template, sw.toString()); + System.out.println(sw); } return map; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java rename to server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java index a4322d4c..2b1e7d69 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java @@ -1,10 +1,10 @@ -package com.hxkj.generator.util; +package com.hxkj.admin.util; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.utils.StringUtil; -import com.hxkj.generator.config.GenConfig; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.admin.config.GenConfig; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; @@ -141,7 +141,7 @@ public class GenUtil { * @param tableName 表名 * @return 业务名 */ - public static String toBusinessName(String tableName) { + public static String toBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtil.substring(tableName, lastIndex + 1, nameLength); diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java new file mode 100644 index 00000000..5d11ccef --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java @@ -0,0 +1,75 @@ +package com.hxkj.admin.util; + +import com.hxkj.common.utils.StringUtil; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; + +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; + +public class VelocityUtil { + + /** + * 初始化vm方法 + */ + public static void initVelocity() { + try { + Properties p = new Properties(); + p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); + p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); + p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); + Velocity.init(p); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 设置模板变量信息 + * + * @author fzr + * @return VelocityContext + */ + public static VelocityContext prepareContext(GenTable table, List columns) { + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("genTpl", table.getGenTpl()); + velocityContext.put("tableName", table.getTableName()); + velocityContext.put("authorName", table.getAuthorName()); + velocityContext.put("entityName", table.getEntityName()); + velocityContext.put("moduleName", table.getModuleName()); + velocityContext.put("packageName", table.getPackageName()); + velocityContext.put("businessName", StringUtil.capitalize(table.getBusinessName())); + velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); + velocityContext.put("table", table); + velocityContext.put("columns", columns); + System.out.println(table.getTableName()); + System.out.println(table.getAuthorName()); + System.out.println(table.getEntityName()); + System.out.println(table.getModuleName()); + System.out.println(table.getPackageName()); + return velocityContext; + } + + /** + * 获取模板列表 + * + * @author fzr + * @return List + */ + public static List getTemplateList(String genTpl) { + List templates = new LinkedList<>(); +// templates.add("java/controller.java.vm"); + templates.add("java/entity.java.vm"); +// templates.add("java/mapper.java.vm"); +// templates.add("java/service.java.vm"); +// templates.add("java/serviceImpl.java.vm"); +// templates.add("java/validate.java.vm"); + return templates; + } + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java rename to server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java index 3d5e9d29..bd6f9b45 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java b/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java rename to server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java index a175e6a8..405a2428 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java index 2eaad1da..be8ab12a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java index 1f255b49..4a4a84ac 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java similarity index 94% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java index eb1e0e42..08c56a84 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java deleted file mode 100644 index 4c024088..00000000 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hxkj.generator.util; - -import com.hxkj.common.utils.StringUtil; -import com.hxkj.common.utils.TimeUtil; -import com.hxkj.generator.entity.GenTable; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; - -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - -public class VelocityUtil { - - /** - * 初始化vm方法 - */ - public static void initVelocity() { - try { - Properties p = new Properties(); - p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); - p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); - p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); - Velocity.init(p); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * 设置模板变量信息 - * - * @return 模板列表 - */ - public static VelocityContext prepareContext(GenTable genTable) { - String moduleName = genTable.getModuleName(); - String businessName = genTable.getBusinessName(); - String packageName = genTable.getPackageName(); - String tplCategory = genTable.getGenTpl(); - String functionName = genTable.getFunctionName(); - - VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("genTpl", genTable.getGenTpl()); - velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtil.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); - velocityContext.put("ClassName", genTable.getEntityName()); - velocityContext.put("moduleName", genTable.getModuleName()); - velocityContext.put("BusinessName", StringUtil.capitalize(genTable.getBusinessName())); - velocityContext.put("businessName", genTable.getBusinessName()); - velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getAuthorName()); - velocityContext.put("datetime", TimeUtil.nowDate()); - return velocityContext; - } - - /** - * 获取模板信息 - * - * @return 模板列表 - */ - public static List getTemplateList(String genTpl) { - List templates = new LinkedList<>(); - templates.add("java/controller.java.vm"); - -// templates.add("java/domain.java.vm"); -// templates.add("java/mapper.java.vm"); -// templates.add("java/service.java.vm"); -// templates.add("java/serviceImpl.java.vm"); -// templates.add("vm/xml/mapper.xml.vm"); -// templates.add("vm/sql/sql.vm"); -// templates.add("vm/js/api.js.vm"); - return templates; - } - - -} diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 4135e697..4fe09ddc 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -1,12 +1,12 @@ package ${packageName}.controller; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -29,7 +29,7 @@ public class ${ClassName}Controller { /** * ${functionName}列表 * - * @author fzr + * @author ${authorName} * @return Object */ @GetMapping("/list") @@ -42,7 +42,7 @@ public class ${ClassName}Controller { /** * ${functionName}详情 * - * @author fzr + * @author ${authorName} * @param id 主键ID * @return Object */ @@ -55,7 +55,7 @@ public class ${ClassName}Controller { /** * ${functionName}新增 * - * @author fzr + * @author ${authorName} * @param systemAdminParam 参数 * @return Object */ @@ -69,7 +69,7 @@ public class ${ClassName}Controller { /** * ${functionName}编辑 * - * @author fzr + * @author ${authorName} * @param systemAdminParam 参数 * @return Object */ @@ -83,7 +83,7 @@ public class ${ClassName}Controller { /** * ${functionName}删除 * - * @author fzr + * @author ${authorName} * @return Object */ @Log(title = "${functionName}删除") diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index e69de29b..882b9ade 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -0,0 +1,18 @@ +package com.hxkj.common.entity; + +/** + * ${functionName}实体 + */ +@Data +public class ${entityName} implements Serializable { + + private static final long serialVersionUID = 1L; + + #foreach ($column in $columns) + #if($column.isPk) + @TableId(value="${column.columnName}", type= IdType.AUTO) + #end + private ${column.javaType} ${column.javaField}; + #end + +} \ No newline at end of file diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index e69de29b..05add54a 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -0,0 +1,12 @@ +package com.hxkj.common.mapper; + +import com.hxkj.common.core.basics.IBaseMapper; +import com.hxkj.common.entity.${entityName}; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统管理员 + */ +@Mapper +public interface ${entityName}Mapper extends IBaseMapper<${entityName}> { +} diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index e69de29b..8047ae2f 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -0,0 +1,97 @@ +package com.hxkj.admin.service; + +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; + +import java.util.Map; + +/** + * 系统管理员服务接口类 + */ +public interface ISystemAdminService { + + /** + * 根据账号查找管理员 + * + * @author fzr + * @param username 主键ID + * @return SysAdmin + */ + SystemAdmin findByUsername(String username); + + /** + * 管理员列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ + PageResult list(PageParam pageParam, Map params); + + /** + * 当前管理员 + * + * @author fzr + * @return SystemSelfVo + */ + SystemSelfVo self(Integer adminId); + + /** + * 管理员详情 + * + * @author fzr + * @param id 主键参数 + * @return SysAdmin + */ + SystemAdminVo detail(Integer id); + + /** + * 管理员新增 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void add(SystemAdminParam systemAdminParam); + + /** + * 管理员编辑 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void edit(SystemAdminParam systemAdminParam); + + /** + * 当前管理员更新 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void upInfo(SystemAdminParam systemAdminParam, Integer adminId); + + /** + * 管理员删除 + * + * @author fzr + * @param id 主键参数 + */ + void del(Integer id); + + /** + * 管理员状态切换 + * + * @author fzr + * @param id 主键参数 + */ + void disable(Integer id); + + /** + * 缓存管理员 + */ + void cacheAdminUserByUid(Integer id); + +} diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index e69de29b..72079352 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -0,0 +1,260 @@ +package com.hxkj.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; +import com.hxkj.common.mapper.system.SystemAdminMapper; +import com.hxkj.common.mapper.system.SystemMenuMapper; +import com.hxkj.common.utils.*; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 系统管理员实现类 + */ +@Service +public class SystemAdminServiceImpl implements ISystemAdminService { + + @Resource + SystemAdminMapper systemAdminMapper; + + @Resource + SystemMenuMapper systemMenuMapper; + + @Resource + ISystemRoleService iSystemRoleService; + + @Resource + ISystemRoleMenuService iSystemRoleMenuService; + + /** + * 管理员列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ + @Override + public PageResult list(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," + + "sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," + + "t.last_login_ip,t.last_login_time,t.create_time,t.update_time") + .eq("t.is_delete", 0) + .leftJoin("ls_system_role sr ON sr.id=t.role") + .leftJoin("ls_system_dept sd ON sd.id=t.dept_id") + .orderByDesc(Arrays.asList("t.id", "t.sort")); + + systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{ + "like:username:str", + "like:nickname:str", + "=:role:int" + }); + + IPage iPage = systemAdminMapper.selectJoinPage( + new Page<>(page, limit), + SystemAdminVo.class, + mpjQueryWrapper); + + for (SystemAdminVo vo : iPage.getRecords()) { + if (vo.getId() == 1) { + vo.setRole("系统管理员"); + } + + if (vo.getDept() == null) { + vo.setDept(""); + } + + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())); + vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); + vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime())); + } + + return PageResult.iPageHandle(iPage); + } + + /** + * 管理员详细 + * + * @author fzr + * @param id 主键 + * @return SysAdmin + */ + @Override + public SystemAdminVo detail(Integer id) { + SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper() + .select(SystemAdmin.class, info-> + !info.getColumn().equals("salt") && + !info.getColumn().equals("password") && + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(sysAdmin, "账号已不存在！"); + + SystemAdminVo vo = new SystemAdminVo(); + BeanUtils.copyProperties(sysAdmin, vo); + + vo.setDept(String.valueOf(vo.getDeptId())); + vo.setRole(String.valueOf(sysAdmin.getRole())); + vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); + vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); + vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); + + return vo; + } + + /** + * 管理员新增 + * + * @author fzr + * @param systemAdminParam 参数 + */ + @Override + public void add(SystemAdminParam systemAdminParam) { + String[] field = {"id", "username", "nickname"}; + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("username", systemAdminParam.getUsername()) + .last("limit 1")), "账号已存在换一个吧！"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("nickname", systemAdminParam.getNickname()) + .last("limit 1")), "昵称已存在换一个吧！"); + + SystemRoleVo roleVo = iSystemRoleService.detail(systemAdminParam.getRole()); + Assert.notNull(roleVo, "角色不存在!"); + Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!"); + + String salt = ToolsUtil.randomString(5); + String pwd = ToolsUtil.makeMd5(systemAdminParam.getPassword().trim() + salt); + String avatar = UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()); + + SystemAdmin model = new SystemAdmin(); + model.setDeptId(systemAdminParam.getDeptId()); + model.setPostId(systemAdminParam.getPostId()); + model.setUsername(systemAdminParam.getUsername()); + model.setNickname(systemAdminParam.getNickname()); + model.setRole(systemAdminParam.getRole()); + model.setAvatar(avatar); + model.setPassword(pwd); + model.setSalt(salt); + model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); + model.setIsDisable(systemAdminParam.getIsDisable()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + systemAdminMapper.insert(model); + } + + /** + * 管理员更新 + * + * @author fzr + * @param systemAdminParam 参数 + */ + @Override + public void edit(SystemAdminParam systemAdminParam) { + String[] field = {"id", "username", "nickname"}; + Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("id", systemAdminParam.getId()) + .eq("is_delete", 0) + .last("limit 1")), "账号不存在了!"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("username", systemAdminParam.getUsername()) + .ne("id", systemAdminParam.getId()) + .last("limit 1")), "账号已存在换一个吧！"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("nickname", systemAdminParam.getNickname()) + .ne("id", systemAdminParam.getId()) + .last("limit 1")), "昵称已存在换一个吧！"); + + Assert.notNull(iSystemRoleService.detail(systemAdminParam.getRole()), "角色不存在!"); + + SystemAdmin model = new SystemAdmin(); + model.setId(systemAdminParam.getId()); + model.setDeptId(systemAdminParam.getDeptId()); + model.setPostId(systemAdminParam.getPostId()); + model.setNickname(systemAdminParam.getNickname()); + model.setUsername(systemAdminParam.getUsername()); + model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar())); + model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole()); + model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); + model.setIsDisable(systemAdminParam.getIsDisable()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + + if (systemAdminParam.getPassword() != null) { + String salt = ToolsUtil.randomString(5); + String pwd = ToolsUtil.makeMd5( systemAdminParam.getPassword().trim() + salt); + model.setPassword(pwd); + model.setSalt(salt); + } + + systemAdminMapper.updateById(model); + this.cacheAdminUserByUid(systemAdminParam.getId()); + } + + /** + * 管理员删除 + * + * @author fzr + * @param id 主键 + */ + @Override + public void del(Integer id) { + String[] field = {"id", "username", "nickname"}; + Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")), "账号已不存在！"); + + Assert.isFalse(id == 1, "系统管理员不允许删除"); + + int adminId = Integer.parseInt(LikeAdminThreadLocal.getAdminId().toString()); + Assert.isFalse(id == adminId, "不能删除自己"); + + SystemAdmin model = new SystemAdmin(); + model.setId(id); + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + systemAdminMapper.updateById(model); + this.cacheAdminUserByUid(id); + } + +}