整体优化代码结构

server/like-admin/pom.xml

@@ -17,16 +17,24 @@
 
     <!-- 项目管理 -->
     <dependencies>
-        <!-- 公共依赖 -->
+        <!-- 全局工具 -->
         <dependency>
             <groupId>org.mdd</groupId>
             <artifactId>like-common</artifactId>
         </dependency>
+
+        <!-- 代码生成 -->
         <dependency>
             <groupId>org.mdd</groupId>
             <artifactId>like-generator</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <!-- SaToken -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <!-- 插件管理 -->

server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java

@@ -1,10 +1,10 @@
 package com.mdd.admin;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.mdd.admin.config.AdminConfig;
-import com.mdd.admin.service.system.ISystemAuthAdminService;
-import com.mdd.admin.service.system.ISystemAuthPermService;
+import com.mdd.admin.service.ISystemAuthAdminService;
+import com.mdd.admin.service.ISystemAuthPermService;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.enums.HttpEnum;
 import com.mdd.common.utils.RedisUtil;
@@ -37,7 +37,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
         // 404拦截
         response.setContentType("application/json;charset=utf-8");
         if (response.getStatus() == 404) {
-            AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }
@@ -61,7 +61,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
         // Token是否为空
         String token = request.getHeader("token");
         if (StringUtils.isBlank(token)) {
-            AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }
@@ -69,7 +69,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
         // Token是否过期
         token = AdminConfig.backstageTokenKey + token;
         if (!RedisUtil.exists(token)) {
-            AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }
@@ -85,14 +85,14 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
         if (map == null || map.get("isDelete").equals("1")) {
             RedisUtil.del(token);
             RedisUtil.hDel(AdminConfig.backstageManageKey, uid);
-            AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }
 
         // 校验用户被禁用
         if (map.get("isDisable").equals("1")) {
-            AjaxResult result = AjaxResult.failed(HttpEnum.LOGIN_DISABLE_ERROR.getCode(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.LOGIN_DISABLE_ERROR.getCode(), HttpEnum.LOGIN_DISABLE_ERROR.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }
@@ -123,7 +123,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
         // 验证是否有权限操作
         String menus = RedisUtil.hGet(AdminConfig.backstageRolesKey, roleId).toString();
         if (menus.equals("") || !Arrays.asList(menus.split(",")).contains(auths)) {
-            AjaxResult result = AjaxResult.failed(HttpEnum.NO_PERMISSION.getCode(), HttpEnum.NO_PERMISSION.getMsg());
+            AjaxResult<Object> result = AjaxResult.failed(HttpEnum.NO_PERMISSION.getCode(), HttpEnum.NO_PERMISSION.getMsg());
             response.getWriter().print(JSON.toJSONString(result));
             return false;
         }

server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java

@@ -1,6 +1,6 @@
 package com.mdd.admin.config.aop;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.mdd.admin.LikeAdminThreadLocal;
 import com.mdd.common.entity.system.SystemLogOperate;
 import com.mdd.common.mapper.system.SystemLogOperateMapper;
@@ -16,7 +16,6 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,9 +24,7 @@ import org.springframework.web.multipart.support.StandardMultipartHttpServletReq
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Aspect
 @Component

server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java

@@ -0,0 +1,135 @@
+package com.mdd.admin.controller;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.config.aop.Log;
+import com.mdd.admin.service.IAlbumsService;
+import com.mdd.admin.validate.AlbumCateValidate;
+import com.mdd.admin.validate.AlbumMoveValidate;
+import com.mdd.admin.validate.AlbumRenameValidate;
+import com.mdd.admin.validate.AlbumSearchValidate;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.IdsValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.album.AlbumVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 相册管理
+ */
+@RestController
+@RequestMapping("api/common/album")
+public class AlbumsController {
+
+    @Resource
+    IAlbumsService iAlbumsService;
+
+    /**
+     * 相册文件列表
+     *
+     * @author fzr
+     * @return AjaxResult<PageResult<AlbumVo>>
+     */
+    @GetMapping("/albumList")
+    public AjaxResult<PageResult<AlbumVo>> albumList(@Validated PageValidate pageValidate,
+                                                     @Validated AlbumSearchValidate searchValidate) {
+        PageResult<AlbumVo> voPageResult = iAlbumsService.albumList(pageValidate, searchValidate);
+        return AjaxResult.success(voPageResult);
+    }
+
+    /**
+     * 相册文件重命名
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册文件重命名")
+    @PostMapping("/albumRename")
+    public AjaxResult<Object> albumRename(@Validated @RequestBody AlbumRenameValidate renameValidate) {
+        iAlbumsService.albumRename(renameValidate.getId(), renameValidate.getName());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 相册文件移动
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册文件移动")
+    @PostMapping("/albumMove")
+    public AjaxResult<Object> albumMove(@Validated @RequestBody AlbumMoveValidate moveValidate) {
+        iAlbumsService.albumMove(moveValidate.getIds(), moveValidate.getCid());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 相册文件删除
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册文件删除")
+    @PostMapping("/albumDel")
+    public AjaxResult<Object> albumDel(@Validated @RequestBody IdsValidate idsValidate) {
+        iAlbumsService.albumDel(idsValidate.getIds());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 相册分类列表
+     *
+     * @author fzr
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<JSONArray>
+     */
+    @GetMapping("/cateList")
+    public AjaxResult<JSONArray> cateList(@Validated AlbumSearchValidate searchValidate) {
+        JSONArray jsonArray = iAlbumsService.cateList(searchValidate);
+        return AjaxResult.success(jsonArray);
+    }
+
+    /**
+     * 相册分类新增
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册分类新增")
+    @PostMapping("/cateAdd")
+    public AjaxResult<Object> cateAdd(@Validated @RequestBody AlbumCateValidate cateValidate) {
+        iAlbumsService.cateAdd(cateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 相册分类重命名
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册分类重命名")
+    @PostMapping("/cateRename")
+    public AjaxResult<Object> cateRename(@Validated @RequestBody AlbumRenameValidate renameValidate) {
+        iAlbumsService.cateRename(renameValidate.getId(), renameValidate.getName());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 相册分类删除
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "相册分类删除")
+    @PostMapping("/cateDel")
+    public AjaxResult<Object> cateDel(@Validated @RequestBody IdValidate idValidate) {
+        iAlbumsService.cateDel(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java

@@ -0,0 +1,126 @@
+package com.mdd.admin.controller;
+
+import com.mdd.admin.config.aop.Log;
+import com.mdd.admin.service.IArtCateService;
+import com.mdd.admin.validate.ArtCateCreateValidate;
+import com.mdd.admin.validate.ArtCateUpdateValidate;
+import com.mdd.admin.validate.ArtCateSearchValidate;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.article.ArticleCateVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 文章分类管理
+ */
+@RestController
+@RequestMapping("api/article/cate")
+public class ArtCateController {
+
+    @Resource
+    IArtCateService iArtCateService;
+
+    /**
+     * 分类所有
+     *
+     * @author fzr
+     * @return AjaxResult<List<ArticleCateVo>>
+     */
+    @GetMapping("/all")
+    public AjaxResult<List<ArticleCateVo>> all() {
+        List<ArticleCateVo> list = iArtCateService.all();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 分类列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<ArticleCateVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<ArticleCateVo>> list(@Validated PageValidate pageValidate,
+                                                      @Validated ArtCateSearchValidate searchValidate) {
+        PageResult<ArticleCateVo> list = iArtCateService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 分类详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<ArticleCateVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<ArticleCateVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ArticleCateVo vo = iArtCateService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 分类新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章分类新增")
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody ArtCateCreateValidate createValidate) {
+        iArtCateService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 分类编辑
+     *
+     * @author fzr
+     * @param updateValidate 编辑
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章分类编辑")
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody ArtCateUpdateValidate updateValidate) {
+        iArtCateService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 分类删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章分类删除")
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iArtCateService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 分类状态
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章分类状态")
+    @PostMapping("/change")
+    public AjaxResult<Object> change(@Validated @RequestBody IdValidate idValidate) {
+        iArtCateService.change(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java

@@ -0,0 +1,115 @@
+package com.mdd.admin.controller;
+
+import com.mdd.admin.config.aop.Log;
+import com.mdd.admin.service.IArticleService;
+import com.mdd.admin.validate.ArticleCreateValidate;
+import com.mdd.admin.validate.ArticleSearchValidate;
+import com.mdd.admin.validate.ArticleUpdateValidate;
+
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.article.ArticleDetailVo;
+import com.mdd.admin.vo.article.ArticleListedVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 文章管理
+ */
+@RestController
+@RequestMapping("api/article")
+public class ArticleController {
+
+    @Resource
+    IArticleService iArticleService;
+
+    /**
+     * 文章列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<ArticleListVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<ArticleListedVo>> list(@Validated PageValidate pageValidate,
+                                                        @Validated ArticleSearchValidate searchValidate) {
+        PageResult<ArticleListedVo> vos = iArticleService.list(pageValidate, searchValidate);
+        return AjaxResult.success(vos);
+    }
+
+    /**
+     * 文章详情
+     *
+     * @author fzr
+     * @param id 文章ID
+     * @return AjaxResult<ArticleDetailVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<ArticleDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ArticleDetailVo vo = iArticleService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 文章新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章新增")
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody ArticleCreateValidate createValidate) {
+        iArticleService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 文章编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章编辑")
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody ArticleUpdateValidate updateValidate) {
+        iArticleService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 文章删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章删除")
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iArticleService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 文章状态
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "文章状态")
+    @PostMapping("/change")
+    public AjaxResult<Object> change(@Validated @RequestBody IdValidate idValidate) {
+        iArticleService.change(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/IndexController.java

@@ -1,6 +1,6 @@
-package com.mdd.admin.controller.common;
+package com.mdd.admin.controller;
 
-import com.mdd.admin.service.common.IIndexService;
+import com.mdd.admin.service.IIndexCommonService;
 import com.mdd.common.core.AjaxResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,17 +19,17 @@ import java.util.Map;
 public class IndexController {
 
     @Resource
-    IIndexService iIndexService;
+    IIndexCommonService iIndexCommonService;
 
     /**
      * 控制台
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<Map<String, Object>>
      */
     @GetMapping("/console")
-    public AjaxResult console() {
-        Map<String, Object> map = iIndexService.console();
+    public AjaxResult<Map<String, Object>> console() {
+        Map<String, Object> map = iIndexCommonService.console();
         return AjaxResult.success(map);
     }
 
@@ -37,11 +37,11 @@ public class IndexController {
      * 公共配置
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<Map<String, Object>
      */
     @GetMapping("/config")
-    public AjaxResult config() {
-        Map<String, Object> map = iIndexService.config();
+    public AjaxResult<Map<String, Object>> config() {
+        Map<String, Object> map = iIndexCommonService.config();
         return AjaxResult.success(map);
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java

@@ -1,9 +1,9 @@
-package com.mdd.admin.controller.common;
+package com.mdd.admin.controller;
 
 import com.mdd.admin.LikeAdminThreadLocal;
 import com.mdd.admin.config.aop.Log;
 import com.mdd.admin.config.aop.RequestType;
-import com.mdd.admin.service.common.IAlbumService;
+import com.mdd.admin.service.IAlbumsService;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.enums.AlbumEnum;
 import com.mdd.common.exception.OperateException;
@@ -28,18 +28,18 @@ import java.util.Map;
 public class UploadController {
 
     @Resource
-    IAlbumService iAlbumService;
+    IAlbumsService iAlbumsService;
 
     /**
      * 上传图片
      *
      * @author fzr
      * @param request 请求对象
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @Log(title = "上传图片", requestType = RequestType.File)
     @PostMapping("/image")
-    public AjaxResult image(HttpServletRequest request) {
+    public AjaxResult<Object> image(HttpServletRequest request) {
         MultipartFile multipartFile;
         try {
             multipartFile = ((MultipartRequest) request).getFile("file");
@@ -64,7 +64,7 @@ public class UploadController {
             album.put("ext", map.get("ext").toString());
             album.put("url", map.get("url").toString());
             album.put("name", map.get("name").toString());
-            Integer id = iAlbumService.albumAdd(album);
+            Integer id = iAlbumsService.albumAdd(album);
 
             map.put("id", id);
 
@@ -79,11 +79,11 @@ public class UploadController {
      *
      * @author fzr
      * @param request 请求对象
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @Log(title = "上传视频", requestType = RequestType.File)
     @PostMapping("/video")
-    public AjaxResult video(HttpServletRequest request) {
+    public AjaxResult<Object> video(HttpServletRequest request) {
         MultipartFile multipartFile;
         try {
             multipartFile = ((MultipartRequest) request).getFile("file");
@@ -108,7 +108,7 @@ public class UploadController {
             album.put("size", map.get("size").toString());
             album.put("url", map.get("url").toString());
             album.put("name", map.get("name").toString());
-            Integer id = iAlbumService.albumAdd(album);
+            Integer id = iAlbumsService.albumAdd(album);
 
             map.put("id", id);
 

server/like-admin/src/main/java/com/mdd/admin/controller/UsersController.java

@@ -0,0 +1,67 @@
+package com.mdd.admin.controller;
+
+import com.mdd.admin.service.IUsersService;
+import com.mdd.admin.validate.UsersSearchValidate;
+import com.mdd.admin.validate.UsersUpdateValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.user.UserVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户管理
+ */
+@RestController
+@RequestMapping("api/user")
+public class UsersController {
+
+    @Resource
+    IUsersService iUsersService;
+
+    /**
+     * 用户列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<UserVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<UserVo>> list(@Validated PageValidate pageValidate,
+                                               @Validated UsersSearchValidate searchValidate) {
+        PageResult<UserVo> list = iUsersService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 用户详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<UserVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<UserVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        UserVo vo = iUsersService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 用户编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody UsersUpdateValidate updateValidate) {
+        iUsersService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java

@@ -1,117 +0,0 @@
-package com.mdd.admin.controller.article;
-
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.article.IArticleArchivesService;
-import com.mdd.admin.validate.article.ArticleParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.article.ArticleDetailVo;
-import com.mdd.admin.vo.article.ArticleListVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 文章管理
- */
-@RestController("articleController")
-@RequestMapping("api/article")
-public class ArticleController {
-
-    @Resource
-    IArticleArchivesService iArticleArchivesService;
-
-    /**
-     * 文章列表
-     *
-     * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                              @RequestParam Map<String, String> params) {
-        PageResult<ArticleListVo> vos = iArticleArchivesService.list(pageParam, params);
-        return AjaxResult.success(vos);
-    }
-
-    /**
-     * 文章详情
-     *
-     * @author fzr
-     * @param id 文章ID
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ArticleDetailVo vo = iArticleArchivesService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 文章新增
-     *
-     * @author fzr
-     * @param articleParam 文章参数
-     * @return Object
-     */
-    @Log(title = "文章新增")
-    @PostMapping("/add")
-    public AjaxResult add(
-            @Validated(value = ArticleParam.create.class)
-            @RequestBody ArticleParam articleParam) {
-        iArticleArchivesService.add(articleParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 文章编辑
-     *
-     * @author fzr
-     * @param articleParam 文章参数
-     * @return AjaxResult
-     */
-    @Log(title = "文章编辑")
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = ArticleParam.update.class)
-                       @RequestBody ArticleParam articleParam) {
-        iArticleArchivesService.edit(articleParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 文章删除
-     *
-     * @author fzr
-     * @param articleParam 文章参数
-     * @return AjaxResult
-     */
-    @Log(title = "文章删除")
-    @PostMapping("/del")
-    public Object del(@Validated(value = ArticleParam.delete.class)
-                      @RequestBody ArticleParam articleParam) {
-        iArticleArchivesService.del(articleParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 文章状态
-     *
-     * @author fzr
-     * @param articleParam 文章参数
-     * @return AjaxResult
-     */
-    @Log(title = "文章状态")
-    @PostMapping("/change")
-    public AjaxResult change(@Validated(value = ArticleParam.change.class)
-                         @RequestBody ArticleParam articleParam) {
-        iArticleArchivesService.change(articleParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java

@@ -1,128 +0,0 @@
-package com.mdd.admin.controller.article;
-
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.article.IArticleCategoryService;
-import com.mdd.admin.validate.article.CategoryParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.article.ArticleCateVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 文章分类管理
- */
-@RestController("articleCategoryController")
-@RequestMapping("api/article/cate")
-public class CategoryController {
-
-    @Resource
-    IArticleCategoryService iArticleCategoryService;
-
-    /**
-     * 分类所有
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/all")
-    public AjaxResult all() {
-        List<ArticleCateVo> list = iArticleCategoryService.all();
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 分类列表
-     *
-     * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
-     * @return Object
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                       @RequestParam Map<String, String> params) {
-        PageResult<ArticleCateVo> list = iArticleCategoryService.list(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 分类详情
-     *
-     * @author fzr
-     * @param id 主键
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ArticleCateVo vo = iArticleCategoryService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 分类新增
-     *
-     * @author fzr
-     * @param categoryParam 分类参数
-     * @return AjaxResult
-     */
-    @Log(title = "文章分类新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = CategoryParam.create.class)
-                          @RequestBody CategoryParam categoryParam) {
-        iArticleCategoryService.add(categoryParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 分类编辑
-     *
-     * @author fzr
-     * @param categoryParam 分类编辑
-     * @return AjaxResult
-     */
-    @Log(title = "文章分类编辑")
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = CategoryParam.update.class)
-                           @RequestBody CategoryParam categoryParam) {
-        iArticleCategoryService.edit(categoryParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 分类删除
-     *
-     * @author fzr
-     * @param categoryParam 分类删除
-     * @return AjaxResult
-     */
-    @Log(title = "文章分类删除")
-    @PostMapping("/del")
-    public AjaxResult del(@Validated(value = CategoryParam.delete.class)
-                          @RequestBody CategoryParam categoryParam) {
-        iArticleCategoryService.del(categoryParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 分类状态
-     *
-     * @author fzr
-     * @param categoryParam 分类参数
-     * @return AjaxResult
-     */
-    @Log(title = "文章分类状态")
-    @PostMapping("/change")
-    public AjaxResult change(@Validated(value = CategoryParam.change.class)
-                         @RequestBody CategoryParam categoryParam) {
-        iArticleCategoryService.change(categoryParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java

@@ -1,8 +1,8 @@
 package com.mdd.admin.controller.channel;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.channel.IChannelH5Service;
-import com.mdd.admin.validate.channel.ChannelH5Param;
+import com.mdd.admin.service.IChannelH5ConfigService;
+import com.mdd.admin.validate.channel.ChannelH5Validate;
 import com.mdd.admin.vo.channel.ChannelH5Vo;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.validation.annotation.Validated;
@@ -15,20 +15,20 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("api/channel/h5")
-public class H5Controller {
+public class ChannelH5Controller {
 
     @Resource
-    IChannelH5Service iChannelH5Service;
+    IChannelH5ConfigService iChannelH5ConfigService;
 
     /**
      * H5渠道设置详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<ChannelH5Vo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail() {
-        ChannelH5Vo vo = iChannelH5Service.detail();
+    public AjaxResult<ChannelH5Vo> detail() {
+        ChannelH5Vo vo = iChannelH5ConfigService.detail();
         return AjaxResult.success(vo);
     }
 
@@ -36,13 +36,13 @@ public class H5Controller {
      * H5渠道设置保存
      *
      * @author fzr
-     * @param channelH5Param 参数
-     * @return AjaxResult
+     * @param channelH5Validate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "H5渠道设置保存")
     @PostMapping("/save")
-    public AjaxResult save(@Validated @RequestBody ChannelH5Param channelH5Param) {
-        iChannelH5Service.save(channelH5Param);
+    public AjaxResult<Object> save(@Validated @RequestBody ChannelH5Validate channelH5Validate) {
+        iChannelH5ConfigService.save(channelH5Validate);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java

@@ -1,8 +1,8 @@
 package com.mdd.admin.controller.channel;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.channel.IChannelMpService;
-import com.mdd.admin.validate.channel.ChannelMpParam;
+import com.mdd.admin.service.IChannelMpConfigService;
+import com.mdd.admin.validate.channel.ChannelMpValidate;
 import com.mdd.admin.vo.channel.ChannelMpVo;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.validation.annotation.Validated;
@@ -15,20 +15,20 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("api/channel/mp")
-public class MpController {
+public class ChannelMpController {
 
     @Resource
-    IChannelMpService iChannelMpService;
+    IChannelMpConfigService iChannelMpConfigService;
 
     /**
      * 微信小程序渠道设置详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<ChannelMpVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail() {
-        ChannelMpVo vo = iChannelMpService.detail();
+    public AjaxResult<ChannelMpVo> detail() {
+        ChannelMpVo vo = iChannelMpConfigService.detail();
         return AjaxResult.success(vo);
     }
 
@@ -36,13 +36,13 @@ public class MpController {
      * 微信小程序渠道设置保存
      *
      * @author fzr
-     * @param channelMpParam 参数
-     * @return AjaxResult
+     * @param channelMpValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "微信小程序渠道设置保存")
     @PostMapping("/save")
-    public AjaxResult save(@Validated @RequestBody ChannelMpParam channelMpParam) {
-        iChannelMpService.save(channelMpParam);
+    public AjaxResult<Object> save(@Validated @RequestBody ChannelMpValidate channelMpValidate) {
+        iChannelMpConfigService.save(channelMpValidate);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java

@@ -1,8 +1,8 @@
 package com.mdd.admin.controller.channel;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.channel.IChannelOaService;
-import com.mdd.admin.validate.channel.ChannelOaParam;
+import com.mdd.admin.service.IChannelOaConfigService;
+import com.mdd.admin.validate.channel.ChannelOaValidate;
 import com.mdd.admin.vo.channel.ChannelOaVo;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.validation.annotation.Validated;
@@ -15,20 +15,20 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("api/channel/oa")
-public class OaController {
+public class ChannelOaController {
 
     @Resource
-    IChannelOaService iChannelOaService;
+    IChannelOaConfigService iChannelOaConfigService;
 
     /**
      * 公众号渠道设置详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<ChannelOaVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail() {
-        ChannelOaVo vo = iChannelOaService.detail();
+    public AjaxResult<ChannelOaVo> detail() {
+        ChannelOaVo vo = iChannelOaConfigService.detail();
         return AjaxResult.success(vo);
     }
 
@@ -36,13 +36,13 @@ public class OaController {
      * 公众号渠道设置保存
      *
      * @author fzr
-     * @param channelOaParam 参数
-     * @return AjaxResult
+     * @param channelOaValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "公众号渠道设置保存")
     @PostMapping("/save")
-    public AjaxResult save(@Validated @RequestBody ChannelOaParam channelOaParam) {
-        iChannelOaService.save(channelOaParam);
+    public AjaxResult<Object> save(@Validated @RequestBody ChannelOaValidate channelOaValidate) {
+        iChannelOaConfigService.save(channelOaValidate);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java

@@ -1,7 +1,7 @@
 package com.mdd.admin.controller.channel;
 
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.service.channel.IChannelOaMenuService;
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.service.IChannelOaMenusService;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,20 +13,20 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("api/channel/oaMenu")
-public class OaMenuController {
+public class ChannelOaMenuController {
 
     @Resource
-    IChannelOaMenuService iChannelOaMenuService;
+    IChannelOaMenusService iChannelOaMenusService;
 
     /**
      * 菜单详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<JSONArray>
      */
     @GetMapping("/detail")
-    public AjaxResult detail() {
-        JSONArray detail = iChannelOaMenuService.detail();
+    public AjaxResult<JSONArray> detail() {
+        JSONArray detail = iChannelOaMenusService.detail();
         return AjaxResult.success(detail);
     }
 
@@ -35,11 +35,11 @@ public class OaMenuController {
      *
      * @author fzr
      * @param params 参数
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @PostMapping("/save")
-    public AjaxResult save(@RequestBody List<Object> params) {
-        iChannelOaMenuService.save(params, false);
+    public AjaxResult<Object> save(@RequestBody List<Object> params) {
+        iChannelOaMenusService.save(params, false);
         return AjaxResult.success();
     }
 
@@ -48,11 +48,11 @@ public class OaMenuController {
      *
      * @author fzr
      * @param params 参数
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @PostMapping("/publish")
-    public AjaxResult publish(@RequestBody List<Object> params) {
-        iChannelOaMenuService.save(params, true);
+    public AjaxResult<Object> publish(@RequestBody List<Object> params) {
+        iChannelOaMenusService.save(params, true);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyDefaultController.java

@@ -0,0 +1,104 @@
+package com.mdd.admin.controller.channel;
+
+import com.mdd.admin.service.IChannelOaReplyDefaultService;
+import com.mdd.admin.validate.channel.ChannelRpDefaultValidate;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpDefaultVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 公众号默认回复管理
+ */
+@RestController
+@RequestMapping("api/channel/oaReplyDefault")
+public class ChannelOaReplyDefaultController {
+
+    @Resource
+    IChannelOaReplyDefaultService iChannelOaReplyDefaultService;
+
+    /**
+     * 默认回复列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @return AjaxResult<PageResult<ChannelRpDefaultVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<ChannelRpDefaultVo>> list(@Validated PageValidate pageValidate) {
+        PageResult<ChannelRpDefaultVo> list = iChannelOaReplyDefaultService.list(pageValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 默认回复详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<ChannelRpDefaultVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<ChannelRpDefaultVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ChannelRpDefaultVo vo = iChannelOaReplyDefaultService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 默认回复新增
+     *
+     * @author fzr
+     * @param defaultValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody ChannelRpDefaultValidate defaultValidate) {
+        iChannelOaReplyDefaultService.add(defaultValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 默认回复编辑
+     *
+     * @author fzr
+     * @param defaultValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody ChannelRpDefaultValidate defaultValidate) {
+        iChannelOaReplyDefaultService.edit(defaultValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 默认回复删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult
+     */
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyDefaultService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 默认回复状态
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult
+     */
+    @PostMapping("/status")
+    public AjaxResult<Object> status(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyDefaultService.status(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyFollowController.java

@@ -0,0 +1,104 @@
+package com.mdd.admin.controller.channel;
+
+import com.mdd.admin.service.IChannelOaReplyFollowService;
+import com.mdd.admin.validate.channel.ChannelRpFollowsValidate;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpFollowsVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 公众号关注回复管理
+ */
+@RestController
+@RequestMapping("api/channel/oaReplyFollow")
+public class ChannelOaReplyFollowController {
+
+    @Resource
+    IChannelOaReplyFollowService iChannelOaReplyFollowService;
+
+    /**
+     * 关注回复列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @return AjaxResult<PageResult<ChannelRpFollowsVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<ChannelRpFollowsVo>> list(@Validated PageValidate pageValidate) {
+        PageResult<ChannelRpFollowsVo> list = iChannelOaReplyFollowService.list(pageValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 关注回复详情
+     *
+     * @author fzr
+     * @param id 参数
+     * @return AjaxResult<ChannelRpFollowsVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<ChannelRpFollowsVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ChannelRpFollowsVo vo = iChannelOaReplyFollowService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 关注回复新增
+     *
+     * @author fzr
+     * @param followsValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody ChannelRpFollowsValidate followsValidate) {
+        iChannelOaReplyFollowService.add(followsValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关注回复编辑
+     *
+     * @author fzr
+     * @param followsValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody ChannelRpFollowsValidate followsValidate) {
+        iChannelOaReplyFollowService.edit(followsValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关注回复删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult
+     */
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyFollowService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关注回复状态
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult
+     */
+    @PostMapping("/status")
+    public AjaxResult<Object> status(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyFollowService.status(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyKeywordController.java

@@ -0,0 +1,104 @@
+package com.mdd.admin.controller.channel;
+
+import com.mdd.admin.service.IChannelOaReplyKeywordService;
+import com.mdd.admin.validate.channel.ChannelRpKeywordValidate;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpKeywordVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 公众号关键词回复管理
+ */
+@RestController
+@RequestMapping("api/channel/oaReplyKeyword")
+public class ChannelOaReplyKeywordController {
+
+    @Resource
+    IChannelOaReplyKeywordService iChannelOaReplyKeywordService;
+
+    /**
+     * 关键词回复列表
+     *
+     * @author fzr
+     * @return AjaxResult<PageResult<ChannelRpKeywordVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<ChannelRpKeywordVo>> list(@Validated PageValidate pageValidate) {
+        PageResult<ChannelRpKeywordVo> list = iChannelOaReplyKeywordService.list(pageValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 关键词回复详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<ChannelRpKeywordVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<ChannelRpKeywordVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ChannelRpKeywordVo vo = iChannelOaReplyKeywordService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 关键词回复新增
+     *
+     * @author fzr
+     * @param keywordValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody ChannelRpKeywordValidate keywordValidate) {
+        iChannelOaReplyKeywordService.add(keywordValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关键词回复编辑
+     *
+     * @author fzr
+     * @param keywordValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody ChannelRpKeywordValidate keywordValidate) {
+        iChannelOaReplyKeywordService.edit(keywordValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关键词回复删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyKeywordService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 关键词回复状态
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/status")
+    public AjaxResult<Object> status(@Validated @RequestBody IdValidate idValidate) {
+        iChannelOaReplyKeywordService.status(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyDefaultController.java

@@ -1,99 +0,0 @@
-package com.mdd.admin.controller.channel;
-
-import com.mdd.admin.service.channel.IChannelOaReplyDefaultService;
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.IDParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 公众号默认回复管理
- */
-@RestController
-@RequestMapping("api/channel/oaReplyDefault")
-public class OaReplyDefaultController {
-
-    @Resource
-    IChannelOaReplyDefaultService iChannelOaReplyDefaultService;
-
-    /**
-     * 默认回复列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam) {
-        PageResult<ChannelOaReplyVo> list = iChannelOaReplyDefaultService.list(pageParam);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 默认回复详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ChannelOaReplyVo vo = iChannelOaReplyDefaultService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 默认回复新增
-     *
-     * @author fzr
-     * @param channelOaReplyParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = ChannelOaReplyParam.defaults.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyDefaultService.add(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 默认回复编辑
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = ChannelOaReplyParam.defaults.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyDefaultService.edit(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 默认回复删除
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/del")
-    public AjaxResult del(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyDefaultService.del(idParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 默认回复状态
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/status")
-    public AjaxResult status(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyDefaultService.status(idParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyFollowController.java

@@ -1,99 +0,0 @@
-package com.mdd.admin.controller.channel;
-
-import com.mdd.admin.service.channel.IChannelOaReplyFollowService;
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.IDParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 公众号关注回复管理
- */
-@RestController
-@RequestMapping("api/channel/oaReplyFollow")
-public class OaReplyFollowController {
-
-    @Resource
-    IChannelOaReplyFollowService iChannelOaReplyFollowService;
-
-    /**
-     * 关注回复列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam) {
-        PageResult<ChannelOaReplyVo> list = iChannelOaReplyFollowService.list(pageParam);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 关注回复详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ChannelOaReplyVo vo = iChannelOaReplyFollowService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 关注回复新增
-     *
-     * @author fzr
-     * @param channelOaReplyParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = ChannelOaReplyParam.follow.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyFollowService.add(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关注回复编辑
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = ChannelOaReplyParam.follow.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyFollowService.edit(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关注回复删除
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/del")
-    public AjaxResult del(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyFollowService.del(idParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关注回复状态
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/status")
-    public AjaxResult status(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyFollowService.status(idParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyKeywordController.java

@@ -1,100 +0,0 @@
-package com.mdd.admin.controller.channel;
-
-import com.mdd.admin.service.channel.IChannelOaReplyKeywordService;
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.IDParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 公众号关键词回复管理
- */
-@RestController
-@RequestMapping("api/channel/oaReplyKeyword")
-public class OaReplyKeywordController {
-
-    @Resource
-    IChannelOaReplyKeywordService iChannelOaReplyKeywordService;
-
-    /**
-     * 关键词回复列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam) {
-        PageResult<ChannelOaReplyVo> list = iChannelOaReplyKeywordService.list(pageParam);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 关键词回复详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ChannelOaReplyVo vo = iChannelOaReplyKeywordService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 关键词回复新增
-     *
-     * @author fzr
-     * @param channelOaReplyParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = ChannelOaReplyParam.keywords.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyKeywordService.add(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关键词回复编辑
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = ChannelOaReplyParam.keywords.class) @RequestBody ChannelOaReplyParam channelOaReplyParam) {
-        iChannelOaReplyKeywordService.edit(channelOaReplyParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关键词回复删除
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/del")
-    public AjaxResult del(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyKeywordService.del(idParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 关键词回复状态
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/status")
-    public AjaxResult status(@Validated @RequestBody IDParam idParam) {
-        iChannelOaReplyKeywordService.status(idParam.getId());
-        return AjaxResult.success();
-    }
-
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/channel/WxController.java

@@ -1,49 +0,0 @@
-package com.mdd.admin.controller.channel;
-
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.channel.IChannelWxService;
-import com.mdd.admin.validate.channel.ChannelWxParam;
-import com.mdd.admin.vo.channel.ChannelWxVo;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 微信开发平台渠道设置
- */
-@RestController
-@RequestMapping("api/channel/wx")
-public class WxController {
-
-    @Resource
-    IChannelWxService iChannelWxService;
-
-    /**
-     * 开放平台渠道设置详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        ChannelWxVo vo = iChannelWxService.detail();
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 开放平台渠道设置保存
-     *
-     * @author fzr
-     * @param channelWxParam 参数
-     * @return AjaxResult
-     */
-    @Log(title = "开放平台渠道设置保存")
-    @PostMapping("/save")
-    public AjaxResult save(@Validated @RequestBody ChannelWxParam channelWxParam) {
-        iChannelWxService.save(channelWxParam);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/common/AlbumController.java

@@ -1,149 +0,0 @@
-package com.mdd.admin.controller.common;
-
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.common.IAlbumService;
-import com.mdd.admin.validate.common.AlbumParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.album.AlbumVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.utils.ArrayUtil;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 相册管理
- */
-@RestController
-@RequestMapping("api/common/album")
-public class AlbumController {
-
-    @Resource
-    IAlbumService iAlbumService;
-
-    /**
-     * 相册文件列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/albumList")
-    public AjaxResult albumList(@Validated PageParam pageParam,
-                            @RequestParam Map<String, String> params) {
-        PageResult<AlbumVo> voPageResult = iAlbumService.albumList(pageParam, params);
-        return AjaxResult.success(voPageResult);
-    }
-
-    /**
-     * 相册文件重命名
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "相册文件重命名")
-    @PostMapping("/albumRename")
-    public AjaxResult albumRename(@Validated(value = AlbumParam.rename.class) @RequestBody AlbumParam albumParam) {
-        iAlbumService.albumRename(albumParam.getId(), albumParam.getName());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 相册文件移动
-     *
-     * @author fzr
-     * @return Object
-     */
-    @Log(title = "相册文件移动")
-    @PostMapping("/albumMove")
-    public AjaxResult albumMove(@RequestBody Map<String, Object> params) {
-        if (params.get("ids") == null) {
-            return AjaxResult.failed("缺少ids参数");
-        }
-
-        if (params.get("cid") == null) {
-            return AjaxResult.failed("缺少cid参数");
-        }
-
-        List<Integer> ids = ArrayUtil.objectToListAsInt(params.get("ids"));
-        if (ids.size() <= 0) {
-            return AjaxResult.failed("请至少选择一个文件");
-        }
-
-        iAlbumService.albumMove(ids, Integer.parseInt(params.get("cid").toString()));
-        return AjaxResult.success();
-    }
-
-    /**
-     * 相册文件删除
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "相册文件删除")
-    @PostMapping("/albumDel")
-    public AjaxResult albumDel(@RequestBody Map<String, List<Integer>> params) {
-        if (params.get("ids") == null) {
-            return AjaxResult.failed("缺少ids参数");
-        }
-
-        iAlbumService.albumDel(params.get("ids"));
-        return AjaxResult.success();
-    }
-
-    /**
-     * 相册分类列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/cateList")
-    public AjaxResult cateList(@RequestParam Map<String, String> params) {
-        JSONArray jsonArray = iAlbumService.cateList(params);
-        return AjaxResult.success(jsonArray);
-    }
-
-    /**
-     * 相册分类新增
-     *
-     * @author fzr
-     * @return Object
-     */
-    @Log(title = "相册分类新增")
-    @PostMapping("/cateAdd")
-    public AjaxResult cateAdd(@Validated(value = AlbumParam.cateAdd.class) @RequestBody AlbumParam albumParam) {
-        iAlbumService.cateAdd(albumParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 相册分类重命名
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "相册分类重命名")
-    @PostMapping("/cateRename")
-    public AjaxResult cateRename(@Validated(value = AlbumParam.rename.class) @RequestBody AlbumParam albumParam) {
-        iAlbumService.cateRename(albumParam.getId(), albumParam.getName());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 相册分类删除
-     *
-     * @author fzr
-     * @return Object
-     */
-    @Log(title = "相册分类删除")
-    @PostMapping("/cateDel")
-    public AjaxResult cateDel(@Validated(value = AlbumParam.delete.class) @RequestBody AlbumParam albumParam) {
-        iAlbumService.cateDel(albumParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java

@@ -1,6 +1,6 @@
 package com.mdd.admin.controller.decorate;
 
-import com.mdd.admin.service.decorate.IDecorateDataService;
+import com.mdd.admin.service.IDecorateDataService;
 import com.mdd.admin.vo.decorate.DecorateDataArticleVo;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,9 +14,9 @@ import java.util.List;
 /**
  * 装修数据管理
  */
-@RestController("decorateDataController")
+@RestController
 @RequestMapping("api/decorate/data")
-public class DataController {
+public class DecorateDataController {
 
     @Resource
     IDecorateDataService iDecorateDataService;
@@ -26,10 +26,10 @@ public class DataController {
      *
      * @author fzr
      * @param limit 条数
-     * @return AjaxResult
+     * @return AjaxResult<List<DecorateDataArticleVo>>
      */
     @GetMapping("/article")
-    public AjaxResult article(@RequestParam(defaultValue = "10") Integer limit) {
+    public AjaxResult<List<DecorateDataArticleVo>> article(@RequestParam(defaultValue = "10") Integer limit) {
         List<DecorateDataArticleVo> list = iDecorateDataService.article(limit);
         return AjaxResult.success(list);
     }

server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java

@@ -1,8 +1,8 @@
 package com.mdd.admin.controller.decorate;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.decorate.IDecoratePageService;
-import com.mdd.admin.validate.decorate.DecoratePageParam;
+import com.mdd.admin.service.IDecoratePageService;
+import com.mdd.admin.validate.DecoratePageValidate;
 import com.mdd.admin.vo.decorate.DecoratePageVo;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.validator.annotation.IDMust;
@@ -10,14 +10,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 /**
  * 页面装修管理
  */
-@RestController("decoratePagesController")
+@RestController
 @RequestMapping("api/decorate/pages")
-public class PagesController {
+public class DecoratePagesController {
 
     @Resource
     IDecoratePageService iDecoratePageService;
@@ -27,10 +26,10 @@ public class PagesController {
      *
      * @author fzr
      * @param id 主键
-     * @return AjaxResult
+     * @return AjaxResult<DecoratePageVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<DecoratePageVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         DecoratePageVo vo = iDecoratePageService.detail(id);
         return AjaxResult.success(vo);
     }
@@ -39,13 +38,13 @@ public class PagesController {
      * 页面装修保存
      *
      * @author fzr
-     * @param decoratePageParam 参数
-     * @return AjaxResult
+     * @param decoratePageValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "页面装修保存")
     @PostMapping("/save")
-    public AjaxResult save(@RequestBody DecoratePageParam decoratePageParam) {
-        iDecoratePageService.save(decoratePageParam);
+    public AjaxResult<Object> save(@RequestBody DecoratePageValidate decoratePageValidate) {
+        iDecoratePageService.save(decoratePageValidate);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java

@@ -1,19 +1,20 @@
 package com.mdd.admin.controller.decorate;
 
-import com.mdd.admin.service.decorate.IDecorateTabbarService;
+import com.mdd.admin.service.IDecorateTabbarService;
+import com.mdd.admin.validate.DecorateTabsValidate;
 import com.mdd.admin.vo.decorate.DecorateTabbarVo;
 import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 /**
  * 装修底部导航管理
  */
-@RestController("decorateTabbarController")
+@RestController
 @RequestMapping("api/decorate/tabbar")
-public class TabbarController {
+public class DecorateTabbarController {
 
     @Resource
     IDecorateTabbarService iDecorateTabbarService;
@@ -22,10 +23,10 @@ public class TabbarController {
      * 底部导航详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<DecorateTabbarVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail() {
+    public AjaxResult<DecorateTabbarVo> detail() {
         DecorateTabbarVo vo = iDecorateTabbarService.detail();
         return AjaxResult.success(vo);
     }
@@ -34,12 +35,12 @@ public class TabbarController {
      * 底部导航保存
      *
      * @author fzr
-     * @param params 参数
-     * @return AjaxResult
+     * @param tabsValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, Object> params) {
-        iDecorateTabbarService.save(params);
+    public AjaxResult<Object> save(@Validated @RequestBody DecorateTabsValidate tabsValidate) {
+        iDecorateTabbarService.save(tabsValidate);
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorCacheController.java

@@ -17,9 +17,9 @@ import java.util.*;
 /**
  * 缓存监控管理
  */
-@RestController(value = "monitorCacheController")
+@RestController
 @RequestMapping("api/monitor")
-public class CacheController {
+public class MonitorCacheController {
 
     @Resource
     private RedisTemplate<String, String> redisTemplate;
@@ -28,11 +28,11 @@ public class CacheController {
      * 缓存监控
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @Log(title = "缓存监控")
     @GetMapping("/cache")
-    public AjaxResult info() {
+    public AjaxResult<Object> info() {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
         Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);

server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java

@@ -7,22 +7,24 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * 服务监控管理
  */
-@RestController(value = "monitorServerController")
+@RestController
 @RequestMapping("api/monitor")
-public class ServerController {
+public class MonitorServerController {
 
     /**
      * 服务器信息
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<Map<String, Object>>
      */
     @Log(title = "服务监控")
     @GetMapping("/server")
-    public AjaxResult info() {
+    public AjaxResult<Map<String, Object>> info() {
         ServerResult server = new ServerResult();
         return AjaxResult.success(server.copyTo());
     }

server/like-admin/src/main/java/com/mdd/admin/controller/setting/CopyrightController.java

@@ -1,45 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingCopyrightService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 网站版权配置管理
- */
-@RestController("settingCopyrightController")
-@RequestMapping("api/setting/copyright")
-public class CopyrightController {
-
-    @Resource
-    ISettingCopyrightService iSettingCopyrightService;
-
-    /**
-     * 获取网站版权信息
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        List<Map<String, String>> list = iSettingCopyrightService.detail();
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 保存网站版本信息
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody List<Map<String, String>> params) {
-        iSettingCopyrightService.save(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/LoginController.java

@@ -1,42 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingLoginService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-@RestController("settingLoginController")
-@RequestMapping("api/setting/login")
-public class LoginController {
-
-    @Resource
-    ISettingLoginService iSettingLoginService;
-
-    /**
-     * 登录设置详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        Map<String, Object> map = iSettingLoginService.detail();
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 登录设置保存
-     *
-     * @author fzr
-     * @param params 参数
-     * @return Object
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, String> params) {
-        iSettingLoginService.save(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/ProtocolController.java

@@ -1,44 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingProtocolService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 政策协议配置管理
- */
-@RestController("settingProtocolController")
-@RequestMapping("api/setting/protocol")
-public class ProtocolController {
-
-    @Resource
-    ISettingProtocolService iSettingProtocolService;
-
-    /**
-     * 获取网站版权信息
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        Map<String, Map<String, String>> detail = iSettingProtocolService.detail();
-        return AjaxResult.success(detail);
-    }
-
-    /**
-     * 保存网站版本信息
-     *
-     * @author fzr
-     * @return Object
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, Object> params) {
-        iSettingProtocolService.save(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SearchController.java

@@ -1,47 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingSearchService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 热搜设置
- */
-@RestController("settingSearchController")
-@RequestMapping("api/setting/search")
-public class SearchController {
-
-    @Resource
-    ISettingSearchService iSettingSearchService;
-
-    /**
-     * 热门搜索详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        Map<String, Object> map = iSettingSearchService.detail();
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 热门搜索保存
-     *
-     * @author fzr
-     * @param params 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, Object> params) {
-        iSettingSearchService.save(params);
-        return AjaxResult.success();
-    }
-
-
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingCopyrightController.java

@@ -0,0 +1,48 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingCopyrightService;
+import com.mdd.admin.validate.setting.SettingCopyrightValidate;
+import com.mdd.admin.vo.setting.SettingCopyrightVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 网站版权配置管理
+ */
+@RestController
+@RequestMapping("api/setting/copyright")
+public class SettingCopyrightController {
+
+    @Resource
+    ISettingCopyrightService iSettingCopyrightService;
+
+    /**
+     * 获取网站版权信息
+     *
+     * @author fzr
+     * @return AjaxResult<List<SettingCopyrightVo>>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<List<SettingCopyrightVo>> detail() {
+        List<SettingCopyrightVo> list = iSettingCopyrightService.detail();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 保存网站版本信息
+     *
+     * @author fzr
+     * @param copyrightValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingCopyrightValidate copyrightValidate) {
+        iSettingCopyrightService.save(copyrightValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java

@@ -1,9 +1,11 @@
 package com.mdd.admin.controller.setting;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.mdd.admin.service.setting.ISettingDictDataService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.setting.DictDataParam;
+import com.mdd.admin.service.ISettingDictDataService;
+import com.mdd.admin.validate.commons.IdsValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.setting.DictDataCreateValidate;
+import com.mdd.admin.validate.setting.DictDataUpdateValidate;
 import com.mdd.admin.vo.setting.SettingDictDataVo;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.core.PageResult;
@@ -19,9 +21,9 @@ import java.util.Map;
 /**
  * 字典数据配置管理
  */
-@RestController("settingDictDataController")
+@RestController
 @RequestMapping("api/setting/dict/data")
-public class DictDataController {
+public class SettingDictDataController {
 
     @Resource
     ISettingDictDataService iSettingDictDataService;
@@ -30,10 +32,11 @@ public class DictDataController {
      * 字典数据所有
      *
      * @author fzr
-     * @return Object
+     * @param params 参数
+     * @return jaxResult<List<SettingDictDataVo>>
      */
     @GetMapping("/all")
-    public AjaxResult all(@RequestParam Map<String, String> params) {
+    public AjaxResult<List<SettingDictDataVo>> all(@RequestParam Map<String, String> params) {
         Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
         List<SettingDictDataVo> list = iSettingDictDataService.all(params);
         return AjaxResult.success(list);
@@ -43,15 +46,15 @@ public class DictDataController {
      * 字典数据列表
      *
      * @author fzr
-     * @param pageParam 分页参数
+     * @param pageValidate 分页参数
      * @param params 搜索参数
-     * @return AjaxResult
+     * @return PageResult<SettingDictDataVo>
      */
     @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                       @RequestParam Map<String, String> params) {
+    public AjaxResult<PageResult<SettingDictDataVo>> list(@Validated PageValidate pageValidate,
+                                                          @RequestParam Map<String, String> params) {
         Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
-        PageResult<SettingDictDataVo> list = iSettingDictDataService.list(pageParam, params);
+        PageResult<SettingDictDataVo> list = iSettingDictDataService.list(pageValidate, params);
         return AjaxResult.success(list);
     }
 
@@ -60,10 +63,10 @@ public class DictDataController {
      *
      * @author fzr
      * @param id 主键
-     * @return Object
+     * @return AjaxResult<SettingDictDataVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<SettingDictDataVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         SettingDictDataVo vo = iSettingDictDataService.detail(id);
         return AjaxResult.success(vo);
     }
@@ -72,12 +75,12 @@ public class DictDataController {
      * 字典数据新增
      *
      * @author fzr
-     * @param dictDataParam 参数
-     * @return AjaxResult
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/add")
-    public AjaxResult add(@Validated(value = DictDataParam.create.class) @RequestBody DictDataParam dictDataParam) {
-        iSettingDictDataService.add(dictDataParam);
+    public AjaxResult<Object> add(@Validated @RequestBody DictDataCreateValidate createValidate) {
+        iSettingDictDataService.add(createValidate);
         return AjaxResult.success();
     }
 
@@ -85,12 +88,12 @@ public class DictDataController {
      * 字典数据编辑
      *
      * @author fzr
-     * @param dictDataParam 参数
-     * @return AjaxResult
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/edit")
-    public Object edit(@Validated(value = DictDataParam.update.class) @RequestBody DictDataParam dictDataParam) {
-        iSettingDictDataService.edit(dictDataParam);
+    public AjaxResult<Object> edit(@Validated @RequestBody DictDataUpdateValidate updateValidate) {
+        iSettingDictDataService.edit(updateValidate);
         return AjaxResult.success();
     }
 
@@ -98,12 +101,12 @@ public class DictDataController {
      * 字典数据删除
      *
      * @author fzr
-     * @param dictDataParam 参数
-     * @return AjaxResult
+     * @param idsValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/del")
-    public AjaxResult del(@Validated(value = DictDataParam.delete.class) @RequestBody DictDataParam dictDataParam) {
-        iSettingDictDataService.del(dictDataParam.getIds());
+    public AjaxResult<Object> del(@Validated @RequestBody IdsValidate idsValidate) {
+        iSettingDictDataService.del(idsValidate.getIds());
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java

@@ -1,8 +1,10 @@
 package com.mdd.admin.controller.setting;
 
-import com.mdd.admin.service.setting.ISettingDictTypeService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.setting.DictTypeParam;
+import com.mdd.admin.service.ISettingDictTypeService;
+import com.mdd.admin.validate.commons.IdsValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.setting.DictTypeCreateValidate;
+import com.mdd.admin.validate.setting.DictTypeUpdateValidate;
 import com.mdd.admin.vo.setting.SettingDictTypeVo;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.core.PageResult;
@@ -17,9 +19,9 @@ import java.util.Map;
 /**
  * 字典类型配置管理
  */
-@RestController("settingDictTypeController")
+@RestController
 @RequestMapping("api/setting/dict/type")
-public class DictTypeController {
+public class SettingDictTypeController {
 
     @Resource
     ISettingDictTypeService iSettingDictTypeService;
@@ -28,10 +30,10 @@ public class DictTypeController {
      * 字典类型所有
      *
      * @author fzr
-     * @return Object
+     * @return AjaxResult<List<SettingDictTypeVo>>
      */
     @GetMapping("/all")
-    public AjaxResult all() {
+    public AjaxResult<List<SettingDictTypeVo>> all() {
         List<SettingDictTypeVo> list = iSettingDictTypeService.all();
         return AjaxResult.success(list);
     }
@@ -40,14 +42,14 @@ public class DictTypeController {
      * 字典类型列表
      *
      * @author fzr
-     * @param pageParam 分页参数
+     * @param pageValidate 分页参数
      * @param params 搜索参数
-     * @return Object
+     * @return AjaxResult<PageResult<SettingDictTypeVo>>
      */
     @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
+    public AjaxResult<PageResult<SettingDictTypeVo>> list(@Validated PageValidate pageValidate,
                        @RequestParam Map<String, String> params) {
-        PageResult<SettingDictTypeVo> list = iSettingDictTypeService.list(pageParam, params);
+        PageResult<SettingDictTypeVo> list = iSettingDictTypeService.list(pageValidate, params);
         return AjaxResult.success(list);
     }
 
@@ -56,10 +58,10 @@ public class DictTypeController {
      *
      * @author fzr
      * @param id 主键
-     * @return Object
+     * @return AjaxResult<SettingDictTypeVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<SettingDictTypeVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         SettingDictTypeVo vo = iSettingDictTypeService.detail(id);
         return AjaxResult.success(vo);
     }
@@ -68,12 +70,12 @@ public class DictTypeController {
      * 字典类型新增
      *
      * @author fzr
-     * @param dictTypeParam 参数
-     * @return Object
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/add")
-    public AjaxResult add(@Validated(value = DictTypeParam.create.class) @RequestBody DictTypeParam dictTypeParam) {
-        iSettingDictTypeService.add(dictTypeParam);
+    public AjaxResult<Object> add(@Validated @RequestBody DictTypeCreateValidate createValidate) {
+        iSettingDictTypeService.add(createValidate);
         return AjaxResult.success();
     }
 
@@ -81,12 +83,12 @@ public class DictTypeController {
      * 字典类型编辑
      *
      * @author fzr
-     * @param dictTypeParam 参数
-     * @return Object
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = DictTypeParam.update.class) @RequestBody DictTypeParam dictTypeParam) {
-        iSettingDictTypeService.edit(dictTypeParam);
+    public AjaxResult<Object> edit(@Validated @RequestBody DictTypeUpdateValidate updateValidate) {
+        iSettingDictTypeService.edit(updateValidate);
         return AjaxResult.success();
     }
 
@@ -94,12 +96,12 @@ public class DictTypeController {
      * 字典类型删除
      *
      * @author fzr
-     * @param dictTypeParam 参数
-     * @return Object
+     * @param idsValidate 参数
+     * @return AjaxResult<Object>
      */
     @PostMapping("/del")
-    public AjaxResult del(@Validated(value = DictTypeParam.delete.class) @RequestBody DictTypeParam dictTypeParam) {
-        iSettingDictTypeService.del(dictTypeParam.getIds());
+    public AjaxResult<Object> del(@Validated @RequestBody IdsValidate idsValidate) {
+        iSettingDictTypeService.del(idsValidate.getIds());
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java

@@ -0,0 +1,45 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingLoginService;
+import com.mdd.admin.validate.setting.SettingLoginValidate;
+import com.mdd.admin.vo.setting.SettingLoginVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@RestController
+@RequestMapping("api/setting/login")
+public class SettingLoginController {
+
+    @Resource
+    ISettingLoginService iSettingLoginService;
+
+    /**
+     * 登录设置详情
+     *
+     * @author fzr
+     * @return AjaxResult<SettingLoginVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SettingLoginVo> detail() {
+        SettingLoginVo vo = iSettingLoginService.detail();
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 登录设置保存
+     *
+     * @author fzr
+     * @param loginValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingLoginValidate loginValidate) {
+        iSettingLoginService.save(loginValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java

@@ -1,8 +1,8 @@
 package com.mdd.admin.controller.setting;
 
-import com.mdd.admin.service.setting.ISettingNoticeService;
+import com.mdd.admin.service.ISettingNoticeService;
 import com.mdd.admin.vo.setting.SettingNoticeDetailVo;
-import com.mdd.admin.vo.setting.SettingNoticeListVo;
+import com.mdd.admin.vo.setting.SettingNoticeListedVo;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.validator.annotation.IDMust;
 import org.springframework.validation.annotation.Validated;
@@ -15,9 +15,9 @@ import java.util.Map;
 /**
  * 通知设置管理
  */
-@RestController("settingNoticeController")
+@RestController
 @RequestMapping("api/setting/notice")
-public class NoticeController {
+public class SettingNoticeController {
 
     @Resource
     ISettingNoticeService iSettingNoticeService;
@@ -27,11 +27,11 @@ public class NoticeController {
      *
      * @author fzr
      * @param recipient 类型: 1=用户, 2=平台
-     * @return AjaxResult
+     * @return AjaxResult<List<SettingNoticeListVo>>
      */
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam Integer recipient) {
-        List<SettingNoticeListVo> list = iSettingNoticeService.list(recipient);
+    public AjaxResult<List<SettingNoticeListedVo>> list(@RequestParam Integer recipient) {
+        List<SettingNoticeListedVo> list = iSettingNoticeService.list(recipient);
         return AjaxResult.success(list);
     }
 
@@ -40,10 +40,10 @@ public class NoticeController {
      *
      * @author fzr
      * @param id 主键
-     * @return AjaxResult
+     * @return AjaxResult<SettingNoticeDetailVo>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<SettingNoticeDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         SettingNoticeDetailVo vo = iSettingNoticeService.detail(id);
         return AjaxResult.success(vo);
     }
@@ -53,10 +53,10 @@ public class NoticeController {
      *
      * @author fzr
      * @param params 参数
-     * @return Object
+     * @return AjaxResult<Object>
      */
     @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, Object> params) {
+    public AjaxResult<Object> save(@RequestBody Map<String, Object> params) {
         iSettingNoticeService.save(params);
         return AjaxResult.success();
     }

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingProtocolController.java

@@ -0,0 +1,47 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingProtocolService;
+import com.mdd.admin.validate.setting.SettingProtocolValidate;
+import com.mdd.admin.vo.setting.SettingProtocolDetailVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 政策协议配置管理
+ */
+@RestController
+@RequestMapping("api/setting/protocol")
+public class SettingProtocolController {
+
+    @Resource
+    ISettingProtocolService iSettingProtocolService;
+
+    /**
+     * 获取政策协议信息
+     *
+     * @author fzr
+     * @return AjaxResult<SettingProtocolDetailVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SettingProtocolDetailVo> detail() {
+        SettingProtocolDetailVo detail = iSettingProtocolService.detail();
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 保存政策协议信息
+     *
+     * @author fzr
+     * @param protocolValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingProtocolValidate protocolValidate) {
+        iSettingProtocolService.save(protocolValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java

@@ -0,0 +1,48 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingSearchService;
+import com.mdd.admin.validate.setting.SettingSearchValidate;
+import com.mdd.admin.vo.setting.SettingSearchDetailVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 热搜设置
+ */
+@RestController
+@RequestMapping("api/setting/search")
+public class SettingSearchController {
+
+    @Resource
+    ISettingSearchService iSettingSearchService;
+
+    /**
+     * 热门搜索详情
+     *
+     * @author fzr
+     * @return AjaxResult<SettingSearchDetailVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SettingSearchDetailVo> detail() {
+        SettingSearchDetailVo vo = iSettingSearchService.detail();
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 热门搜索保存
+     *
+     * @author fzr
+     * @param searchValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingSearchValidate searchValidate) {
+        iSettingSearchService.save(searchValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java

@@ -1,7 +1,7 @@
 package com.mdd.admin.controller.setting;
 
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.setting.ISettingSmsService;
+import com.mdd.admin.service.ISettingSmsService;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -12,9 +12,9 @@ import java.util.Map;
 /**
  * 短信设置管理
  */
-@RestController("settingSmsController")
+@RestController
 @RequestMapping("api/setting/sms")
-public class SmsController {
+public class SettingSmsController {
 
     @Resource
     ISettingSmsService iSettingSmsService;
@@ -23,10 +23,10 @@ public class SmsController {
      * 短信引擎列表
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<List<Map<String, Object>>>
      */
     @GetMapping("/list")
-    public AjaxResult list() {
+    public AjaxResult<List<Map<String, Object>>> list() {
         List<Map<String, Object>> list = iSettingSmsService.list();
         return AjaxResult.success(list);
     }
@@ -36,10 +36,10 @@ public class SmsController {
      *
      * @author fzr
      * @param alias 别名
-     * @return AjaxResult
+     * @return AjaxResult<Map<String, Object>>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(String alias) {
+    public AjaxResult<Map<String, Object>> detail(String alias) {
         Map<String, Object> map = iSettingSmsService.detail(alias);
         return AjaxResult.success(map);
     }
@@ -49,11 +49,11 @@ public class SmsController {
      *
      * @author fzr
      * @param params 参数
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @Log(title = "短信引擎保存")
     @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, String> params) {
+    public AjaxResult<Object> save(@RequestBody Map<String, String> params) {
         iSettingSmsService.save(params);
         return AjaxResult.success();
     }

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java

@@ -1,7 +1,7 @@
 package com.mdd.admin.controller.setting;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.mdd.admin.service.setting.ISettingStorageService;
+import com.mdd.admin.service.ISettingStorageService;
 import com.mdd.common.core.AjaxResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -12,9 +12,9 @@ import java.util.Map;
 /**
  * 存储方式配置管理
  */
-@RestController("settingStorageController")
+@RestController
 @RequestMapping("api/setting/storage")
-public class StorageController {
+public class SettingStorageController {
 
     @Resource
     ISettingStorageService iSettingStorageService;
@@ -23,10 +23,10 @@ public class StorageController {
      * 存储列表
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<List<Map<String, Object>>>
      */
     @GetMapping("/list")
-    public AjaxResult list() {
+    public AjaxResult<List<Map<String, Object>>> list() {
         List<Map<String, Object>> list = iSettingStorageService.list();
         return AjaxResult.success(list);
     }
@@ -35,10 +35,10 @@ public class StorageController {
      * 存储详情
      *
      * @param alias 引擎别名
-     * @return AjaxResult
+     * @return AjaxResult<Map<String, Object>>
      */
     @GetMapping("/detail")
-    public AjaxResult detail(String alias) {
+    public AjaxResult<Map<String, Object>> detail(String alias) {
         Map<String, Object> map = iSettingStorageService.detail(alias);
         return AjaxResult.success(map);
     }
@@ -48,10 +48,10 @@ public class StorageController {
      *
      * @author fzr
      * @param params 参数
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Map<String, String> params) {
+    public AjaxResult<Object> edit(@RequestBody Map<String, String> params) {
         iSettingStorageService.edit(params);
         return AjaxResult.success();
     }
@@ -61,10 +61,10 @@ public class StorageController {
      *
      * @author fzr
      * @param params 参数
-     * @return AjaxResult
+     * @return AjaxResult<Object>
      */
     @PostMapping("/change")
-    public AjaxResult change(@RequestBody Map<String, String> params) {
+    public AjaxResult<Object> change(@RequestBody Map<String, String> params) {
         Assert.notNull(params.get("alias"), "alias参数缺失");
         Assert.notNull(params.get("status"), "status参数缺失");
         String alias = params.get("alias");

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java

@@ -0,0 +1,47 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingUserService;
+import com.mdd.admin.validate.setting.SettingUserValidate;
+import com.mdd.admin.vo.setting.SettingUserVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 用户设置管理
+ */
+@RestController
+@RequestMapping("api/setting/user")
+public class SettingUserController {
+
+    @Resource
+    ISettingUserService iSettingUserService;
+
+    /**
+     * 用户设置详情
+     *
+     * @author fzr
+     * @return AjaxResult<SettingUserVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SettingUserVo> detail() {
+        SettingUserVo vo = iSettingUserService.detail();
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 用户设置保存
+     *
+     * @author fzr
+     * @param userValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingUserValidate userValidate) {
+        iSettingUserService.save(userValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java

@@ -0,0 +1,48 @@
+package com.mdd.admin.controller.setting;
+
+import com.mdd.admin.service.ISettingWebsiteService;
+import com.mdd.admin.validate.setting.SettingWebsiteValidate;
+import com.mdd.admin.vo.setting.SettingWebsiteVo;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 网站信息配置管理
+ */
+@RestController
+@RequestMapping("api/setting/website")
+public class SettingWebsiteController {
+
+    @Resource
+    ISettingWebsiteService iSettingWebsiteService;
+
+    /**
+     * 获取网站配置信息
+     *
+     * @author fzr
+     * @return AjaxResult<SettingWebsiteVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SettingWebsiteVo> detail() {
+        SettingWebsiteVo detail = iSettingWebsiteService.detail();
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 保存网站配置信息
+     *
+     * @author fzr
+     * @param websiteValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/save")
+    public AjaxResult<Object> save(@Validated @RequestBody SettingWebsiteValidate websiteValidate) {
+        iSettingWebsiteService.save(websiteValidate);
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/UserController.java

@@ -1,45 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingUserService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 用户设置管理
- */
-@RestController("settingUserController")
-@RequestMapping("api/setting/user")
-public class UserController {
-
-    @Resource
-    ISettingUserService iSettingUserService;
-
-    /**
-     * 用户设置详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public Object detail() {
-        Map<String, Object> map = iSettingUserService.detail();
-        return AjaxResult.success(map);
-    }
-
-    /**
-     * 用户设置保存
-     *
-     * @author fzr
-     * @param params 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, String> params) {
-        iSettingUserService.save(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/setting/WebsiteController.java

@@ -1,45 +0,0 @@
-package com.mdd.admin.controller.setting;
-
-import com.mdd.admin.service.setting.ISettingWebsiteService;
-import com.mdd.common.core.AjaxResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 网站信息配置管理
- */
-@RestController("settingWebsiteController")
-@RequestMapping("api/setting/website")
-public class WebsiteController {
-
-    @Resource
-    ISettingWebsiteService iSettingWebsiteService;
-
-    /**
-     * 获取网站配置信息
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail() {
-        Map<String, String> detail = iSettingWebsiteService.detail();
-        return AjaxResult.success(detail);
-    }
-
-    /**
-     * 保存网站配置信息
-     *
-     * @author fzr
-     * @param params 参数
-     * @return Object
-     */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody Map<String, String> params) {
-        iSettingWebsiteService.save(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java

@@ -1,136 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.mdd.admin.LikeAdminThreadLocal;
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.system.ISystemAuthAdminService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.system.SystemAuthAdminParam;
-import com.mdd.admin.vo.system.SystemAuthAdminVo;
-import com.mdd.admin.vo.system.SystemAuthSelfVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 系统管理员管理
- */
-@RestController
-@RequestMapping("api/system/admin")
-public class AuthAdminController {
-
-    @Resource
-    ISystemAuthAdminService iSystemAuthAdminService;
-
-    /**
-     * 管理员列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                        @RequestParam Map<String, String> params) {
-        PageResult<SystemAuthAdminVo> list = iSystemAuthAdminService.list(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 管理员信息
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/self")
-    public AjaxResult self() {
-        Integer adminId = LikeAdminThreadLocal.getAdminId();
-        SystemAuthSelfVo vo = iSystemAuthAdminService.self(adminId);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 管理员详情
-     *
-     * @author fzr
-     * @param id 主键ID
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        SystemAuthAdminVo vo = iSystemAuthAdminService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 管理员新增
-     *
-     * @author fzr
-     * @param systemAuthAdminParam 参数
-     * @return AjaxResult
-     */
-    @Log(title = "管理员新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = SystemAuthAdminParam.create.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
-        iSystemAuthAdminService.add(systemAuthAdminParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 管理员编辑
-     *
-     * @author fzr
-     * @param systemAuthAdminParam 参数
-     * @return AjaxResult
-     */
-    @Log(title = "管理员编辑")
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = SystemAuthAdminParam.update.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
-        iSystemAuthAdminService.edit(systemAuthAdminParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 当前管理员更新
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "管理员更新")
-    @PostMapping("/upInfo")
-    public AjaxResult upInfo(@Validated(value = SystemAuthAdminParam.upInfo.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
-        Integer adminId = LikeAdminThreadLocal.getAdminId();
-        iSystemAuthAdminService.upInfo(systemAuthAdminParam, adminId);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 管理员删除
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "管理员删除")
-    @PostMapping("/del")
-    public AjaxResult del(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
-        iSystemAuthAdminService.del(systemAuthAdminParam.getId());
-        return AjaxResult.success();
-    }
-
-    /**
-     * 管理员状态切换
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "管理员状态切换")
-    @PostMapping("/disable")
-    public AjaxResult disable(@Validated(value = SystemAuthAdminParam.delete.class) @RequestBody SystemAuthAdminParam systemAuthAdminParam) {
-        iSystemAuthAdminService.disable(systemAuthAdminParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthDeptController.java

@@ -1,102 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.service.system.ISystemAuthDeptService;
-import com.mdd.admin.validate.system.SystemAuthDeptParam;
-import com.mdd.admin.vo.system.SystemAuthDeptVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 系统部门管理
- */
-@RestController
-@RequestMapping("api/system/dept")
-public class AuthDeptController {
-
-    @Resource
-    ISystemAuthDeptService iSystemAuthDeptService;
-
-    /**
-     * 部门所有
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/all")
-    public AjaxResult all() {
-        List<SystemAuthDeptVo> vos = iSystemAuthDeptService.all();
-        return AjaxResult.success(vos);
-    }
-
-    /**
-     * 部门列表
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@RequestParam Map<String, String> params) {
-        JSONArray list = iSystemAuthDeptService.list(params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 部门详情
-     *
-     * @author fzr
-     * @param id 主键
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 部门新增
-     *
-     * @author fzr
-     * @param systemAuthDeptParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = SystemAuthDeptParam.create.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
-        iSystemAuthDeptService.add(systemAuthDeptParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 部门编辑
-     *
-     * @author fzr
-     * @param systemAuthDeptParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = SystemAuthDeptParam.update.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
-        iSystemAuthDeptService.edit(systemAuthDeptParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 部门删除
-     *
-     * @author fzr
-     * @param systemAuthDeptParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/del")
-    public AjaxResult del(@Validated(value = SystemAuthDeptParam.delete.class) @RequestBody SystemAuthDeptParam systemAuthDeptParam) {
-        iSystemAuthDeptService.del(systemAuthDeptParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthPostController.java

@@ -1,104 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.mdd.admin.service.system.ISystemAuthPostService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.system.SystemAuthPostParam;
-import com.mdd.admin.vo.system.SystemAuthPostVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 系统岗位管理
- */
-@RestController
-@RequestMapping("api/system/post")
-public class AuthPostController {
-
-    @Resource
-    ISystemAuthPostService iSystemAuthPostService;
-
-    /**
-     * 岗位所有
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/all")
-    public AjaxResult all() {
-        List<SystemAuthPostVo> vos = iSystemAuthPostService.all();
-        return AjaxResult.success(vos);
-    }
-
-    /**
-     * 岗位列表
-     * @param pageParam 分页参数
-     * @param params 搜索参数
-     * @return Object
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                       @RequestParam Map<String, String> params) {
-        PageResult<SystemAuthPostVo> list = iSystemAuthPostService.list(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 岗位详情
-     *
-     * @author fzr
-     * @param id 主键
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        SystemAuthPostVo vo = iSystemAuthPostService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 岗位新增
-     *
-     * @author fzr
-     * @param systemAuthPostParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = SystemAuthPostParam.create.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
-        iSystemAuthPostService.add(systemAuthPostParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 岗位编辑
-     *
-     * @author fzr
-     * @param systemAuthPostParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = SystemAuthPostParam.update.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
-        iSystemAuthPostService.edit(systemAuthPostParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 岗位删除
-     *
-     * @author fzr
-     * @param systemAuthPostParam 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/del")
-    public AjaxResult del(@Validated(value = SystemAuthPostParam.delete.class) @RequestBody SystemAuthPostParam systemAuthPostParam) {
-        iSystemAuthPostService.del(systemAuthPostParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthRoleController.java

@@ -1,109 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.system.ISystemAuthRoleService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.system.SystemAuthRoleParam;
-import com.mdd.admin.vo.system.SystemAuthRoleVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 系统角色管理
- */
-@RestController
-@RequestMapping("api/system/role")
-public class AuthRoleController {
-
-    @Resource
-    ISystemAuthRoleService iSystemAuthRoleService;
-
-    /**
-     * 角色所有
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @GetMapping("/all")
-    public AjaxResult all() {
-        List<Map<String, Object>> list = iSystemAuthRoleService.all();
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 角色列表
-     *
-     * @author fzr
-     * @param pageParam 分页参数
-     * @return AjaxResult
-     */
-    @Log(title = "角色列表")
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam) {
-        PageResult<SystemAuthRoleVo> lists = iSystemAuthRoleService.list(pageParam);
-        return AjaxResult.success(lists);
-    }
-
-    /**
-     * 角色详情
-     *
-     * @author fzr
-     * @return AjaxResult
-     */
-    @Log(title = "角色详情")
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        SystemAuthRoleVo vo = iSystemAuthRoleService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 新增角色
-     *
-     * @author fzr
-     * @param systemAuthRoleParam 角色参数
-     * @return AjaxResult
-     */
-    @Log(title = "角色新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
-        iSystemAuthRoleService.add(systemAuthRoleParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 编辑角色
-     *
-     * @author fzr
-     * @param systemAuthRoleParam 角色参数
-     * @return AjaxResult
-     */
-    @Log(title = "角色编辑")
-    @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = SystemAuthRoleParam.create.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
-        iSystemAuthRoleService.edit(systemAuthRoleParam);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 删除角色
-     *
-     * @author fzr
-     * @param systemAuthRoleParam 角色参数
-     * @return AjaxResult
-     */
-    @Log(title = "角色删除")
-    @PostMapping("/del")
-    public AjaxResult del(@Validated(value = SystemAuthRoleParam.delete.class) @RequestBody SystemAuthRoleParam systemAuthRoleParam) {
-        iSystemAuthRoleService.del(systemAuthRoleParam.getId());
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/LoginController.java

@@ -1,64 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.mdd.admin.service.system.ISystemLoginService;
-import com.mdd.admin.validate.system.SystemLoginParam;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.exception.LoginException;
-import com.mdd.common.exception.OperateException;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
-/**
- * 系统登录管理
- */
-@RestController("systemLoginController")
-@RequestMapping("api/system")
-public class LoginController {
-
-    @Resource
-    ISystemLoginService iSystemLoginService;
-
-    /**
-     * 登录系统
-     *
-     * @author fzr
-     * @param systemLoginParam 登录参数
-     * @return AjaxResult
-     */
-    @PostMapping("/login")
-    public AjaxResult login(@Validated() @RequestBody SystemLoginParam systemLoginParam) {
-        try {
-            Map<String, Object> map = iSystemLoginService.login(systemLoginParam);
-            return AjaxResult.success(map);
-        } catch (LoginException e) {
-            return AjaxResult.failed(e.getCode(), e.getMsg());
-        } catch (OperateException e) {
-            return AjaxResult.failed(e.getMsg());
-        }
-    }
-
-    /**
-     * 退出登录
-     *
-     * @author fzr
-     * @param request 请求接口
-     * @return AjaxResult
-     */
-    @PostMapping("/logout")
-    public AjaxResult logout(HttpServletRequest request) {
-        try {
-            iSystemLoginService.logout(request.getHeader("token"));
-            return AjaxResult.success();
-        } catch (Exception e) {
-            return AjaxResult.failed(e.getMessage());
-        }
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/LogsController.java

@@ -1,54 +0,0 @@
-package com.mdd.admin.controller.system;
-
-import com.mdd.admin.service.system.ISystemLogsServer;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.system.LogLoginVo;
-import com.mdd.admin.vo.system.LogOperateVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 系统日志管理
- */
-@RestController("systemLogController")
-@RequestMapping("api/system/log")
-public class LogsController {
-
-    @Resource
-    ISystemLogsServer iSystemLogsServer;
-
-    /**
-     * 系统操作日志
-     *
-     * @author fzr
-     * @param params 搜索参数
-     * @return AjaxResult
-     */
-    @GetMapping("/operate")
-    public AjaxResult operate(@Validated PageParam pageParam, @RequestParam Map<String, String> params) {
-        PageResult<LogOperateVo> list = iSystemLogsServer.operate(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 系统登录日志
-     *
-     * @author fzr
-     * @param params 搜索参数
-     * @return AjaxResult
-     */
-    @GetMapping("/login")
-    public AjaxResult login(@Validated PageParam pageParam, @RequestParam Map<String, String> params) {
-        PageResult<LogLoginVo> list = iSystemLogsServer.login(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java

@@ -0,0 +1,142 @@
+package com.mdd.admin.controller.system;
+
+import com.mdd.admin.LikeAdminThreadLocal;
+import com.mdd.admin.config.aop.Log;
+import com.mdd.admin.service.ISystemAuthAdminService;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemAdminCreateValidate;
+import com.mdd.admin.validate.system.SystemAdminSearchValidate;
+import com.mdd.admin.validate.system.SystemAdminUpInfoValidate;
+import com.mdd.admin.validate.system.SystemAdminUpdateValidate;
+import com.mdd.admin.vo.system.SystemAuthAdminDetailVo;
+import com.mdd.admin.vo.system.SystemAuthAdminListedVo;
+import com.mdd.admin.vo.system.SystemAuthAdminSelvesVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 系统管理员管理
+ */
+@RestController
+@RequestMapping("api/system/admin")
+public class SystemAuthAdminController {
+
+    @Resource
+    ISystemAuthAdminService iSystemAuthAdminService;
+
+    /**
+     * 管理员列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<SystemAuthAdminListedVo>>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<SystemAuthAdminListedVo>> list(@Validated PageValidate pageValidate,
+                                                                @Validated SystemAdminSearchValidate searchValidate) {
+        PageResult<SystemAuthAdminListedVo> list = iSystemAuthAdminService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 管理员信息
+     *
+     * @author fzr
+     * @return AjaxResult<SystemAuthSelfVo>
+     */
+    @GetMapping("/self")
+    public AjaxResult<SystemAuthAdminSelvesVo> self() {
+        Integer adminId = LikeAdminThreadLocal.getAdminId();
+        SystemAuthAdminSelvesVo vo = iSystemAuthAdminService.self(adminId);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 管理员详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<SystemAuthAdminDetailVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SystemAuthAdminDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        SystemAuthAdminDetailVo vo = iSystemAuthAdminService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 管理员新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "管理员新增")
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody SystemAdminCreateValidate createValidate) {
+        iSystemAuthAdminService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 管理员编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "管理员编辑")
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody SystemAdminUpdateValidate updateValidate) {
+        iSystemAuthAdminService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 当前管理员更新
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "管理员更新")
+    @PostMapping("/upInfo")
+    public AjaxResult<Object> upInfo(@Validated @RequestBody SystemAdminUpInfoValidate upInfoValidate) {
+        Integer adminId = LikeAdminThreadLocal.getAdminId();
+        iSystemAuthAdminService.upInfo(upInfoValidate, adminId);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 管理员删除
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "管理员删除")
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthAdminService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 管理员状态切换
+     *
+     * @author fzr
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "管理员状态")
+    @PostMapping("/disable")
+    public AjaxResult<Object> disable(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthAdminService.disable(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthDeptController.java

@@ -0,0 +1,105 @@
+package com.mdd.admin.controller.system;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.service.ISystemAuthDeptService;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.system.SystemDeptCreateValidate;
+import com.mdd.admin.validate.system.SystemDeptSearchValidate;
+import com.mdd.admin.validate.system.SystemDeptUpdateValidate;
+import com.mdd.admin.vo.system.SystemAuthDeptVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 系统部门管理
+ */
+@RestController
+@RequestMapping("api/system/dept")
+public class SystemAuthDeptController {
+
+    @Resource
+    ISystemAuthDeptService iSystemAuthDeptService;
+
+    /**
+     * 部门所有
+     *
+     * @author fzr
+     * @return AjaxResult<List<SystemAuthDeptVo>>
+     */
+    @GetMapping("/all")
+    public AjaxResult<List<SystemAuthDeptVo>> all() {
+        List<SystemAuthDeptVo> list = iSystemAuthDeptService.all();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 部门列表
+     *
+     * @author fzr
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<JSONArray>
+     */
+    @GetMapping("/list")
+    public AjaxResult<JSONArray> list(@Validated SystemDeptSearchValidate searchValidate) {
+        JSONArray list = iSystemAuthDeptService.list(searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 部门详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<SystemAuthDeptVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SystemAuthDeptVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        SystemAuthDeptVo vo = iSystemAuthDeptService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 部门新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody SystemDeptCreateValidate createValidate) {
+        iSystemAuthDeptService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 部门编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody SystemDeptUpdateValidate updateValidate) {
+        iSystemAuthDeptService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 部门删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthDeptService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java

@@ -1,10 +1,12 @@
 package com.mdd.admin.controller.system;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.mdd.admin.LikeAdminThreadLocal;
 import com.mdd.admin.config.aop.Log;
-import com.mdd.admin.service.system.ISystemAuthMenuService;
-import com.mdd.admin.validate.system.SystemAuthMenuParam;
+import com.mdd.admin.service.ISystemAuthMenuService;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.system.SystemMenuCreateValidate;
+import com.mdd.admin.validate.system.SystemMenuUpdateValidate;
 import com.mdd.admin.vo.system.SystemAuthMenuVo;
 import com.mdd.common.core.AjaxResult;
 import com.mdd.common.validator.annotation.IDMust;
@@ -18,7 +20,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("api/system/menu")
-public class AuthMenuController {
+public class SystemAuthMenuController {
 
     @Resource
     ISystemAuthMenuService iSystemAuthMenuService;
@@ -27,10 +29,10 @@ public class AuthMenuController {
      * 获取菜单路由
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<JSONArray>
      */
     @GetMapping("/route")
-    public Object route() {
+    public AjaxResult<JSONArray> route() {
         Integer roleId = LikeAdminThreadLocal.getRoleId();
         JSONArray lists = iSystemAuthMenuService.selectMenuByRoleId(roleId);
         return AjaxResult.success(lists);
@@ -40,10 +42,10 @@ public class AuthMenuController {
      * 获取菜单列表
      *
      * @author fzr
-     * @return AjaxResult
+     * @return AjaxResult<JSONArray>
      */
     @GetMapping("/list")
-    public Object list() {
+    public AjaxResult<JSONArray> list() {
         JSONArray lists = iSystemAuthMenuService.list();
         return AjaxResult.success(lists);
     }
@@ -52,10 +54,11 @@ public class AuthMenuController {
      * 获取菜单详情
      *
      * @author fzr
-     * @return AjaxResult
+     * @param id 主键
+     * @return AjaxResult<SystemAuthMenuVo>
      */
     @GetMapping("/detail")
-    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<SystemAuthMenuVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         SystemAuthMenuVo vo = iSystemAuthMenuService.detail(id);
         return AjaxResult.success(vo);
     }
@@ -64,12 +67,13 @@ public class AuthMenuController {
      * 新增菜单
      *
      * @author fzr
-     * @return AjaxResult
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "菜单新增")
     @PostMapping("/add")
-    public Object add(@Validated(value = SystemAuthMenuParam.create.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
-        iSystemAuthMenuService.add(systemAuthMenuParam);
+    public AjaxResult<Object> add(@Validated @RequestBody SystemMenuCreateValidate createValidate) {
+        iSystemAuthMenuService.add(createValidate);
         return AjaxResult.success();
     }
 
@@ -77,12 +81,13 @@ public class AuthMenuController {
      * 更新菜单
      *
      * @author fzr
-     * @return AjaxResult
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "菜单编辑")
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated(value = SystemAuthMenuParam.update.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
-        iSystemAuthMenuService.edit(systemAuthMenuParam);
+    public AjaxResult<Object> edit(@Validated @RequestBody SystemMenuUpdateValidate updateValidate) {
+        iSystemAuthMenuService.edit(updateValidate);
         return AjaxResult.success();
     }
 
@@ -90,12 +95,13 @@ public class AuthMenuController {
      * 删除菜单
      *
      * @author fzr
-     * @return AjaxResult
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
      */
     @Log(title = "菜单删除")
     @PostMapping("/del")
-    public AjaxResult del(@Validated(value = SystemAuthMenuParam.delete.class) @RequestBody SystemAuthMenuParam systemAuthMenuParam) {
-        iSystemAuthMenuService.del(systemAuthMenuParam.getId());
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthMenuService.del(idValidate.getId());
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthPostController.java

@@ -0,0 +1,106 @@
+package com.mdd.admin.controller.system;
+
+import com.mdd.admin.service.ISystemAuthPostService;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemPostCreateValidate;
+import com.mdd.admin.validate.system.SystemPostSearchValidate;
+import com.mdd.admin.validate.system.SystemPostUpdateValidate;
+import com.mdd.admin.vo.system.SystemAuthPostVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 系统岗位管理
+ */
+@RestController
+@RequestMapping("api/system/post")
+public class SystemAuthPostController {
+
+    @Resource
+    ISystemAuthPostService iSystemAuthPostService;
+
+    /**
+     * 岗位所有
+     *
+     * @author fzr
+     * @return AjaxResult<List<SystemAuthPostVo>>
+     */
+    @GetMapping("/all")
+    public AjaxResult<List<SystemAuthPostVo>> all() {
+        List<SystemAuthPostVo> list = iSystemAuthPostService.all();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 岗位列表
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<SystemAuthPostVo>
+     */
+    @GetMapping("/list")
+    public AjaxResult<PageResult<SystemAuthPostVo>> list(@Validated PageValidate pageValidate,
+                                                         @Validated SystemPostSearchValidate searchValidate) {
+        PageResult<SystemAuthPostVo> list = iSystemAuthPostService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 岗位详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<SystemAuthPostVo>
+     */
+    @GetMapping("/detail")
+    public AjaxResult<SystemAuthPostVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        SystemAuthPostVo vo = iSystemAuthPostService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 岗位新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody SystemPostCreateValidate createValidate) {
+        iSystemAuthPostService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 岗位编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody SystemPostUpdateValidate updateValidate) {
+        iSystemAuthPostService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 岗位删除
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthPostService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java

@@ -0,0 +1,112 @@
+package com.mdd.admin.controller.system;
+
+import com.mdd.admin.config.aop.Log;
+import com.mdd.admin.service.ISystemAuthRoleService;
+import com.mdd.admin.validate.commons.IdValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemRoleCreateValidate;
+import com.mdd.admin.validate.system.SystemRoleUpdateValidate;
+import com.mdd.admin.vo.system.SystemAuthRoleVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统角色管理
+ */
+@RestController
+@RequestMapping("api/system/role")
+public class SystemAuthRoleController {
+
+    @Resource
+    ISystemAuthRoleService iSystemAuthRoleService;
+
+    /**
+     * 角色所有
+     *
+     * @author fzr
+     * @return AjaxResult<List<SystemAuthRoleVo>>
+     */
+    @GetMapping("/all")
+    public AjaxResult<List<SystemAuthRoleVo>> all() {
+        List<SystemAuthRoleVo> list = iSystemAuthRoleService.all();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 角色列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @return PageResult<SystemAuthRoleVo>
+     */
+    @Log(title = "角色列表")
+    @GetMapping("/list")
+    public AjaxResult<PageResult<SystemAuthRoleVo>> list(@Validated PageValidate pageValidate) {
+        PageResult<SystemAuthRoleVo> list = iSystemAuthRoleService.list(pageValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 角色详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return AjaxResult<SystemAuthRoleVo>
+     */
+    @Log(title = "角色详情")
+    @GetMapping("/detail")
+    public AjaxResult<SystemAuthRoleVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        SystemAuthRoleVo vo = iSystemAuthRoleService.detail(id);
+        return AjaxResult.success(vo);
+    }
+
+    /**
+     * 新增角色
+     *
+     * @author fzr
+     * @param createValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "角色新增")
+    @PostMapping("/add")
+    public AjaxResult<Object> add(@Validated @RequestBody SystemRoleCreateValidate createValidate) {
+        iSystemAuthRoleService.add(createValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 编辑角色
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "角色编辑")
+    @PostMapping("/edit")
+    public AjaxResult<Object> edit(@Validated @RequestBody SystemRoleUpdateValidate updateValidate) {
+        iSystemAuthRoleService.edit(updateValidate);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除角色
+     *
+     * @author fzr
+     * @param idValidate 参数
+     * @return AjaxResult<Object>
+     */
+    @Log(title = "角色删除")
+    @PostMapping("/del")
+    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
+        iSystemAuthRoleService.del(idValidate.getId());
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLoginController.java

@@ -0,0 +1,52 @@
+package com.mdd.admin.controller.system;
+
+import com.mdd.admin.service.ISystemLoginService;
+import com.mdd.admin.validate.system.SystemAdminLoginsValidate;
+import com.mdd.common.core.AjaxResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 系统登录管理
+ */
+@RestController
+@RequestMapping("api/system")
+public class SystemLoginController {
+
+    @Resource
+    ISystemLoginService iSystemLoginService;
+
+    /**
+     * 登录系统
+     *
+     * @author fzr
+     * @param loginsValidate 登录参数
+     * @return AjaxResult<Map<String, Object>>
+     */
+    @PostMapping("/login")
+    public AjaxResult<Map<String, Object>> login(@Validated() @RequestBody SystemAdminLoginsValidate loginsValidate) {
+        Map<String, Object> map = iSystemLoginService.login(loginsValidate);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 退出登录
+     *
+     * @author fzr
+     * @param request 请求接口
+     * @return AjaxResult<Object>
+     */
+    @PostMapping("/logout")
+    public AjaxResult<Object> logout(HttpServletRequest request) {
+        iSystemLoginService.logout(request.getHeader("token"));
+        return AjaxResult.success();
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java

@@ -0,0 +1,56 @@
+package com.mdd.admin.controller.system;
+
+import com.mdd.admin.service.ISystemLogsServer;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemSearchLoginsValidate;
+import com.mdd.admin.validate.system.SystemSearchOperateValidate;
+import com.mdd.admin.vo.system.SystemLogLoginVo;
+import com.mdd.admin.vo.system.SystemLogOperateVo;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 系统日志管理
+ */
+@RestController
+@RequestMapping("api/system/log")
+public class SystemLogsController {
+
+    @Resource
+    ISystemLogsServer iSystemLogsServer;
+
+    /**
+     * 系统操作日志
+     *
+     * @author fzr
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<LogOperateVo>>
+     */
+    @GetMapping("/operate")
+    public AjaxResult<PageResult<SystemLogOperateVo>> operate(@Validated PageValidate pageValidate,
+                                                              @Validated SystemSearchOperateValidate searchValidate) {
+        PageResult<SystemLogOperateVo> list = iSystemLogsServer.operate(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 系统登录日志
+     *
+     * @author fzr
+     * @param searchValidate 搜索参数
+     * @return AjaxResult<PageResult<LogLoginVo>>
+     */
+    @GetMapping("/login")
+    public AjaxResult<PageResult<SystemLogLoginVo>> login(@Validated PageValidate pageValidate,
+                                                          @Validated SystemSearchLoginsValidate searchValidate) {
+        PageResult<SystemLogLoginVo> list = iSystemLogsServer.login(pageValidate, searchValidate);
+        return AjaxResult.success(list);
+    }
+
+}

server/like-admin/src/main/java/com/mdd/admin/controller/user/UserController.java

@@ -1,70 +0,0 @@
-package com.mdd.admin.controller.user;
-
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.mdd.admin.service.user.IUserService;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.user.UserVo;
-import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
-import com.mdd.common.validator.annotation.IDMust;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * 用户管理
- */
-@RestController
-@RequestMapping("api/user")
-public class UserController {
-
-    @Resource
-    IUserService iUserService;
-
-    /**
-     * 用户列表
-     *
-     * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
-     * @return AjaxResult
-     */
-    @GetMapping("/list")
-    public AjaxResult list(@Validated PageParam pageParam,
-                       @RequestParam Map<String, String> params) {
-        PageResult<UserVo> list = iUserService.list(pageParam, params);
-        return AjaxResult.success(list);
-    }
-
-    /**
-     * 用户详情
-     *
-     * @author fzr
-     * @param id 主键
-     * @return AjaxResult
-     */
-    @GetMapping("/detail")
-    public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        UserVo vo = iUserService.detail(id);
-        return AjaxResult.success(vo);
-    }
-
-    /**
-     * 用户编辑
-     *
-     * @author fzr
-     * @param params 参数
-     * @return AjaxResult
-     */
-    @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody Map<String, String> params) {
-        Assert.notNull(params.get("id"), "id参数缺失");
-        Assert.notNull(params.get("field"), "field参数缺失");
-        Assert.notNull(params.get("value"), "value参数缺失");
-        iUserService.edit(params);
-        return AjaxResult.success();
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/service/IAlbumsService.java

@@ -1,8 +1,9 @@
-package com.mdd.admin.service.common;
+package com.mdd.admin.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.validate.common.AlbumParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.validate.AlbumCateValidate;
+import com.mdd.admin.validate.AlbumSearchValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.album.AlbumVo;
 import com.mdd.common.core.PageResult;
 
@@ -12,17 +13,17 @@ import java.util.Map;
 /**
  * 相册服务接口类
  */
-public interface IAlbumService {
+public interface IAlbumsService {
 
     /**
      * 文件列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @param params 其他搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 其他搜索参数
      * @return PageResult<AlbumVo>
      */
-    PageResult<AlbumVo> albumList(PageParam pageParam, Map<String, String> params);
+    PageResult<AlbumVo> albumList(PageValidate pageValidate, AlbumSearchValidate searchValidate);
 
     /**
      * 文件重命名
@@ -61,15 +62,18 @@ public interface IAlbumService {
      * 分类列表
      *
      * @author fzr
-     * @param params 搜索参数
+     * @param searchValidate 搜索参数
      * @return JSONArray
      */
-    JSONArray cateList(Map<String, String> params);
+    JSONArray cateList(AlbumSearchValidate searchValidate);
 
     /**
      * 分类新增
+     *
+     * @author fzr
+     * @param cateValidate 分类参数
      */
-    void cateAdd(AlbumParam albumParam);
+    void cateAdd(AlbumCateValidate cateValidate);
 
     /**
      * 分类编辑

server/like-admin/src/main/java/com/mdd/admin/service/IArtCateService.java

@@ -1,17 +1,18 @@
-package com.mdd.admin.service.article;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.article.CategoryParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.mdd.admin.validate.ArtCateCreateValidate;
+import com.mdd.admin.validate.ArtCateUpdateValidate;
+import com.mdd.admin.validate.ArtCateSearchValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.article.ArticleCateVo;
 import com.mdd.common.core.PageResult;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 文章分类服接口务类
  */
-public interface IArticleCategoryService {
+public interface IArtCateService {
 
     /**
      * 分类所有
@@ -25,11 +26,11 @@ public interface IArticleCategoryService {
      * 分类列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<CategoryVo>
      */
-    PageResult<ArticleCateVo> list(PageParam pageParam, Map<String, String> params);
+    PageResult<ArticleCateVo> list(PageValidate pageValidate, ArtCateSearchValidate searchValidate);
 
     /**
      * 分类详情
@@ -43,17 +44,17 @@ public interface IArticleCategoryService {
      * 分类新增
      *
      * @author fzr
-     * @param categoryParam 分类参数
+     * @param createValidate 参数
      */
-    void add(CategoryParam categoryParam);
+    void add(ArtCateCreateValidate createValidate);
 
     /**
      * 分类编辑
      *
      * @author fzr
-     * @param categoryParam 分类参数
+     * @param updateValidate 参数
      */
-    void edit(CategoryParam categoryParam);
+    void edit(ArtCateUpdateValidate updateValidate);
 
     /**
      * 分类删除

server/like-admin/src/main/java/com/mdd/admin/service/IArticleService.java

@@ -1,27 +1,27 @@
-package com.mdd.admin.service.article;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.article.ArticleParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.mdd.admin.validate.ArticleCreateValidate;
+import com.mdd.admin.validate.ArticleSearchValidate;
+import com.mdd.admin.validate.ArticleUpdateValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.article.ArticleDetailVo;
-import com.mdd.admin.vo.article.ArticleListVo;
+import com.mdd.admin.vo.article.ArticleListedVo;
 import com.mdd.common.core.PageResult;
 
-import java.util.Map;
-
 /**
  * 文章服务接口类
  */
-public interface IArticleArchivesService {
+public interface IArticleService {
 
     /**
      * 文章列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<ArticleListVo>
      */
-    PageResult<ArticleListVo> list(PageParam pageParam, Map<String, String> params);
+    PageResult<ArticleListedVo> list(PageValidate pageValidate, ArticleSearchValidate searchValidate);
 
     /**
      * 文章详情
@@ -35,17 +35,17 @@ public interface IArticleArchivesService {
      * 文章新增
      *
      * @author fzr
-     * @param articleParam 文章参数
+     * @param createValidate 参数
      */
-    void add(ArticleParam articleParam);
+    void add(ArticleCreateValidate createValidate);
 
     /**
      * 文章编辑
      *
      * @author fzr
-     * @param articleParam 文章参数
+     * @param updateValidate 参数
      */
-    void edit(ArticleParam articleParam);
+    void edit(ArticleUpdateValidate updateValidate);
 
     /**
      * 文章删除

server/like-admin/src/main/java/com/mdd/admin/service/IChannelH5ConfigService.java

@@ -1,14 +1,12 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelH5Param;
+import com.mdd.admin.validate.channel.ChannelH5Validate;
 import com.mdd.admin.vo.channel.ChannelH5Vo;
 
-import java.util.Map;
-
 /**
  * H5渠道设置服务接口类
  */
-public interface IChannelH5Service {
+public interface IChannelH5ConfigService {
 
     /**
      * H5设置详情
@@ -22,8 +20,8 @@ public interface IChannelH5Service {
      * H5设置保存
      *
      * @author fzr
-     * @param channelH5Param 参数
+     * @param channelH5Validate 参数
      */
-    void save(ChannelH5Param channelH5Param);
+    void save(ChannelH5Validate channelH5Validate);
 
 }

server/like-admin/src/main/java/com/mdd/admin/service/IChannelMpConfigService.java

@@ -1,14 +1,12 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelMpParam;
+import com.mdd.admin.validate.channel.ChannelMpValidate;
 import com.mdd.admin.vo.channel.ChannelMpVo;
 
-import java.util.Map;
-
 /**
  * 微信小程序渠道服务接口类
  */
-public interface IChannelMpService {
+public interface IChannelMpConfigService {
 
     /**
      * 微信小程序设置详情
@@ -22,8 +20,8 @@ public interface IChannelMpService {
      * 微信小程序设置保存
      *
      * @author fzr
-     * @param channelMpParam
+     * @param channelMpValidate
      */
-    void save(ChannelMpParam channelMpParam);
+    void save(ChannelMpValidate channelMpValidate);
 
 }

server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaConfigService.java

@@ -1,13 +1,13 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelOaParam;
+import com.mdd.admin.validate.channel.ChannelOaValidate;
 import com.mdd.admin.vo.channel.ChannelOaVo;
 
 
 /**
  * 公众号渠道设置服务接口类
  */
-public interface IChannelOaService {
+public interface IChannelOaConfigService {
 
     /**
      * 公众号设置详情
@@ -21,8 +21,8 @@ public interface IChannelOaService {
      * 公众号设置保存
      *
      * @author fzr
-     * @param channelOaParam 参数
+     * @param channelOaValidate 参数
      */
-    void save(ChannelOaParam channelOaParam);
+    void save(ChannelOaValidate channelOaValidate);
 
 }

server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaMenusService.java

@@ -1,14 +1,14 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 
 import java.util.List;
-import java.util.Map;
+
 
 /**
  * 公众号菜单服务接口类
  */
-public interface IChannelOaMenuService {
+public interface IChannelOaMenusService {
 
     /**
      * 菜单详情

server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyDefaultService.java

@@ -1,12 +1,10 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
+import com.mdd.admin.validate.channel.ChannelRpDefaultValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpDefaultVo;
 import com.mdd.common.core.PageResult;
 
-import java.util.List;
-
 /**
  * 公众号默认回复服务接口类
  */
@@ -16,35 +14,35 @@ public interface IChannelOaReplyDefaultService {
      * 默认回复列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @return PageResult<ChannelOaReplyVo>
+     * @param pageValidate 分页参数
+     * @return PageResult<ChannelRpDefaultVo>
      */
-    PageResult<ChannelOaReplyVo> list(PageParam pageParam);
+    PageResult<ChannelRpDefaultVo> list(PageValidate pageValidate);
 
     /**
      * 默认回复详情
      *
      * @author fzr
      * @param id 主键
-     * @return ChannelOaReplyDefaultVo
+     * @return ChannelRpDefaultVo
      */
-    ChannelOaReplyVo detail(Integer id);
+    ChannelRpDefaultVo detail(Integer id);
 
     /**
      * 默认回复新增
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param defaultValidate 参数
      */
-    void add(ChannelOaReplyParam channelOaReplyParam);
+    void add(ChannelRpDefaultValidate defaultValidate);
 
     /**
      * 默认回复编辑
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param defaultValidate 参数
      */
-    void edit(ChannelOaReplyParam channelOaReplyParam);
+    void edit(ChannelRpDefaultValidate defaultValidate);
 
     /**
      * 默认回复删除

server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyFollowService.java

@@ -1,12 +1,10 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
+import com.mdd.admin.validate.channel.ChannelRpFollowsValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpFollowsVo;
 import com.mdd.common.core.PageResult;
 
-import java.util.List;
-
 /**
  * 公众号关注回复服务接口类
  */
@@ -16,35 +14,35 @@ public interface IChannelOaReplyFollowService {
      * 关注回复列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @return PageResult<ChannelOaReplyVo>
+     * @param pageValidate 分页参数
+     * @return PageResult<ChannelRpFollowsVo>
      */
-    PageResult<ChannelOaReplyVo> list(PageParam pageParam);
+    PageResult<ChannelRpFollowsVo> list(PageValidate pageValidate);
 
     /**
      * 关注回复详情
      *
      * @author fzr
      * @param id 主键
-     * @return ChannelOaReplyFollowVo
+     * @return ChannelRpFollowsVo
      */
-    ChannelOaReplyVo detail(Integer id);
+    ChannelRpFollowsVo detail(Integer id);
 
     /**
      * 关注回复新增
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param followsValidate 参数
      */
-    void add(ChannelOaReplyParam channelOaReplyParam);
+    void add(ChannelRpFollowsValidate followsValidate);
 
     /**
      * 关注回复编辑
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param followsValidate 参数
      */
-    void edit(ChannelOaReplyParam channelOaReplyParam);
+    void edit(ChannelRpFollowsValidate followsValidate);
 
     /**
      * 关注回复删除

server/like-admin/src/main/java/com/mdd/admin/service/IChannelOaReplyKeywordService.java

@@ -1,12 +1,10 @@
-package com.mdd.admin.service.channel;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.channel.ChannelOaReplyParam;
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.vo.channel.ChannelOaReplyVo;
+import com.mdd.admin.validate.channel.ChannelRpKeywordValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.channel.ChannelRpKeywordVo;
 import com.mdd.common.core.PageResult;
 
-import java.util.List;
-
 /**
  * 公众号关键词回复服务接口类
  */
@@ -16,36 +14,36 @@ public interface IChannelOaReplyKeywordService {
      * 关键词回复列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @return PageResult<ChannelOaReplyVo>
+     * @param pageValidate 分页参数
+     * @return PageResult<ChannelRpKeywordVo>
      */
-    PageResult<ChannelOaReplyVo> list(PageParam pageParam);
+    PageResult<ChannelRpKeywordVo> list(PageValidate pageValidate);
 
     /**
      * 关键词回复详情
      *
      * @author fzr
      * @param id 主键
-     * @return Map<String, Object>
+     * @return ChannelRpKeywordVo
      */
-    ChannelOaReplyVo detail(Integer id);
+    ChannelRpKeywordVo detail(Integer id);
 
 
     /**
      * 关键词回复新增
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param keywordValidate 参数
      */
-    void add(ChannelOaReplyParam channelOaReplyParam);
+    void add(ChannelRpKeywordValidate keywordValidate);
 
     /**
      * 关键词回复编辑
      *
      * @author fzr
-     * @param channelOaReplyParam 参数
+     * @param keywordValidate 参数
      */
-    void edit(ChannelOaReplyParam channelOaReplyParam);
+    void edit(ChannelRpKeywordValidate keywordValidate);
 
     /**
      * 关键词回复删除

server/like-admin/src/main/java/com/mdd/admin/service/IDecorateDataService.java

@@ -1,4 +1,4 @@
-package com.mdd.admin.service.decorate;
+package com.mdd.admin.service;
 
 import com.mdd.admin.vo.decorate.DecorateDataArticleVo;
 

server/like-admin/src/main/java/com/mdd/admin/service/IDecoratePageService.java

@@ -1,10 +1,8 @@
-package com.mdd.admin.service.decorate;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.decorate.DecoratePageParam;
+import com.mdd.admin.validate.DecoratePageValidate;
 import com.mdd.admin.vo.decorate.DecoratePageVo;
 
-import java.util.Map;
-
 public interface IDecoratePageService {
 
     /**
@@ -20,7 +18,7 @@ public interface IDecoratePageService {
      * 页面装修保存
      *
      * @author fzr
-     * @param decoratePageParam 参数
+     * @param decoratePageValidate 参数
      */
-    void save(DecoratePageParam decoratePageParam);
+    void save(DecoratePageValidate decoratePageValidate);
 }

server/like-admin/src/main/java/com/mdd/admin/service/IDecorateTabbarService.java

@@ -1,10 +1,8 @@
-package com.mdd.admin.service.decorate;
+package com.mdd.admin.service;
 
+import com.mdd.admin.validate.DecorateTabsValidate;
 import com.mdd.admin.vo.decorate.DecorateTabbarVo;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 底部导航服务接口类
  */
@@ -22,8 +20,8 @@ public interface IDecorateTabbarService {
      * 底部导航保存
      *
      * @author fzr
-     * @param params 参数
+     * @param tabsValidate 参数
      */
-    void save(Map<String, Object> params);
+    void save(DecorateTabsValidate tabsValidate);
 
 }

server/like-admin/src/main/java/com/mdd/admin/service/IIndexCommonService.java

@@ -1,11 +1,11 @@
-package com.mdd.admin.service.common;
+package com.mdd.admin.service;
 
 import java.util.Map;
 
 /**
  * 主页服务接口类
  */
-public interface IIndexService {
+public interface IIndexCommonService {
 
     /**
      * 控制台数据

server/like-admin/src/main/java/com/mdd/admin/service/ISettingCopyrightService.java

@@ -0,0 +1,29 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingCopyrightValidate;
+import com.mdd.admin.vo.setting.SettingCopyrightVo;
+
+import java.util.List;
+
+/**
+ * 网站备案服务接口类
+ */
+public interface ISettingCopyrightService {
+
+    /**
+     * 获取网站备案信息
+     *
+     * @author fzr
+     * @return List<SettingCopyrightVo>
+     */
+    List<SettingCopyrightVo> detail();
+
+    /**
+     * 保存网站备案信息
+     *
+     * @author fzr
+     * @param copyrightValidate 参数
+     */
+    void save(SettingCopyrightValidate copyrightValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictDataService.java

@@ -1,7 +1,8 @@
-package com.mdd.admin.service.setting;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.setting.DictDataParam;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.setting.DictDataCreateValidate;
+import com.mdd.admin.validate.setting.DictDataUpdateValidate;
 import com.mdd.admin.vo.setting.SettingDictDataVo;
 import com.mdd.common.core.PageResult;
 
@@ -25,11 +26,11 @@ public interface ISettingDictDataService {
      * 字典数据列表
      *
      * @author fzr
-     * @param pageParam 分页参数
+     * @param pageValidate 分页参数
      * @param params 搜索参数
      * @return PageResult<DictDataVo>
      */
-    PageResult<SettingDictDataVo> list(PageParam pageParam, Map<String, String> params);
+    PageResult<SettingDictDataVo> list(PageValidate pageValidate, Map<String, String> params);
 
     /**
      * 字典数据详情
@@ -44,17 +45,17 @@ public interface ISettingDictDataService {
      * 字典数据新增
      *
      * @author fzr
-     * @param dictDataParam 参数
+     * @param createValidate 参数
      */
-    void add(DictDataParam dictDataParam);
+    void add(DictDataCreateValidate createValidate);
 
     /**
      * 字典数据编辑
      *
      * @author fzr
-     * @param dictDataParam 参数
+     * @param updateValidate 参数
      */
-    void edit(DictDataParam dictDataParam);
+    void edit(DictDataUpdateValidate updateValidate);
 
     /**
      * 字典数据删除

server/like-admin/src/main/java/com/mdd/admin/service/ISettingDictTypeService.java

@@ -1,7 +1,8 @@
-package com.mdd.admin.service.setting;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.setting.DictTypeParam;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.setting.DictTypeCreateValidate;
+import com.mdd.admin.validate.setting.DictTypeUpdateValidate;
 import com.mdd.admin.vo.setting.SettingDictTypeVo;
 import com.mdd.common.core.PageResult;
 
@@ -25,11 +26,11 @@ public interface ISettingDictTypeService {
      * 字典类型列表
      *
      * @author fzr
-     * @param pageParam 分页参数
+     * @param pageValidate 分页参数
      * @param params 搜索参数
      * @return PageResult<DictDataVo>
      */
-    PageResult<SettingDictTypeVo> list(PageParam pageParam, Map<String, String> params);
+    PageResult<SettingDictTypeVo> list(PageValidate pageValidate, Map<String, String> params);
 
     /**
      * 字典类型详情
@@ -44,17 +45,17 @@ public interface ISettingDictTypeService {
      * 字典类型新增
      *
      * @author fzr
-     * @param dictTypeParam 参数
+     * @param createValidate 参数
      */
-    void add(DictTypeParam dictTypeParam);
+    void add(DictTypeCreateValidate createValidate);
 
     /**
      * 字典类型编辑
      *
      * @author fzr
-     * @param dictTypeParam 参数
+     * @param updateValidate 参数
      */
-    void edit(DictTypeParam dictTypeParam);
+    void edit(DictTypeUpdateValidate updateValidate);
 
     /**
      * 字典类型删除

server/like-admin/src/main/java/com/mdd/admin/service/ISettingLoginService.java

@@ -0,0 +1,29 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingLoginValidate;
+import com.mdd.admin.vo.setting.SettingLoginVo;
+
+import java.util.Map;
+
+/**
+ * 登录设置服务接口类
+ */
+public interface ISettingLoginService {
+
+    /**
+     * 登录设置详情
+     *
+     * @author fzr
+     * @return SettingLoginVo
+     */
+    SettingLoginVo detail();
+
+    /**
+     * 登录设置保存
+     *
+     * @author fzr
+     * @param loginValidate 参数
+     */
+    void save(SettingLoginValidate loginValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISettingNoticeService.java

@@ -1,7 +1,7 @@
-package com.mdd.admin.service.setting;
+package com.mdd.admin.service;
 
 import com.mdd.admin.vo.setting.SettingNoticeDetailVo;
-import com.mdd.admin.vo.setting.SettingNoticeListVo;
+import com.mdd.admin.vo.setting.SettingNoticeListedVo;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +18,7 @@ public interface ISettingNoticeService {
      * @param recipient 1=用户, 2=平台
      * @return List<NoticeSettingListVo>
      */
-    List<SettingNoticeListVo> list(Integer recipient);
+    List<SettingNoticeListedVo> list(Integer recipient);
 
     /**
      * 通知设置详情

server/like-admin/src/main/java/com/mdd/admin/service/ISettingProtocolService.java

@@ -0,0 +1,29 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingProtocolValidate;
+import com.mdd.admin.vo.setting.SettingProtocolDetailVo;
+
+import java.util.Map;
+
+/**
+ * 政策协议服务接口类
+ */
+public interface ISettingProtocolService {
+
+    /**
+     * 获取政策协议信息
+     *
+     * @author fzr
+     * @return SettingProtocolDetailVo
+     */
+    SettingProtocolDetailVo detail();
+
+    /**
+     * 保存政策协议信息
+     *
+     * @author fzr
+     * @param protocolValidate 参数
+     */
+    void save(SettingProtocolValidate protocolValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISettingSearchService.java

@@ -0,0 +1,30 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingSearchValidate;
+import com.mdd.admin.vo.setting.SettingSearchDetailVo;
+
+import java.util.Map;
+
+/**
+ * 热门搜索服务接口类
+ */
+public interface ISettingSearchService {
+
+    /**
+     * 热门搜索详情
+     *
+     * @author fzr
+     * @return SettingSearchDetailVo
+     */
+    SettingSearchDetailVo detail();
+
+    /**
+     * 热门搜索新增
+     *
+     * @author fzr
+     * @param searchValidate 参数
+     */
+     void save(SettingSearchValidate searchValidate);
+
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISettingSmsService.java

@@ -1,4 +1,4 @@
-package com.mdd.admin.service.setting;
+package com.mdd.admin.service;
 
 import java.util.List;
 import java.util.Map;

server/like-admin/src/main/java/com/mdd/admin/service/ISettingStorageService.java

@@ -1,4 +1,4 @@
-package com.mdd.admin.service.setting;
+package com.mdd.admin.service;
 
 import java.util.List;
 import java.util.Map;

server/like-admin/src/main/java/com/mdd/admin/service/ISettingUserService.java

@@ -0,0 +1,29 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingUserValidate;
+import com.mdd.admin.vo.setting.SettingUserVo;
+
+import java.util.Map;
+
+/**
+ * 用户设置服务接口类
+ */
+public interface ISettingUserService {
+
+    /**
+     * 用户设置详情
+     *
+     * @author fzr
+     * @return SettingUserVo
+     */
+    SettingUserVo detail();
+
+    /**
+     * 用户设置保存
+     *
+     * @author fzr
+     * @param userValidate 参数
+     */
+    void save(SettingUserValidate userValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISettingWebsiteService.java

@@ -0,0 +1,29 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.setting.SettingWebsiteValidate;
+import com.mdd.admin.vo.setting.SettingWebsiteVo;
+
+import java.util.Map;
+
+/**
+ * 网站信息服务接口类
+ */
+public interface ISettingWebsiteService {
+
+    /**
+     * 获取网站信息
+     *
+     * @author fzr
+     * @return SettingWebsiteVo
+     */
+    SettingWebsiteVo detail();
+
+    /**
+     * 保存网站信息
+     *
+     * @author fzr
+     * @param websiteValidate 参数
+     */
+    void save(SettingWebsiteValidate websiteValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthAdminService.java

@@ -0,0 +1,100 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemAdminCreateValidate;
+import com.mdd.admin.validate.system.SystemAdminSearchValidate;
+import com.mdd.admin.validate.system.SystemAdminUpInfoValidate;
+import com.mdd.admin.validate.system.SystemAdminUpdateValidate;
+import com.mdd.admin.vo.system.SystemAuthAdminDetailVo;
+import com.mdd.admin.vo.system.SystemAuthAdminListedVo;
+import com.mdd.admin.vo.system.SystemAuthAdminSelvesVo;
+import com.mdd.common.core.PageResult;
+import com.mdd.common.entity.system.SystemAuthAdmin;
+
+/**
+ * 系统管理员服务接口类
+ */
+public interface ISystemAuthAdminService {
+
+    /**
+     * 根据账号查找管理员
+     *
+     * @author fzr
+     * @param username 主键ID
+     * @return SysAdmin
+     */
+    SystemAuthAdmin findByUsername(String username);
+
+    /**
+     * 管理员列表
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<SystemAuthAdminListedVo>
+     */
+    PageResult<SystemAuthAdminListedVo> list(PageValidate pageValidate, SystemAdminSearchValidate searchValidate);
+
+    /**
+     * 当前管理员
+     *
+     * @author fzr
+     * @return SystemSelfVo
+     */
+    SystemAuthAdminSelvesVo self(Integer adminId);
+
+    /**
+     * 管理员详情
+     *
+     * @author fzr
+     * @param id 主键参数
+     * @return SystemAuthAdminDetailVo
+     */
+    SystemAuthAdminDetailVo detail(Integer id);
+
+    /**
+     * 管理员新增
+     *
+     * @author fzr
+     * @param createValidate 参数
+     */
+    void add(SystemAdminCreateValidate createValidate);
+
+    /**
+     * 管理员编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     */
+    void edit(SystemAdminUpdateValidate updateValidate);
+
+    /**
+     * 当前管理员更新
+     *
+     * @author fzr
+     * @param upInfoValidate 参数
+     */
+    void upInfo(SystemAdminUpInfoValidate upInfoValidate, Integer adminId);
+
+    /**
+     * 管理员删除
+     *
+     * @author fzr
+     * @param id 主键参数
+     */
+    void del(Integer id);
+
+    /**
+     * 管理员状态切换
+     *
+     * @author fzr
+     * @param id 主键参数
+     */
+    void disable(Integer id);
+
+    /**
+     * 缓存管理员
+     */
+    void cacheAdminUserByUid(Integer id);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthDeptService.java

@@ -1,11 +1,12 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.validate.system.SystemAuthDeptParam;
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.validate.system.SystemDeptCreateValidate;
+import com.mdd.admin.validate.system.SystemDeptSearchValidate;
+import com.mdd.admin.validate.system.SystemDeptUpdateValidate;
 import com.mdd.admin.vo.system.SystemAuthDeptVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 系统部门服务接口类
@@ -24,10 +25,10 @@ public interface ISystemAuthDeptService {
      * 部门列表
      *
      * @author fzr
-     * @param params 搜索参数
+     * @param searchValidate 搜索参数
      * @return JSONArray
      */
-    JSONArray list(Map<String, String> params);
+    JSONArray list(SystemDeptSearchValidate searchValidate);
 
     /**
      * 部门详情
@@ -42,17 +43,17 @@ public interface ISystemAuthDeptService {
      * 部门新增
      *
      * @author fzr
-     * @param systemAuthDeptParam 参数
+     * @param createValidate 参数
      */
-    void add(SystemAuthDeptParam systemAuthDeptParam);
+    void add(SystemDeptCreateValidate createValidate);
 
     /**
      * 部门编辑
      *
      * @author fzr
-     * @param systemAuthDeptParam 参数
+     * @param updateValidate 参数
      */
-    void edit(SystemAuthDeptParam systemAuthDeptParam);
+    void edit(SystemDeptUpdateValidate updateValidate);
 
     /**
      * 部门删除

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthMenuService.java

@@ -1,7 +1,8 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.mdd.admin.validate.system.SystemAuthMenuParam;
+import com.alibaba.fastjson2.JSONArray;
+import com.mdd.admin.validate.system.SystemMenuCreateValidate;
+import com.mdd.admin.validate.system.SystemMenuUpdateValidate;
 import com.mdd.admin.vo.system.SystemAuthMenuVo;
 
 /**
@@ -38,17 +39,17 @@ public interface ISystemAuthMenuService {
      * 菜单新增
      *
      * @author fzr
-     * @param systemAuthMenuParam 参数
+     * @param createValidate 参数
      */
-    void add(SystemAuthMenuParam systemAuthMenuParam);
+    void add(SystemMenuCreateValidate createValidate);
 
     /**
      * 菜单编辑
      *
      * @author fzr
-     * @param systemAuthMenuParam 参数
+     * @param updateValidate 参数
      */
-    void edit(SystemAuthMenuParam systemAuthMenuParam);
+    void edit(SystemMenuUpdateValidate updateValidate);
 
     /**
      * 菜单删除

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPermService.java

@@ -1,4 +1,4 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
 import java.util.List;
 

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthPostService.java

@@ -1,7 +1,9 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.system.SystemAuthPostParam;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemPostCreateValidate;
+import com.mdd.admin.validate.system.SystemPostSearchValidate;
+import com.mdd.admin.validate.system.SystemPostUpdateValidate;
 import com.mdd.admin.vo.system.SystemAuthPostVo;
 import com.mdd.common.core.PageResult;
 
@@ -25,11 +27,11 @@ public interface ISystemAuthPostService {
      * 岗位列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<SystemPostVo>
      */
-    PageResult<SystemAuthPostVo> list(PageParam pageParam, Map<String, String> params);
+    PageResult<SystemAuthPostVo> list(PageValidate pageValidate, SystemPostSearchValidate searchValidate);
 
     /**
      * 岗位详情
@@ -44,17 +46,17 @@ public interface ISystemAuthPostService {
      * 岗位新增
      *
      * @author fzr
-     * @param systemAuthPostParam 参数
+     * @param createValidate 参数
      */
-    void add(SystemAuthPostParam systemAuthPostParam);
+    void add(SystemPostCreateValidate createValidate);
 
     /**
      * 岗位编辑
      *
      * @author fzr
-     * @param systemAuthPostParam 参数
+     * @param updateValidate 参数
      */
-    void edit(SystemAuthPostParam systemAuthPostParam);
+    void edit(SystemPostUpdateValidate updateValidate);
 
     /**
      * 岗位删除

server/like-admin/src/main/java/com/mdd/admin/service/ISystemAuthRoleService.java

@@ -1,7 +1,8 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.common.PageParam;
-import com.mdd.admin.validate.system.SystemAuthRoleParam;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemRoleCreateValidate;
+import com.mdd.admin.validate.system.SystemRoleUpdateValidate;
 import com.mdd.admin.vo.system.SystemAuthRoleVo;
 import com.mdd.common.core.PageResult;
 import org.springframework.validation.annotation.Validated;
@@ -20,16 +21,16 @@ public interface ISystemAuthRoleService {
      * @author fzr
      * @return List<SystemAuthRoleVo>
      */
-    List<Map<String, Object>> all();
+    List<SystemAuthRoleVo> all();
 
     /**
      * 角色列表
      *
      * @author fzr
-     * @param pageParam 参数
+     * @param pageValidate 参数
      * @return PageResult<SysRoleListVo>
      */
-    PageResult<SystemAuthRoleVo> list(@Validated PageParam pageParam);
+    PageResult<SystemAuthRoleVo> list(@Validated PageValidate pageValidate);
 
     /**
      * 角色详情
@@ -44,17 +45,17 @@ public interface ISystemAuthRoleService {
      * 角色新增
      *
      * @author fzr
-     * @param systemAuthRoleParam 参数
+     * @param createValidate 参数
      */
-    void add(SystemAuthRoleParam systemAuthRoleParam);
+    void add(SystemRoleCreateValidate createValidate);
 
     /**
      * 角色更新
      *
      * @author fzr
-     * @param systemAuthRoleParam 参数
+     * @param updateValidate 参数
      */
-    void edit(SystemAuthRoleParam systemAuthRoleParam);
+    void edit(SystemRoleUpdateValidate updateValidate);
 
     /**
      * 角色删除

server/like-admin/src/main/java/com/mdd/admin/service/ISystemLoginService.java

@@ -1,6 +1,6 @@
-package com.mdd.admin.service.system;
+package com.mdd.admin.service;
 
-import com.mdd.admin.validate.system.SystemLoginParam;
+import com.mdd.admin.validate.system.SystemAdminLoginsValidate;
 
 import java.util.Map;
 
@@ -13,10 +13,10 @@ public interface ISystemLoginService {
      * 登录
      *
      * @author fzr
-     * @param systemLoginParam 登录参数
+     * @param loginsValidate 登录参数
      * @return token
      */
-    Map<String, Object> login(SystemLoginParam systemLoginParam);
+    Map<String, Object> login(SystemAdminLoginsValidate loginsValidate);
 
     /**
      * 退出

server/like-admin/src/main/java/com/mdd/admin/service/ISystemLogsServer.java

@@ -0,0 +1,34 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.validate.system.SystemSearchLoginsValidate;
+import com.mdd.admin.validate.system.SystemSearchOperateValidate;
+import com.mdd.admin.vo.system.SystemLogLoginVo;
+import com.mdd.admin.vo.system.SystemLogOperateVo;
+import com.mdd.common.core.PageResult;
+
+/**
+ * 系统日志服务类接口类
+ */
+public interface ISystemLogsServer {
+
+    /**
+     * 系统操作日志
+     *
+     * @author fzr
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<LogOperateVo>
+     */
+    PageResult<SystemLogOperateVo> operate(PageValidate pageValidate, SystemSearchOperateValidate searchValidate);
+
+    /**
+     * 系统登录日志
+     *
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<LogLoginVo>
+     */
+    PageResult<SystemLogLoginVo> login(PageValidate pageValidate, SystemSearchLoginsValidate searchValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/IUsersService.java

@@ -0,0 +1,43 @@
+package com.mdd.admin.service;
+
+import com.mdd.admin.validate.UsersSearchValidate;
+import com.mdd.admin.validate.UsersUpdateValidate;
+import com.mdd.admin.validate.commons.PageValidate;
+import com.mdd.admin.vo.user.UserVo;
+import com.mdd.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 用户服务接口类
+ */
+public interface IUsersService {
+
+    /**
+     * 用户列表
+     *
+     * @author fzr
+     * @param pageValidate (分页参数)
+     * @param searchValidate (搜索参数)
+     * @return PageResult<UserVo>
+     */
+    PageResult<UserVo> list(PageValidate pageValidate, UsersSearchValidate searchValidate);
+
+    /**
+     * 用户详情
+     *
+     * @author fzr
+     * @param id 主键
+     * @return UserVo
+     */
+    UserVo detail(Integer id);
+
+    /**
+     * 用户编辑
+     *
+     * @author fzr
+     * @param updateValidate 参数
+     */
+    void edit(UsersUpdateValidate updateValidate);
+
+}

server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelWxService.java

@@ -1,29 +0,0 @@
-package com.mdd.admin.service.channel;
-
-import com.mdd.admin.validate.channel.ChannelWxParam;
-import com.mdd.admin.vo.channel.ChannelWxVo;
-
-import java.util.Map;
-
-/**
- * 微信开放平台设置服务接口类
- */
-public interface IChannelWxService {
-
-    /**
-     * 微信开放平台设置详情
-     *
-     * @author fzr
-     * @return ChannelWxVo
-     */
-    ChannelWxVo detail();
-
-    /**
-     * 微信开放平台设置保存
-     *
-     * @author fzr
-     * @param channelWxParam 参数
-     */
-    void save(ChannelWxParam channelWxParam);
-
-}

server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelWxServiceImpl.java

@@ -1,46 +0,0 @@
-package com.mdd.admin.service.channel.impl;
-
-import com.mdd.admin.service.channel.IChannelWxService;
-import com.mdd.admin.validate.channel.ChannelWxParam;
-import com.mdd.admin.vo.channel.ChannelWxVo;
-import com.mdd.common.utils.ConfigUtil;
-import org.springframework.stereotype.Service;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 微信开放平台设置服务实现类
- */
-@Service
-public class ChannelWxServiceImpl implements IChannelWxService {
-
-    /**
-     * 微信开放平台设置详情
-     *
-     * @author fzr
-     * @return ChannelWxVo
-     */
-    @Override
-    public ChannelWxVo detail() {
-        Map<String, String> config = ConfigUtil.get("wx_channel");
-        ChannelWxVo vo = new ChannelWxVo();
-
-        vo.setAppId(config.getOrDefault("appId", ""));
-        vo.setAppSecret(config.getOrDefault("appSecret", ""));
-        return vo;
-    }
-
-    /**
-     * 微信开放平台设置保存
-     *
-     * @author fzr
-     * @param channelWxParam 参数
-     */
-    @Override
-    public void save(ChannelWxParam channelWxParam) {
-        ConfigUtil.set("wx_channel", "appId", channelWxParam.getAppId());
-        ConfigUtil.set("wx_channel", "appSecret", channelWxParam.getAppSecret());
-    }
-
-}

server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java

@@ -1,13 +1,14 @@
-package com.mdd.admin.service.common.impl;
+package com.mdd.admin.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.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.mdd.admin.service.common.IAlbumService;
-import com.mdd.admin.validate.common.AlbumParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.mdd.admin.service.IAlbumsService;
+import com.mdd.admin.validate.AlbumCateValidate;
+import com.mdd.admin.validate.AlbumSearchValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.album.AlbumCateVo;
 import com.mdd.admin.vo.album.AlbumVo;
 import com.mdd.common.config.GlobalConfig;
@@ -30,7 +31,7 @@ import java.util.Map;
  * 相册服务实现类
  */
 @Service
-public class AlbumServiceImpl implements IAlbumService {
+public class AlbumsServiceImpl implements IAlbumsService {
 
     @Resource
     AlbumMapper albumMapper;
@@ -42,13 +43,14 @@ public class AlbumServiceImpl implements IAlbumService {
      * 相册文件列表
      *
      * @author fzr
-     * @param pageParam 分页参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<AlbumVo>
      */
     @Override
-    public PageResult<AlbumVo> albumList(PageParam pageParam, Map<String, String> params) {
-        Integer page  = pageParam.getPageNo();
-        Integer limit = pageParam.getPageSize();
+    public PageResult<AlbumVo> albumList(PageValidate pageValidate, AlbumSearchValidate searchValidate) {
+        Integer page  = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<Album> queryWrapper = new QueryWrapper<>();
         queryWrapper.select(Album.class, info->
@@ -60,11 +62,11 @@ public class AlbumServiceImpl implements IAlbumService {
                 .eq("is_delete", 0)
                 .orderByDesc("id");
 
-        if (StringUtil.isNotEmpty(params.get("cid"))) {
-            queryWrapper.eq("cid", Integer.parseInt(params.get("cid")));
+        if (StringUtil.isNotNull(searchValidate.getCid())) {
+            queryWrapper.eq("cid", searchValidate.getCid());
         }
 
-        albumMapper.setSearch(queryWrapper, params, new String[]{
+        albumMapper.setSearch(queryWrapper, searchValidate, new String[]{
                 "=:type:int",
                 "like:keyword@name:str"
         });
@@ -194,11 +196,11 @@ public class AlbumServiceImpl implements IAlbumService {
     /**
      * 相册分类列表
      *
-     * @param params 搜索参数
+     * @param searchValidate 搜索参数
      * @return JSONArray
      */
     @Override
-    public JSONArray cateList(Map<String, String> params) {
+    public JSONArray cateList(AlbumSearchValidate searchValidate) {
         QueryWrapper<AlbumCate> queryWrapper = new QueryWrapper<>();
         queryWrapper.select(AlbumCate.class, info->
                         !info.getColumn().equals("is_delete") &&
@@ -206,14 +208,12 @@ public class AlbumServiceImpl implements IAlbumService {
                 .eq("is_delete", 0)
                 .orderByDesc("id");
 
-        long type = Integer.parseInt(params.getOrDefault("type", "0"));
-        String keyword = params.getOrDefault("keyword", "");
-        if (type > 0) {
-            queryWrapper.eq("type", type);
+        if (StringUtil.isNotNull(searchValidate.getType()) && searchValidate.getType() > 0) {
+            queryWrapper.eq("type", searchValidate.getType());
         }
 
-        if (!keyword.equals("")) {
-            queryWrapper.like("name", keyword);
+        if (StringUtil.isNotNull(searchValidate.getKeyword()) && StringUtil.isNotEmpty(searchValidate.getKeyword())) {
+            queryWrapper.like("name", searchValidate.getKeyword());
         }
 
         List<AlbumCate> albumCateList = albumCateMapper.selectList(queryWrapper);
@@ -236,14 +236,14 @@ public class AlbumServiceImpl implements IAlbumService {
      * 分类新增
      *
      * @author fzr
-     * @param albumParam 分类参数
+     * @param cateValidate 分类参数
      */
     @Override
-    public void cateAdd(AlbumParam albumParam) {
+    public void cateAdd(AlbumCateValidate cateValidate) {
         AlbumCate albumCate = new AlbumCate();
-        albumCate.setType(albumParam.getType());
-        albumCate.setPid(albumParam.getPid());
-        albumCate.setName(albumParam.getName());
+        albumCate.setType(cateValidate.getType());
+        albumCate.setPid(cateValidate.getPid());
+        albumCate.setName(cateValidate.getName());
         albumCate.setCreateTime(System.currentTimeMillis() / 1000);
         albumCate.setUpdateTime(System.currentTimeMillis() / 1000);
         albumCateMapper.insert(albumCate);

server/like-admin/src/main/java/com/mdd/admin/service/impl/ArtCateServiceImpl.java

@@ -1,16 +1,17 @@
-package com.mdd.admin.service.article.impl;
+package com.mdd.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.mdd.admin.service.article.IArticleCategoryService;
-import com.mdd.admin.validate.article.CategoryParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.mdd.admin.service.IArtCateService;
+import com.mdd.admin.validate.ArtCateCreateValidate;
+import com.mdd.admin.validate.ArtCateUpdateValidate;
+import com.mdd.admin.validate.ArtCateSearchValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.article.ArticleCateVo;
 import com.mdd.common.core.PageResult;
 import com.mdd.common.entity.article.Article;
 import com.mdd.common.entity.article.ArticleCategory;
-import com.mdd.common.exception.OperateException;
 import com.mdd.common.mapper.article.ArticleCategoryMapper;
 import com.mdd.common.mapper.article.ArticleMapper;
 import com.mdd.common.utils.TimeUtil;
@@ -22,13 +23,12 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 文章分类服务实现类
  */
 @Service
-public class ArticleCategoryServiceImpl implements IArticleCategoryService {
+public class ArtCateServiceImpl implements IArtCateService {
 
     @Resource
     ArticleCategoryMapper articleCategoryMapper;
@@ -67,21 +67,21 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
     /**
      * 分类列表
      *
-     * @param pageParam 分页参数
-     * @param params 搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<CategoryVo>
      */
     @Override
-    public PageResult<ArticleCateVo> list(PageParam pageParam, Map<String, String> params) {
-        Integer pageNo   = pageParam.getPageNo();
-        Integer pageSize = pageParam.getPageSize();
+    public PageResult<ArticleCateVo> list(PageValidate pageValidate, ArtCateSearchValidate searchValidate) {
+        Integer pageNo   = pageValidate.getPageNo();
+        Integer pageSize = pageValidate.getPageSize();
 
         QueryWrapper<ArticleCategory> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id", "name", "sort", "is_show", "create_time", "update_time")
                 .eq("is_delete", 0)
                 .orderByDesc(Arrays.asList("sort", "id"));
 
-        articleCategoryMapper.setSearch(queryWrapper, params, new String[]{
+        articleCategoryMapper.setSearch(queryWrapper, searchValidate, new String[]{
                 "like:name:str",
                 "=:isShow@is_show:int"
         });
@@ -93,7 +93,7 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
             ArticleCateVo vo = new ArticleCateVo();
             BeanUtils.copyProperties(category, vo);
 
-            Integer number = articleMapper.selectCount(new QueryWrapper<Article>()
+            Long number = articleMapper.selectCount(new QueryWrapper<Article>()
                     .eq("cid", category.getId())
                     .eq("is_delete", 0));
 
@@ -137,18 +137,13 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
      * 分类新增
      *
      * @author fzr
-     * @param categoryParam 分类参数
+     * @param createValidate 分类参数
      */
     @Override
-    public void add(CategoryParam categoryParam) {
-        if (categoryParam.getName().trim().equals("")) {
-            throw new OperateException("名称不允许为空值!");
-        }
-
+    public void add(ArtCateCreateValidate createValidate) {
         ArticleCategory model = new ArticleCategory();
-        model.setId(categoryParam.getId());
-        model.setName(categoryParam.getName());
-        model.setSort(categoryParam.getSort());
+        model.setName(createValidate.getName());
+        model.setSort(createValidate.getSort());
         model.setIsShow(model.getIsShow());
         model.setCreateTime(TimeUtil.timestamp());
         model.setUpdateTime(TimeUtil.timestamp());
@@ -159,27 +154,23 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService {
      * 分类编辑
      *
      * @author fzr
-     * @param categoryParam 分类参数
+     * @param updateValidate 参数
      */
     @Override
-    public void edit(CategoryParam categoryParam) {
-        if (categoryParam.getName().trim().equals("")) {
-            throw new OperateException("名称不允许为空值!");
-        }
-
+    public void edit(ArtCateUpdateValidate updateValidate) {
         ArticleCategory model = articleCategoryMapper.selectOne(
                 new QueryWrapper<ArticleCategory>()
                         .select(ArticleCategory.class, info->
                            !info.getColumn().equals("is_delete") &&
                            !info.getColumn().equals("delete_time"))
-                        .eq("id", categoryParam.getId())
+                        .eq("id", updateValidate.getId())
                         .eq("is_delete", 0));
 
         Assert.notNull(model, "分类不存在");
 
-        model.setName(categoryParam.getName());
-        model.setSort(categoryParam.getSort());
-        model.setIsShow(categoryParam.getIsShow());
+        model.setName(updateValidate.getName());
+        model.setSort(updateValidate.getSort());
+        model.setIsShow(updateValidate.getIsShow());
         model.setUpdateTime(TimeUtil.timestamp());
         articleCategoryMapper.updateById(model);
     }

server/like-admin/src/main/java/com/mdd/admin/service/impl/ArticleServiceImpl.java

@@ -1,14 +1,16 @@
-package com.mdd.admin.service.article.impl;
+package com.mdd.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.mdd.admin.service.article.IArticleArchivesService;
-import com.mdd.admin.validate.article.ArticleParam;
-import com.mdd.admin.validate.common.PageParam;
+import com.mdd.admin.service.IArticleService;
+import com.mdd.admin.validate.ArticleCreateValidate;
+import com.mdd.admin.validate.ArticleSearchValidate;
+import com.mdd.admin.validate.ArticleUpdateValidate;
+import com.mdd.admin.validate.commons.PageValidate;
 import com.mdd.admin.vo.article.ArticleDetailVo;
-import com.mdd.admin.vo.article.ArticleListVo;
+import com.mdd.admin.vo.article.ArticleListedVo;
 import com.mdd.common.config.GlobalConfig;
 import com.mdd.common.core.PageResult;
 import com.mdd.common.entity.article.Article;
@@ -24,13 +26,12 @@ import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
-import java.util.Map;
 
 /**
  * 文章服务实现类
  */
 @Service
-public class ArticleArchivesServiceImpl implements IArticleArchivesService {
+public class ArticleServiceImpl implements IArticleService {
 
     @Resource
     ArticleMapper articleMapper;
@@ -42,14 +43,14 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
      * 文章列表
      *
      * @author fzr
-     * @param pageParam 分页参数
-     * @param params 搜索参数
+     * @param pageValidate 分页参数
+     * @param searchValidate 搜索参数
      * @return PageResult<ArticleListVo>
      */
     @Override
-    public PageResult<ArticleListVo> list(PageParam pageParam, Map<String, String> params) {
-        Integer pageNo   = pageParam.getPageNo();
-        Integer pageSize = pageParam.getPageSize();
+    public PageResult<ArticleListedVo> list(PageValidate pageValidate, ArticleSearchValidate searchValidate) {
+        Integer pageNo   = pageValidate.getPageNo();
+        Integer pageSize = pageValidate.getPageSize();
 
         MPJQueryWrapper<Article> mpjQueryWrapper = new MPJQueryWrapper<Article>()
                 .selectAll(Article.class)
@@ -58,19 +59,19 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
                 .eq("t.is_delete", 0)
                 .orderByDesc(Arrays.asList("t.sort", "t.id"));
 
-        articleMapper.setSearch(mpjQueryWrapper, params, new String[]{
+        articleMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{
                 "like:title@t.title:str",
                 "=:cid@t.cid:int",
                 "=:isShow@t.is_show:int",
                 "datetime:startTime-endTime@t.create_time:str"
         });
 
-        IPage<ArticleListVo> iPage = articleMapper.selectJoinPage(
+        IPage<ArticleListedVo> iPage = articleMapper.selectJoinPage(
                 new Page<>(pageNo, pageSize),
-                ArticleListVo.class,
+                ArticleListedVo.class,
                 mpjQueryWrapper);
 
-        for (ArticleListVo vo : iPage.getRecords()) {
+        for (ArticleListedVo vo : iPage.getRecords()) {
             vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
             vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
@@ -111,21 +112,21 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
      * 文章新增
      *
      * @author fzr
-     * @param articleParam 文章参数
+     * @param createValidate 文章参数
      */
     @Override
-    public void add(ArticleParam articleParam) {
+    public void add(ArticleCreateValidate createValidate) {
         Article model = new Article();
-        model.setCid(articleParam.getCid());
-        model.setTitle(articleParam.getTitle());
-        model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage()));
-        model.setIntro(articleParam.getIntro());
-        model.setContent(articleParam.getContent());
-        model.setSummary(articleParam.getSummary());
-        model.setSort(articleParam.getSort());
-        model.setIsShow(articleParam.getIsShow());
-        model.setAuthor(articleParam.getAuthor());
-        model.setVisit(articleParam.getVisit());
+        model.setCid(createValidate.getCid());
+        model.setTitle(createValidate.getTitle());
+        model.setImage(UrlUtil.toRelativeUrl(createValidate.getImage()));
+        model.setIntro(createValidate.getIntro());
+        model.setContent(createValidate.getContent());
+        model.setSummary(createValidate.getSummary());
+        model.setSort(createValidate.getSort());
+        model.setIsShow(createValidate.getIsShow());
+        model.setAuthor(createValidate.getAuthor());
+        model.setVisit(createValidate.getVisit());
         model.setCreateTime(TimeUtil.timestamp());
         model.setUpdateTime(TimeUtil.timestamp());
         articleMapper.insert(model);
@@ -135,32 +136,32 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService {
      * 文章编辑
      *
      * @author fzr
-     * @param articleParam 文章参数
+     * @param updateValidate 文章参数
      */
     @Override
-    public void edit(ArticleParam articleParam) {
+    public void edit(ArticleUpdateValidate updateValidate) {
         Article model = articleMapper.selectOne(
                 new QueryWrapper<Article>()
-                .eq("id", articleParam.getId())
+                .eq("id", updateValidate.getId())
                 .eq("is_delete", 0));
 
         Assert.notNull(model, "文章不存在!");
 
         Assert.notNull(articleCategoryMapper.selectOne(
                 new QueryWrapper<ArticleCategory>()
-                .eq("id", articleParam.getCid())
+                .eq("id", updateValidate.getCid())
                 .eq("is_delete", 0)), "分类不存在");
 
-        model.setCid(articleParam.getCid());
-        model.setTitle(articleParam.getTitle());
-        model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage()));
-        model.setIntro(articleParam.getIntro());
-        model.setContent(articleParam.getContent());
-        model.setSummary(articleParam.getSummary());
-        model.setVisit(articleParam.getVisit());
-        model.setIsShow(articleParam.getIsShow());
-        model.setAuthor(articleParam.getAuthor());
-        model.setSort(articleParam.getSort());
+        model.setCid(updateValidate.getCid());
+        model.setTitle(updateValidate.getTitle());
+        model.setImage(UrlUtil.toRelativeUrl(updateValidate.getImage()));
+        model.setIntro(updateValidate.getIntro());
+        model.setContent(updateValidate.getContent());
+        model.setSummary(updateValidate.getSummary());
+        model.setVisit(updateValidate.getVisit());
+        model.setIsShow(updateValidate.getIsShow());
+        model.setAuthor(updateValidate.getAuthor());
+        model.setSort(updateValidate.getSort());
         model.setUpdateTime(TimeUtil.timestamp());
         articleMapper.updateById(model);
     }

server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelH5ConfigServiceImpl.java

@@ -1,20 +1,18 @@
-package com.mdd.admin.service.channel.impl;
+package com.mdd.admin.service.impl;
 
-import com.mdd.admin.service.channel.IChannelH5Service;
-import com.mdd.admin.validate.channel.ChannelH5Param;
+import com.mdd.admin.service.IChannelH5ConfigService;
+import com.mdd.admin.validate.channel.ChannelH5Validate;
 import com.mdd.admin.vo.channel.ChannelH5Vo;
 import com.mdd.common.utils.ConfigUtil;
-import com.mdd.common.utils.RequestUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
  * H5渠道设置服务实现类
  */
 @Service
-public class ChannelH5ServiceImpl implements IChannelH5Service {
+public class ChannelH5ConfigServiceImpl implements IChannelH5ConfigService {
 
     /**
      * H5渠道配置详情
@@ -36,13 +34,13 @@ public class ChannelH5ServiceImpl implements IChannelH5Service {
      * H5渠道配置保存
      *
      * @author fzr
-     * @param channelH5Param 参数
+     * @param channelH5Validate 参数
      */
     @Override
-    public void save(ChannelH5Param channelH5Param) {
-        ConfigUtil.set("h5_channel", "status", String.valueOf(channelH5Param.getStatus()));
-        ConfigUtil.set("h5_channel", "close", String.valueOf(channelH5Param.getClose()));
-        ConfigUtil.set("h5_channel", "url", channelH5Param.getUrl());
+    public void save(ChannelH5Validate channelH5Validate) {
+        ConfigUtil.set("h5_channel", "status", String.valueOf(channelH5Validate.getStatus()));
+        ConfigUtil.set("h5_channel", "close", String.valueOf(channelH5Validate.getClose()));
+        ConfigUtil.set("h5_channel", "url", channelH5Validate.getUrl());
     }
 
 }

server/like-admin/src/main/java/com/mdd/admin/service/impl/ChannelMpConfigServiceImpl.java

@@ -1,21 +1,20 @@
-package com.mdd.admin.service.channel.impl;
+package com.mdd.admin.service.impl;
 
-import com.mdd.admin.service.channel.IChannelMpService;
-import com.mdd.admin.validate.channel.ChannelMpParam;
+import com.mdd.admin.service.IChannelMpConfigService;
+import com.mdd.admin.validate.channel.ChannelMpValidate;
 import com.mdd.admin.vo.channel.ChannelMpVo;
 import com.mdd.common.utils.ConfigUtil;
 import com.mdd.common.utils.RequestUtil;
 import com.mdd.common.utils.UrlUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
  * 微信小程序渠道服务实现类
  */
 @Service
-public class ChannelMpServiceImpl implements IChannelMpService {
+public class ChannelMpConfigServiceImpl implements IChannelMpConfigService {
 
     /**
      * 微信小程序渠道详情
@@ -51,15 +50,15 @@ public class ChannelMpServiceImpl implements IChannelMpService {
      * 微信小程序渠道保存
      *
      * @author fzr
-     * @param channelMpParam 参数
+     * @param channelMpValidate 参数
      */
     @Override
-    public void save(ChannelMpParam channelMpParam) {
-        ConfigUtil.set("mp_channel", "name", channelMpParam.getName());
-        ConfigUtil.set("mp_channel", "primaryId", channelMpParam.getPrimaryId());
-        ConfigUtil.set("mp_channel", "appId", channelMpParam.getAppId());
-        ConfigUtil.set("mp_channel", "appSecret", channelMpParam.getAppSecret());
-        ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(channelMpParam.getQrCode()));
+    public void save(ChannelMpValidate channelMpValidate) {
+        ConfigUtil.set("mp_channel", "name", channelMpValidate.getName());
+        ConfigUtil.set("mp_channel", "primaryId", channelMpValidate.getPrimaryId());
+        ConfigUtil.set("mp_channel", "appId", channelMpValidate.getAppId());
+        ConfigUtil.set("mp_channel", "appSecret", channelMpValidate.getAppSecret());
+        ConfigUtil.set("mp_channel", "qrCode", UrlUtil.toRelativeUrl(channelMpValidate.getQrCode()));
     }
 
 }