新增PageResult类，用作列表返回

eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java

@@ -0,0 +1,16 @@
+package me.zhengjie.utils;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+public class PageResult<T> {
+
+    private final List<T> content;
+
+    private final long totalElements;
+}

eladmin/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java

@@ -23,17 +23,16 @@ import java.util.*;
  * @author Zheng Jie
  * @date 2018-12-10
  */
-@SuppressWarnings({"unchecked","all"})
 public class PageUtil extends cn.hutool.core.util.PageUtil {
 
     /**
      * List 分页
      */
-    public static List toPage(int page, int size , List list) {
+    public static <T> List<T> paging(int page, int size , List<T> list) {
         int fromIndex = page * size;
         int toIndex = page * size + size;
         if(fromIndex > list.size()){
-            return new ArrayList();
+            return Collections.emptyList();
         } else if(toIndex >= list.size()) {
             return list.subList(fromIndex,list.size());
         } else {
@@ -44,40 +43,28 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
     /**
      * Page 数据处理
      */
-    public static Map<String,Object> toPage(IPage page) {
+    public static <T> PageResult<T> toPage(IPage<T> page) {
-        Map<String,Object> map = new LinkedHashMap<>(2);
+        return new PageResult<>(page.getRecords(), page.getTotal());
-        map.put("content",page.getRecords());
-        map.put("totalElements",page.getTotal());
-        return map;
     }
 
     /**
      * 自定义分页
      */
-    public static Map<String,Object> toPage(List list) {
+    public static <T> PageResult<T> toPage(List<T> list) {
-        Map<String,Object> map = new LinkedHashMap<>(2);
+        return new PageResult<>(list, list.size());
-        map.put("content",list);
-        map.put("totalElements",list.size());
-        return map;
     }
 
     /**
      * 返回空数据
      */
-    public static Map<String,Object> noData () {
+    public static <T> PageResult<T> noData () {
-        Map<String,Object> map = new LinkedHashMap<>(2);
+        return new PageResult<>(null, 0);
-        map.put("content",null);
-        map.put("totalElements",0);
-        return map;
     }
 
     /**
      * 自定义分页
      */
-    public static Map<String,Object> toPage(Object object, Object totalElements) {
+    public static <T> PageResult<T> toPage(List<T> list, long totalElements) {
-        Map<String,Object> map = new LinkedHashMap<>(2);
+        return new PageResult<>(list, totalElements);
-        map.put("content",object);
-        map.put("totalElements",totalElements);
-        return map;
     }
 }

eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java

@@ -39,13 +39,13 @@ public class GenConfigController {
 
     @ApiOperation("查询")
     @GetMapping(value = "/{tableName}")
-    public ResponseEntity<Object> queryGenConfig(@PathVariable String tableName){
+    public ResponseEntity<GenConfig> queryGenConfig(@PathVariable String tableName){
         return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK);
     }
 
     @PutMapping
     @ApiOperation("修改")
-    public ResponseEntity<Object> updateGenConfig(@Validated @RequestBody GenConfig genConfig){
+    public ResponseEntity<GenConfig> updateGenConfig(@Validated @RequestBody GenConfig genConfig){
         return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK);
     }
 }

eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java

@@ -20,9 +20,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.domain.ColumnInfo;
+import me.zhengjie.domain.vo.TableInfo;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.service.GenConfigService;
 import me.zhengjie.service.GeneratorService;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
@@ -50,13 +52,13 @@ public class GeneratorController {
 
     @ApiOperation("查询数据库数据")
     @GetMapping(value = "/tables")
-    public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, Page<Object> page){
+    public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name, Page<Object> page){
         return new ResponseEntity<>(generatorService.getTables(name, page), HttpStatus.OK);
     }
 
     @ApiOperation("查询字段数据")
     @GetMapping(value = "/columns")
-    public ResponseEntity<Object> queryColumns(@RequestParam String tableName){
+    public ResponseEntity<PageResult<ColumnInfo>> queryColumns(@RequestParam String tableName){
         List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
         return new ResponseEntity<>(PageUtil.toPage(columnInfos), HttpStatus.OK);
     }

eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java

@@ -19,11 +19,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.domain.GenConfig;
 import me.zhengjie.domain.ColumnInfo;
+import me.zhengjie.domain.vo.TableInfo;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.ResponseEntity;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Zheng Jie
@@ -38,7 +39,7 @@ public interface GeneratorService extends IService<ColumnInfo> {
      * @param page 分页参数
      * @return /
      */
-    Map<String,Object> getTables(String name, Page<Object> page);
+    PageResult<TableInfo> getTables(String name, Page<Object> page);
 
     /**
      * 得到数据表的元数据

eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java

@@ -23,13 +23,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.domain.GenConfig;
 import me.zhengjie.domain.ColumnInfo;
+import me.zhengjie.domain.vo.TableInfo;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.mapper.ColumnInfoMapper;
 import me.zhengjie.service.GeneratorService;
-import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.*;
-import me.zhengjie.utils.GenUtil;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -55,7 +53,7 @@ public class GeneratorServiceImpl extends ServiceImpl<ColumnInfoMapper, ColumnIn
     private final String CONFIG_MESSAGE = "请先配置生成器";
 
     @Override
-    public Map<String,Object> getTables(String name, Page<Object> page) {
+    public PageResult<TableInfo> getTables(String name, Page<Object> page) {
         return PageUtil.toPage(columnInfoMapper.getTables(name, page));
     }
 

eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl

@@ -30,6 +30,7 @@ import io.swagger.annotations.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import me.zhengjie.utils.PageResult;
 
 /**
 * @author ${author}
@@ -55,7 +56,7 @@ public class ${className}Controller {
     @Log("查询${apiAlias}")
     @ApiOperation("查询${apiAlias}")
     @PreAuthorize("@el.check('${changeClassName}:list')")
-    public ResponseEntity<Object> query${className}(${className}QueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<${className}>> query${className}(${className}QueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,page),HttpStatus.OK);
     }
 

eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl

@@ -23,6 +23,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import me.zhengjie.utils.PageResult;
 
 /**
 * @description 服务接口
@@ -35,9 +36,9 @@ public interface ${className}Service extends IService<${className}> {
     * 查询数据分页
     * @param criteria 条件
     * @param page 分页参数
-    * @return Map<String,Object>
+    * @return PageResult
     */
-    Map<String,Object> queryAll(${className}QueryCriteria criteria, Page<Object> page);
+    PageResult<${className}> queryAll(${className}QueryCriteria criteria, Page<Object> page);
 
     /**
     * 查询所有数据不分页

eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl

@@ -41,6 +41,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import me.zhengjie.utils.PageResult;
 
 /**
 * @description 服务实现
@@ -54,7 +55,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
     private final ${className}Mapper ${changeClassName}Mapper;
 
     @Override
-    public Map<String,Object> queryAll(${className}QueryCriteria criteria, Page<Object> page){
+    public PageResult<${className}> queryAll(${className}QueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(${changeClassName}Mapper.findAll(criteria, page));
     }
 

eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java

@@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log;
 import me.zhengjie.domain.SysLog;
 import me.zhengjie.service.SysLogService;
 import me.zhengjie.domain.vo.SysLogQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -63,14 +64,14 @@ public class SysLogController {
     @GetMapping
     @ApiOperation("日志查询")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> queryLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryLog(SysLogQueryCriteria criteria, Page<SysLog> page){
         criteria.setLogType("INFO");
         return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
     }
 
     @GetMapping(value = "/user")
     @ApiOperation("用户日志查询")
-    public ResponseEntity<Object> queryUserLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryUserLog(SysLogQueryCriteria criteria, Page<SysLog> page){
         criteria.setLogType("INFO");
         criteria.setUsername(SecurityUtils.getCurrentUsername());
         return new ResponseEntity<>(sysLogService.queryAllByUser(criteria,page), HttpStatus.OK);
@@ -79,7 +80,7 @@ public class SysLogController {
     @GetMapping(value = "/error")
     @ApiOperation("错误日志查询")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> queryErrorLog(SysLogQueryCriteria criteria, Page<SysLog> page){
+    public ResponseEntity<PageResult<SysLog>> queryErrorLog(SysLogQueryCriteria criteria, Page<SysLog> page){
         criteria.setLogType("ERROR");
         return new ResponseEntity<>(sysLogService.queryAll(criteria,page), HttpStatus.OK);
     }

eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.domain.SysLog;
 import me.zhengjie.domain.vo.SysLogQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.springframework.scheduling.annotation.Async;
 import javax.servlet.http.HttpServletResponse;
@@ -34,11 +35,12 @@ public interface SysLogService extends IService<SysLog>{
 
     /**
      * 分页查询
+     *
      * @param criteria 查询条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page);
+    PageResult<SysLog> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page);
 
     /**
      * 查询全部数据
@@ -53,7 +55,7 @@ public interface SysLogService extends IService<SysLog>{
      * @param page 分页参数
      * @return -
      */
-    Map<String,Object> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page);
+    PageResult<SysLog> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page);
 
     /**
      * 保存日志数据

eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java

@@ -48,7 +48,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     private final SysLogMapper sysLogMapper;
 
     @Override
-    public Map<String,Object> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page) {
+    public PageResult<SysLog> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page) {
         return PageUtil.toPage(sysLogMapper.queryAll(criteria, page));
     }
 
@@ -58,7 +58,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     }
 
     @Override
-    public Map<String,Object> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page) {
+    public PageResult<SysLog> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page) {
         return PageUtil.toPage(sysLogMapper.queryAllByUser(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java

@@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log;
 import me.zhengjie.modules.mnt.domain.App;
 import me.zhengjie.modules.mnt.service.AppService;
 import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,7 +55,7 @@ public class AppController {
     @ApiOperation(value = "查询应用")
     @GetMapping
 	@PreAuthorize("@el.check('app:list')")
-    public ResponseEntity<Object> queryApp(AppQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<App>> queryApp(AppQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(appService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java

@@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.service.DatabaseService;
 import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria;
 import me.zhengjie.modules.mnt.util.SqlUtils;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -61,7 +62,7 @@ public class DatabaseController {
     @ApiOperation(value = "查询数据库")
     @GetMapping
 	@PreAuthorize("@el.check('database:list')")
-    public ResponseEntity<Object> queryDatabase(DatabaseQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Database>> queryDatabase(DatabaseQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(databaseService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java

@@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.domain.DeployHistory;
 import me.zhengjie.modules.mnt.service.DeployService;
 import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,7 +64,7 @@ public class DeployController {
     @ApiOperation(value = "查询部署")
     @GetMapping
 	@PreAuthorize("@el.check('deploy:list')")
-    public ResponseEntity<Object> queryDeployData(DeployQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Deploy>> queryDeployData(DeployQueryCriteria criteria, Page<Object> page){
     	return new ResponseEntity<>(deployService.queryAll(criteria, page),HttpStatus.OK);
     }
 
@@ -122,7 +123,7 @@ public class DeployController {
 	@ApiOperation(value = "系统还原")
 	@PostMapping(value = "/serverReduction")
 	@PreAuthorize("@el.check('deploy:edit')")
-	public ResponseEntity<Object> serverReduction(@Validated @RequestBody DeployHistory resources){
+	public ResponseEntity<String> serverReduction(@Validated @RequestBody DeployHistory resources){
 		String result = deployService.serverReduction(resources);
 		return new ResponseEntity<>(result,HttpStatus.OK);
 	}
@@ -131,7 +132,7 @@ public class DeployController {
 	@ApiOperation(value = "服务运行状态")
 	@PostMapping(value = "/serverStatus")
 	@PreAuthorize("@el.check('deploy:edit')")
-	public ResponseEntity<Object> serverStatus(@Validated @RequestBody Deploy resources){
+	public ResponseEntity<String> serverStatus(@Validated @RequestBody Deploy resources){
 		String result = deployService.serverStatus(resources);
     	return new ResponseEntity<>(result,HttpStatus.OK);
 	}
@@ -140,7 +141,7 @@ public class DeployController {
 	@ApiOperation(value = "启动服务")
 	@PostMapping(value = "/startServer")
 	@PreAuthorize("@el.check('deploy:edit')")
-	public ResponseEntity<Object> startServer(@Validated @RequestBody Deploy resources){
+	public ResponseEntity<String> startServer(@Validated @RequestBody Deploy resources){
 		String result = deployService.startServer(resources);
 		return new ResponseEntity<>(result,HttpStatus.OK);
 	}
@@ -149,7 +150,7 @@ public class DeployController {
 	@ApiOperation(value = "停止服务")
 	@PostMapping(value = "/stopServer")
 	@PreAuthorize("@el.check('deploy:edit')")
-	public ResponseEntity<Object> stopServer(@Validated @RequestBody Deploy resources){
+	public ResponseEntity<String> stopServer(@Validated @RequestBody Deploy resources){
 		String result = deployService.stopServer(resources);
 		return new ResponseEntity<>(result,HttpStatus.OK);
 	}

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java

@@ -20,8 +20,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
+import me.zhengjie.modules.mnt.domain.DeployHistory;
 import me.zhengjie.modules.mnt.service.DeployHistoryService;
 import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -52,7 +54,7 @@ public class DeployHistoryController {
     @ApiOperation(value = "查询部署历史")
     @GetMapping
 	@PreAuthorize("@el.check('deployHistory:list')")
-    public ResponseEntity<Object> queryDeployHistory(DeployHistoryQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<DeployHistory>> queryDeployHistory(DeployHistoryQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(deployhistoryService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java

@@ -23,6 +23,7 @@ import me.zhengjie.annotation.Log;
 import me.zhengjie.modules.mnt.domain.Server;
 import me.zhengjie.modules.mnt.service.ServerService;
 import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,7 +55,7 @@ public class ServerController {
     @ApiOperation(value = "查询服务器")
     @GetMapping
 	@PreAuthorize("@el.check('serverDeploy:list')")
-    public ResponseEntity<Object> queryServerDeploy(ServerQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Server>> queryServerDeploy(ServerQueryCriteria criteria, Page<Object> page){
     	return new ResponseEntity<>(serverService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java

@@ -19,6 +19,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.mnt.domain.App;
 import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -37,7 +39,7 @@ public interface AppService extends IService<App> {
      * @param page 分页参数
      * @return /
      */
-    Map<String,Object> queryAll(AppQueryCriteria criteria, Page<Object> page);
+    PageResult<App> queryAll(AppQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java

@@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.mnt.domain.Database;
 import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -33,11 +34,12 @@ public interface DatabaseService extends IService<Database> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(DatabaseQueryCriteria criteria, Page<Object> page);
+    PageResult<Database> queryAll(DatabaseQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java

@@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.mnt.domain.DeployHistory;
 import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -32,11 +33,12 @@ public interface DeployHistoryService extends IService<DeployHistory> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page);
+    PageResult<DeployHistory> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java

@@ -20,10 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.mnt.domain.Deploy;
 import me.zhengjie.modules.mnt.domain.DeployHistory;
 import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -34,11 +35,12 @@ public interface DeployService extends IService<Deploy> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(DeployQueryCriteria criteria, Page<Object> page);
+    PageResult<Deploy> queryAll(DeployQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java

@@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.mnt.domain.Server;
 import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -33,11 +34,12 @@ public interface ServerService extends IService<Server> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(ServerQueryCriteria criteria, Page<Object> page);
+    PageResult<Server> queryAll(ServerQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java

@@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.mapper.DeployServerMapper;
 import me.zhengjie.modules.mnt.service.AppService;
 import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +47,7 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements AppSe
     private final DeployServerMapper deployServerMapper;
 
     @Override
-    public Map<String,Object> queryAll(AppQueryCriteria criteria, Page<Object> page){
+    public PageResult<App> queryAll(AppQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(appMapper.queryAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java

@@ -26,6 +26,7 @@ import me.zhengjie.modules.mnt.service.DatabaseService;
 import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria;
 import me.zhengjie.modules.mnt.util.SqlUtils;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +46,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseMapper, Database> i
     private final DatabaseMapper databaseMapper;
 
     @Override
-    public Map<String,Object> queryAll(DatabaseQueryCriteria criteria, Page<Object> page){
+    public PageResult<Database> queryAll(DatabaseQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(databaseMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java

@@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.service.DeployHistoryService;
 import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria;
 import me.zhengjie.utils.DateUtil;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +44,7 @@ public class DeployHistoryServiceImpl extends ServiceImpl<DeployHistoryMapper, D
     private final DeployHistoryMapper deployhistoryMapper;
 
     @Override
-    public Map<String,Object> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page){
+    public PageResult<DeployHistory> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(deployhistoryMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java

@@ -63,9 +63,8 @@ public class DeployServiceImpl extends ServiceImpl<DeployMapper, Deploy> impleme
 	 */
 	private final Integer count = 30;
 
-
 	@Override
-	public Map<String,Object> queryAll(DeployQueryCriteria criteria, Page<Object> page) {
+	public PageResult<Deploy> queryAll(DeployQueryCriteria criteria, Page<Object> page) {
 		criteria.setOffset(page.offset());
 		List<Deploy> deploys = deployMapper.findAll(criteria);
 		Long total = deployMapper.countAll(criteria);

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java

@@ -25,6 +25,7 @@ import me.zhengjie.modules.mnt.service.ServerService;
 import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria;
 import me.zhengjie.modules.mnt.util.ExecuteShellUtil;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,7 +45,7 @@ public class ServerServiceImpl extends ServiceImpl<ServerMapper, Server> impleme
     private final DeployServerMapper deployServerMapper;
 
     @Override
-    public Map<String,Object> queryAll(ServerQueryCriteria criteria, Page<Object> page){
+    public PageResult<Server> queryAll(ServerQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(serverMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java

@@ -23,8 +23,10 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.quartz.domain.QuartzJob;
+import me.zhengjie.modules.quartz.domain.QuartzLog;
 import me.zhengjie.modules.quartz.service.QuartzJobService;
 import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.SpringContextHolder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -52,7 +54,7 @@ public class QuartzJobController {
     @ApiOperation("查询定时任务")
     @GetMapping
     @PreAuthorize("@el.check('timing:list')")
-    public ResponseEntity<Object> queryQuartzJob(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QuartzJob>> queryQuartzJob(QuartzJobQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(quartzJobService.queryAll(criteria,page), HttpStatus.OK);
     }
 
@@ -73,7 +75,7 @@ public class QuartzJobController {
     @ApiOperation("查询任务执行日志")
     @GetMapping(value = "/logs")
     @PreAuthorize("@el.check('timing:list')")
-    public ResponseEntity<Object> queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QuartzLog>> queryQuartzJobLog(QuartzJobQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(quartzJobService.queryAllLog(criteria,page), HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java

@@ -20,10 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.quartz.domain.QuartzJob;
 import me.zhengjie.modules.quartz.domain.QuartzLog;
 import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -34,11 +35,12 @@ public interface QuartzJobService extends IService<QuartzJob> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page);
+    PageResult<QuartzJob> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部
@@ -49,11 +51,12 @@ public interface QuartzJobService extends IService<QuartzJob> {
 
     /**
      * 分页查询日志
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page);
+    PageResult<QuartzLog> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java

@@ -51,12 +51,12 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     private final RedisUtils redisUtils;
 
     @Override
-    public Map<String,Object> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public PageResult<QuartzJob> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(quartzJobMapper.findAll(criteria, page));
     }
 
     @Override
-    public Map<String,Object> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public PageResult<QuartzLog> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(quartzLogMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java

@@ -44,6 +44,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -113,7 +114,7 @@ public class AuthorizationController {
 
     @ApiOperation("获取用户信息")
     @GetMapping(value = "/info")
-    public ResponseEntity<Object> getUserInfo() {
+    public ResponseEntity<UserDetails> getUserInfo() {
         return ResponseEntity.ok(SecurityUtils.getCurrentUser());
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java

@@ -19,7 +19,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.modules.security.service.OnlineUserService;
+import me.zhengjie.modules.security.service.dto.OnlineUserDto;
 import me.zhengjie.utils.EncryptUtils;
+import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -43,7 +45,7 @@ public class OnlineController {
     @ApiOperation("查询在线用户")
     @GetMapping
     @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> queryOnlineUser(String filter, Pageable pageable){
+    public ResponseEntity<PageResult<OnlineUserDto>> queryOnlineUser(String filter, Pageable pageable){
         return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java

@@ -70,10 +70,10 @@ public class OnlineUserService {
      * @param pageable /
      * @return /
      */
-    public Map<String,Object> getAll(String filter, Pageable pageable){
+    public PageResult<OnlineUserDto> getAll(String filter, Pageable pageable){
         List<OnlineUserDto> onlineUserDtos = getAll(filter);
         return PageUtil.toPage(
-                PageUtil.toPage(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos),
+                PageUtil.paging(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos),
                 onlineUserDtos.size()
         );
     }

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java

@@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.domain.Dept;
 import me.zhengjie.modules.system.service.DeptService;
 import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -56,7 +57,7 @@ public class DeptController {
     @ApiOperation("查询部门")
     @GetMapping
     @PreAuthorize("@el.check('user:list','dept:list')")
-    public ResponseEntity<Object> queryDept(DeptQueryCriteria criteria) throws Exception {
+    public ResponseEntity<PageResult<Dept>> queryDept(DeptQueryCriteria criteria) throws Exception {
         List<Dept> depts = deptService.queryAll(criteria, true);
         return new ResponseEntity<>(PageUtil.toPage(depts),HttpStatus.OK);
     }

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java

@@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.domain.Dict;
 import me.zhengjie.modules.system.service.DictService;
 import me.zhengjie.modules.system.domain.vo.DictQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -56,14 +58,14 @@ public class DictController {
     @ApiOperation("查询字典")
     @GetMapping(value = "/all")
     @PreAuthorize("@el.check('dict:list')")
-    public ResponseEntity<Object> queryAllDict(){
+    public ResponseEntity<List<Dict>> queryAllDict(){
         return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK);
     }
 
     @ApiOperation("查询字典")
     @GetMapping
     @PreAuthorize("@el.check('dict:list')")
-    public ResponseEntity<Object> queryDict(DictQueryCriteria resources, Page<Object> page){
+    public ResponseEntity<PageResult<Dict>> queryDict(DictQueryCriteria resources, Page<Object> page){
         return new ResponseEntity<>(dictService.queryAll(resources, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java

@@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.domain.DictDetail;
 import me.zhengjie.modules.system.service.DictDetailService;
 import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,7 +49,7 @@ public class DictDetailController {
 
     @ApiOperation("查询字典详情")
     @GetMapping
-    public ResponseEntity<Object> queryDictDetail(DictDetailQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<DictDetail>> queryDictDetail(DictDetailQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(dictDetailService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java

@@ -24,6 +24,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.domain.Job;
 import me.zhengjie.modules.system.service.JobService;
 import me.zhengjie.modules.system.domain.vo.JobQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,7 +57,7 @@ public class JobController {
     @ApiOperation("查询岗位")
     @GetMapping
     @PreAuthorize("@el.check('job:list','user:list')")
-    public ResponseEntity<Object> queryJob(JobQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Job>> queryJob(JobQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(jobService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java

@@ -22,8 +22,10 @@ import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.modules.system.domain.Menu;
 import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.system.domain.vo.MenuVo;
 import me.zhengjie.modules.system.service.MenuService;
 import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.http.HttpStatus;
@@ -58,7 +60,7 @@ public class MenuController {
 
     @GetMapping(value = "/build")
     @ApiOperation("获取前端所需菜单")
-    public ResponseEntity<Object> buildMenus(){
+    public ResponseEntity<List<MenuVo>> buildMenus(){
         List<Menu> menuList = menuService.findByUser(SecurityUtils.getCurrentUserId());
         List<Menu> menus = menuService.buildTree(menuList);
         return new ResponseEntity<>(menuService.buildMenus(menus),HttpStatus.OK);
@@ -67,7 +69,7 @@ public class MenuController {
     @ApiOperation("返回全部的菜单")
     @GetMapping(value = "/lazy")
     @PreAuthorize("@el.check('menu:list','roles:list')")
-    public ResponseEntity<Object> queryAllMenu(@RequestParam Long pid){
+    public ResponseEntity<List<Menu>> queryAllMenu(@RequestParam Long pid){
         return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK);
     }
 
@@ -86,7 +88,7 @@ public class MenuController {
     @GetMapping
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
-    public ResponseEntity<Object> queryMenu(MenuQueryCriteria criteria) throws Exception {
+    public ResponseEntity<PageResult<Menu>> queryMenu(MenuQueryCriteria criteria) throws Exception {
         List<Menu> menuList = menuService.queryAll(criteria, true);
         return new ResponseEntity<>(PageUtil.toPage(menuList),HttpStatus.OK);
     }
@@ -94,7 +96,7 @@ public class MenuController {
     @ApiOperation("查询菜单:根据ID获取同级与上级数据")
     @PostMapping("/superior")
     @PreAuthorize("@el.check('menu:list')")
-    public ResponseEntity<Object> getMenuSuperior(@RequestBody List<Long> ids) {
+    public ResponseEntity<List<Menu>> getMenuSuperior(@RequestBody List<Long> ids) {
         Set<Menu> menus = new LinkedHashSet<>();
         if(CollectionUtil.isNotEmpty(ids)){
             for (Long id : ids) {

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java

@@ -25,6 +25,7 @@ import me.zhengjie.modules.system.domain.Role;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.service.RoleService;
 import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -55,7 +56,7 @@ public class RoleController {
     @ApiOperation("获取单个role")
     @GetMapping(value = "/{id}")
     @PreAuthorize("@el.check('roles:list')")
-    public ResponseEntity<Object> findRoleById(@PathVariable Long id){
+    public ResponseEntity<Role> findRoleById(@PathVariable Long id){
         return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
     }
 
@@ -69,14 +70,14 @@ public class RoleController {
     @ApiOperation("返回全部的角色")
     @GetMapping(value = "/all")
     @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
-    public ResponseEntity<Object> queryAllRole(){
+    public ResponseEntity<List<Role>> queryAllRole(){
         return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK);
     }
 
     @ApiOperation("查询角色")
     @GetMapping
     @PreAuthorize("@el.check('roles:list')")
-    public ResponseEntity<Object> queryRole(RoleQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<Role>> queryRole(RoleQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(roleService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -76,7 +76,7 @@ public class UserController {
     @ApiOperation("查询用户")
     @GetMapping
     @PreAuthorize("@el.check('user:list')")
-    public ResponseEntity<Object> queryUser(UserQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<User>> queryUser(UserQueryCriteria criteria, Page<Object> page){
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
             criteria.getDeptIds().add(criteria.getDeptId());
             // 先查找是否存在子节点

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java

@@ -19,8 +19,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.system.domain.DictDetail;
 import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author Zheng Jie
@@ -48,11 +49,12 @@ public interface DictDetailService extends IService<DictDetail> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(DictDetailQueryCriteria criteria, Page<Object> page);
+    PageResult<DictDetail> queryAll(DictDetailQueryCriteria criteria, Page<Object> page);
 
     /**
      * 根据字典名称获取字典详情

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java

@@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.system.domain.Dict;
 import me.zhengjie.modules.system.domain.vo.DictQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -33,11 +34,12 @@ public interface DictService extends IService<Dict> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(DictQueryCriteria criteria, Page<Object> page);
+    PageResult<Dict> queryAll(DictQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java

@@ -19,10 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.system.domain.Job;
 import me.zhengjie.modules.system.domain.vo.JobQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -58,11 +59,12 @@ public interface JobService extends IService<Job> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(JobQueryCriteria criteria, Page<Object> page);
+    PageResult<Job> queryAll(JobQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java

@@ -18,6 +18,8 @@ package me.zhengjie.modules.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.system.domain.Menu;
 import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria;
+import me.zhengjie.modules.system.domain.vo.MenuVo;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -77,7 +79,7 @@ public interface MenuService extends IService<Menu> {
      * @param menus /
      * @return /
      */
-    Object buildMenus(List<Menu> menus);
+    List<MenuVo> buildMenus(List<Menu> menus);
 
     /**
      * 删除

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java

@@ -21,10 +21,11 @@ import me.zhengjie.modules.security.service.dto.AuthorityDto;
 import me.zhengjie.modules.system.domain.Role;
 import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria;
+import me.zhengjie.utils.PageResult;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -86,11 +87,12 @@ public interface RoleService extends IService<Role> {
 
     /**
      * 待条件分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(RoleQueryCriteria criteria, Page<Object> page);
+    PageResult<Role> queryAll(RoleQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.modules.system.domain.vo.UserQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -97,11 +98,12 @@ public interface UserService extends IService<User> {
 
     /**
      * 查询全部
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(UserQueryCriteria criteria, Page<Object> page);
+    PageResult<User> queryAll(UserQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部不分页

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java

@@ -30,7 +30,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author Zheng Jie
@@ -46,7 +45,7 @@ public class DictDetailServiceImpl extends ServiceImpl<DictDetailMapper, DictDet
     private final RedisUtils redisUtils;
 
     @Override
-    public Map<String,Object> queryAll(DictDetailQueryCriteria criteria, Page<Object> page) {
+    public PageResult<DictDetail> queryAll(DictDetailQueryCriteria criteria, Page<Object> page) {
         return PageUtil.toPage(dictDetailMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java

@@ -47,7 +47,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     private final DictDetailMapper deleteDetail;
 
     @Override
-    public Map<String, Object> queryAll(DictQueryCriteria criteria, Page<Object> page){
+    public PageResult<Dict> queryAll(DictQueryCriteria criteria, Page<Object> page){
         criteria.setOffset(page.offset());
         List<Dict> dicts = dictMapper.findAll(criteria);
         Long total = dictMapper.countAll(criteria);

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java

@@ -49,7 +49,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
     private final UserMapper userMapper;
 
     @Override
-    public Map<String,Object> queryAll(JobQueryCriteria criteria, Page<Object> page) {
+    public PageResult<Job> queryAll(JobQueryCriteria criteria, Page<Object> page) {
         return PageUtil.toPage(jobMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -69,7 +69,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     }
 
     @Override
-    public Map<String,Object> queryAll(RoleQueryCriteria criteria, Page<Object> page) {
+    public PageResult<Role> queryAll(RoleQueryCriteria criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<Role> roles = roleMapper.findAll(criteria);
         Long total = roleMapper.countAll(criteria);

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -63,7 +63,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final OnlineUserService onlineUserService;
 
     @Override
-    public Map<String,Object> queryAll(UserQueryCriteria criteria, Page<Object> page) {
+    public PageResult<User> queryAll(UserQueryCriteria criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<User> users = userMapper.findAll(criteria);
         Long total = userMapper.countAll(criteria);

eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java

@@ -41,7 +41,7 @@ public class EmailController {
     private final EmailService emailService;
 
     @GetMapping
-    public ResponseEntity<Object> queryEmailConfig(){
+    public ResponseEntity<EmailConfig> queryEmailConfig(){
         return new ResponseEntity<>(emailService.find(),HttpStatus.OK);
     }
 
@@ -49,7 +49,7 @@ public class EmailController {
     @PutMapping
     @ApiOperation("配置邮件")
     public ResponseEntity<Object> updateEmailConfig(@Validated @RequestBody EmailConfig emailConfig) throws Exception {
-        emailService.config(emailConfig,emailService.find());
+        emailService.config(emailConfig, emailService.find());
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java

@@ -23,6 +23,7 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.service.LocalStorageService;
 import me.zhengjie.domain.vo.LocalStorageQueryCriteria;
 import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,7 +49,7 @@ public class LocalStorageController {
     @GetMapping
     @ApiOperation("查询文件")
     @PreAuthorize("@el.check('storage:list')")
-    public ResponseEntity<Object> queryFile(LocalStorageQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(localStorageService.queryAll(criteria,page),HttpStatus.OK);
     }
 
@@ -69,7 +70,7 @@ public class LocalStorageController {
 
     @ApiOperation("上传图片")
     @PostMapping("/pictures")
-    public ResponseEntity<Object> uploadPicture(@RequestParam MultipartFile file){
+    public ResponseEntity<LocalStorage> uploadPicture(@RequestParam MultipartFile file){
         // 判断文件是否为图片
         String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
         if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){

eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java

@@ -26,6 +26,7 @@ import me.zhengjie.domain.QiniuContent;
 import me.zhengjie.service.QiNiuConfigService;
 import me.zhengjie.domain.vo.QiniuQueryCriteria;
 import me.zhengjie.service.QiniuContentService;
+import me.zhengjie.utils.PageResult;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -52,7 +53,7 @@ public class QiniuController {
     private final QiNiuConfigService qiNiuConfigService;
 
     @GetMapping(value = "/config")
-    public ResponseEntity<Object> queryQiNiuConfig(){
+    public ResponseEntity<QiniuConfig> queryQiNiuConfig(){
         return new ResponseEntity<>(qiNiuConfigService.getConfig(), HttpStatus.OK);
     }
 
@@ -73,7 +74,7 @@ public class QiniuController {
 
     @ApiOperation("查询文件")
     @GetMapping
-    public ResponseEntity<Object> queryQiNiu(QiniuQueryCriteria criteria, Page<Object> page){
+    public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QiniuQueryCriteria criteria, Page<Object> page){
         return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
     }
 

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java

@@ -44,7 +44,6 @@ public interface EmailService extends IService<EmailConfig> {
      * 发送邮件
      * @param emailVo 邮件发送的内容
      * @param emailConfig 邮件配置
-     * @throws Exception /
      */
     void send(EmailVo emailVo, EmailConfig emailConfig);
 }

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java

@@ -19,11 +19,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.domain.vo.LocalStorageQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author Zheng Jie
@@ -33,11 +33,12 @@ public interface LocalStorageService extends IService<LocalStorage> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page);
+    PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java

@@ -20,11 +20,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.domain.QiniuConfig;
 import me.zhengjie.domain.QiniuContent;
 import me.zhengjie.domain.vo.QiniuQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Zheng Jie
@@ -34,11 +34,12 @@ public interface QiniuContentService extends IService<QiniuContent> {
 
     /**
      * 分页查询
+     *
      * @param criteria 条件
-     * @param page 分页参数
+     * @param page     分页参数
      * @return /
      */
-    Map<String,Object> queryAll(QiniuQueryCriteria criteria, Page<Object> page);
+    PageResult<QiniuContent> queryAll(QiniuQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java

@@ -49,7 +49,7 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
     private final FileProperties properties;
 
     @Override
-    public Map<String,Object> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page){
+    public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(localStorageMapper.findAll(criteria, page));
     }
 

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java

@@ -31,6 +31,7 @@ import me.zhengjie.domain.QiniuConfig;
 import me.zhengjie.domain.QiniuContent;
 import me.zhengjie.mapper.QiniuContentMapper;
 import me.zhengjie.domain.vo.QiniuQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.QiNiuUtil;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.service.QiniuContentService;
@@ -60,7 +61,7 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
     private Long maxSize;
 
     @Override
-    public Map<String,Object> queryAll(QiniuQueryCriteria criteria, Page<Object> page){
+    public PageResult<QiniuContent> queryAll(QiniuQueryCriteria criteria, Page<Object> page){
         return PageUtil.toPage(qiniuContentMapper.findAll(criteria, page));
     }