整合完成

src/main/java/com/usky/dxtop/common/core/domain/AjaxResult.java

@@ -1,150 +0,0 @@
-package com.usky.dxtop.common.core.domain;
-
-import com.usky.dxtop.common.constant.HttpStatus;
-import com.usky.dxtop.common.utils.StringUtils;
-
-import java.util.HashMap;
-
-
-/**
- * 操作消息提醒
- * 
- * @author yq
- */
-public class AjaxResult extends HashMap<String, Object>
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 状态码 */
-    public static final String CODE_TAG = "code";
-
-    /** 返回内容 */
-    public static final String MSG_TAG = "msg";
-
-    /** 数据对象 */
-    public static final String DATA_TAG = "data";
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
-     */
-    public AjaxResult()
-    {
-    }
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象
-     *
-     * @param code 状态码
-     * @param msg 返回内容
-     */
-    public AjaxResult(int code, String msg)
-    {
-        super.put(CODE_TAG, code);
-        super.put(MSG_TAG, msg);
-    }
-
-    /**
-     * 初始化一个新创建的 AjaxResult 对象
-     *
-     * @param code 状态码
-     * @param msg 返回内容
-     * @param data 数据对象
-     */
-    public AjaxResult(int code, String msg, Object data)
-    {
-        super.put(CODE_TAG, code);
-        super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
-        {
-            super.put(DATA_TAG, data);
-        }
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @return 成功消息
-     */
-    public static AjaxResult success()
-    {
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 返回成功数据
-     *
-     * @return 成功消息
-     */
-    public static AjaxResult success(Object data)
-    {
-        return AjaxResult.success("操作成功", data);
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @param msg 返回内容
-     * @return 成功消息
-     */
-    public static AjaxResult success(String msg)
-    {
-        return AjaxResult.success(msg, null);
-    }
-
-    /**
-     * 返回成功消息
-     *
-     * @param msg 返回内容
-     * @param data 数据对象
-     * @return 成功消息
-     */
-    public static AjaxResult success(String msg, Object data)
-    {
-        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @return
-     */
-    public static AjaxResult error()
-    {
-        return AjaxResult.error("操作失败");
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param msg 返回内容
-     * @return 警告消息
-     */
-    public static AjaxResult error(String msg)
-    {
-        return AjaxResult.error(msg, null);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param msg 返回内容
-     * @param data 数据对象
-     * @return 警告消息
-     */
-    public static AjaxResult error(String msg, Object data)
-    {
-        return new AjaxResult(HttpStatus.ERROR, msg, data);
-    }
-
-    /**
-     * 返回错误消息
-     *
-     * @param code 状态码
-     * @param msg 返回内容
-     * @return 警告消息
-     */
-    public static AjaxResult error(int code, String msg)
-    {
-        return new AjaxResult(code, msg, null);
-    }
-}

src/main/java/com/usky/dxtop/common/core/domain/ApiResult.java

@@ -1,6 +1,5 @@
 package com.usky.dxtop.common.core.domain;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,16 +8,13 @@ import java.io.Serializable;
 
 
 /**
- * <p>Api 调用结果统一包装类</p>
- *
- * @param <T>
- * @author chenpeng
- * Create time 2018年11月30日 下午5:17:42
+ * 操作消息提醒
+ * 
+ * @author yq
  */
 @Data
-@ApiModel(description = "API 响应结果")
-public class ApiResult<T> implements Serializable {
-
+public class ApiResult<T> implements Serializable
+{
     private static final long serialVersionUID = 5247512550376272642L;
 
     private static final String SUCCESS_CODE = "0";

src/main/java/com/usky/dxtop/controller/BaseController.java

@@ -3,7 +3,7 @@ package com.usky.dxtop.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usky.dxtop.common.constant.HttpStatus;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.PageDomain;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.core.page.TableSupport;
@@ -94,9 +94,9 @@ public class BaseController
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected AjaxResult toAjax(int rows)
+    protected ApiResult toAjax(int rows)
     {
-        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+        return rows > 0 ? ApiResult.success() : ApiResult.error("操作异常", "数据修改失败");
     }
 
     /**
@@ -105,7 +105,7 @@ public class BaseController
      * @param result 结果
      * @return 操作结果
      */
-    protected AjaxResult toAjax(boolean result)
+    protected ApiResult toAjax(boolean result)
     {
         return result ? success() : error();
     }
@@ -113,33 +113,33 @@ public class BaseController
     /**
      * 返回成功
      */
-    public AjaxResult success()
+    public ApiResult success()
     {
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error()
+    public ApiResult error()
     {
-        return AjaxResult.error();
+        return ApiResult.error("处理失败","处理失败");
     }
 
     /**
      * 返回成功消息
      */
-    public AjaxResult success(String message)
+    public ApiResult success(String message)
     {
-        return AjaxResult.success(message);
+        return ApiResult.success(message);
     }
 
     /**
      * 返回失败消息
      */
-    public AjaxResult error(String message)
+    public ApiResult error(String message)
     {
-        return AjaxResult.error(message);
+        return ApiResult.error("处理失败",message);
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/CaptchaController.java

@@ -2,8 +2,9 @@ package com.usky.dxtop.controller.web;
 
 import com.google.code.kaptcha.Producer;
 import com.usky.dxtop.common.constant.Constants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.redis.RedisCache;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.sign.Base64;
 import com.usky.dxtop.common.utils.uuid.IdUtils;
 import com.usky.dxtop.service.ISysConfigService;
@@ -18,6 +19,8 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 
@@ -48,11 +51,12 @@ public class CaptchaController
      * 生成验证码
      */
     @GetMapping("/captchaImage")
-    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    public ApiResult getCode(HttpServletResponse response) throws IOException
     {
-        AjaxResult ajax = AjaxResult.success();
+        ApiResult ajax = ApiResult.success();
         boolean captchaOnOff = configService.selectCaptchaOnOff();
-        ajax.put("captchaOnOff", captchaOnOff);
+        Map<String,Object> map = new HashMap<>();
+        map.put("captchaOnOff", captchaOnOff);
         if (!captchaOnOff)
         {
             return ajax;
@@ -88,11 +92,11 @@ public class CaptchaController
         }
         catch (IOException e)
         {
-            return AjaxResult.error(e.getMessage());
+            throw new CustomException(e.getMessage());
         }
 
-        ajax.put("uuid", uuid);
-        ajax.put("img", Base64.encode(os.toByteArray()));
-        return ajax;
+        map.put("uuid", uuid);
+        map.put("img", Base64.encode(os.toByteArray()));
+        return ApiResult.success(map);
     }
 }

src/main/java/com/usky/dxtop/controller/web/ChargeController.java

@@ -3,7 +3,8 @@ package com.usky.dxtop.controller.web;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.model.Staff;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -38,14 +40,18 @@ public class ChargeController {
      * @return
      */
     @PostMapping("/page")
-    public AjaxResult page(@Validated @RequestBody ChargeRequest chargeRequest){
-        return AjaxResult.success(chargeService.page(chargeRequest));
+    public ApiResult<CommonPage<Charge>> page(@Validated @RequestBody ChargeRequest chargeRequest){
+        return ApiResult.success(chargeService.page(chargeRequest));
     }
 
-
+    /**
+     * 充值消费记录
+     * @param chargeRequest
+     * @return
+     */
     @PostMapping("/cordPage")
-    public AjaxResult cordPage(@Validated @RequestBody ChargeRequest chargeRequest){
-        return AjaxResult.success(chargeService.cordPage(chargeRequest));
+    public ApiResult<CommonPage<Map<String,Object>>> cordPage(@Validated @RequestBody ChargeRequest chargeRequest){
+        return ApiResult.success(chargeService.cordPage(chargeRequest));
     }
 
     /**
@@ -54,8 +60,8 @@ public class ChargeController {
      * @return
      */
     @GetMapping(value = "/{seq}")
-    public AjaxResult one(@PathVariable Long seq){
-        return AjaxResult.success(chargeService.one(seq));
+    public ApiResult<Charge> one(@PathVariable Long seq){
+        return ApiResult.success(chargeService.one(seq));
     }
 
     /**
@@ -63,13 +69,13 @@ public class ChargeController {
      * @return
      */
     @PutMapping
-    public AjaxResult updateList(@RequestParam String userId){
+    public ApiResult<Boolean> updateList(@RequestParam String userId){
         Staff staff = staffService.one(userId, null, null);
         Optional.ofNullable(staff).orElseThrow(() -> new CustomException("用户信息不存在"));
         LambdaUpdateWrapper<Charge> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.set(Charge::getMessageFlag,true)
                 .eq(Charge::getCard,staff.getCardId());
-        return AjaxResult.success(chargeService.update(updateWrapper));
+        return ApiResult.success(chargeService.update(updateWrapper));
     }
 }
 

src/main/java/com/usky/dxtop/controller/web/CompanyController.java

@@ -3,7 +3,9 @@ package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.annotation.RepeatSubmit;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.Company;
 import com.usky.dxtop.service.CompanyService;
@@ -12,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 产品
  * @author yq
  * @since 2021-09-29
  */
@@ -35,10 +34,10 @@ public class CompanyController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping
-    public AjaxResult add(@RequestBody Company company){
+    public ApiResult add(@RequestBody Company company){
         if (UserConstants.NOT_UNIQUE.equals(companyService.checkNameUnique(company)))
         {
-            return AjaxResult.error("新增产品信息'" + company.getName() + "'失败，产品信息已存在");
+            throw new CustomException("新增产品信息'" + company.getName() + "'失败，产品信息已存在");
         }
         return toAjax(companyService.add(company));
 
@@ -48,9 +47,9 @@ public class CompanyController extends BaseController {
      * 修改
      */
     @PutMapping
-    public AjaxResult edit(@RequestBody Company company)
+    public ApiResult edit(@RequestBody Company company)
     {
-        return AjaxResult.success(companyService.update(company));
+        return ApiResult.success(companyService.update(company));
     }
 
     /**
@@ -59,11 +58,11 @@ public class CompanyController extends BaseController {
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam Integer current,
-                           @RequestParam Integer size,
-                           @RequestParam(required = false) String name)
+    public ApiResult<CommonPage<Company>> list(@RequestParam Integer current,
+                                      @RequestParam Integer size,
+                                      @RequestParam(required = false) String name)
     {
-        return AjaxResult.success(companyService.list(current, size, name));
+        return ApiResult.success(companyService.list(current, size, name));
     }
 
 
@@ -71,7 +70,7 @@ public class CompanyController extends BaseController {
      * 删除
      */
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable("id") Long id)
+    public ApiResult remove(@PathVariable("id") Long id)
     {
         return toAjax(companyService.remove(id));
     }

src/main/java/com/usky/dxtop/controller/web/DeptController.java

@@ -1,7 +1,9 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.vo.StaffRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,10 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 部门
  * @author yq
  * @since 2021-09-28
  */
@@ -25,9 +24,14 @@ public class DeptController {
     @Autowired
     private DeptService deptService;
 
+    /**
+     * 分页
+     * @param staffRequest
+     * @return
+     */
     @PostMapping("page")
-    public AjaxResult page(@RequestBody StaffRequest staffRequest){
-        return AjaxResult.success(deptService.page(staffRequest));
+    public ApiResult<CommonPage<Dept>> page(@RequestBody StaffRequest staffRequest){
+        return ApiResult.success(deptService.page(staffRequest));
     }
 }
 

src/main/java/com/usky/dxtop/controller/web/DishController.java

@@ -3,7 +3,8 @@ package com.usky.dxtop.controller.web;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.model.Dish;
 import com.usky.dxtop.model.Staff;
@@ -39,8 +40,8 @@ public class DishController {
      * @return
      */
     @PostMapping("page")
-    public AjaxResult page(@Validated @RequestBody DishRequest dishRequest){
-        return AjaxResult.success(dishService.page(dishRequest));
+    public ApiResult<CommonPage<Dish>> page(@Validated @RequestBody DishRequest dishRequest){
+        return ApiResult.success(dishService.page(dishRequest));
     }
 
     /**
@@ -49,8 +50,8 @@ public class DishController {
      * @return
      */
     @GetMapping(value = "/{seq}")
-    public AjaxResult one(@PathVariable Long seq){
-        return AjaxResult.success(dishService.one(seq));
+    public ApiResult<Dish> one(@PathVariable Long seq){
+        return ApiResult.success(dishService.one(seq));
     }
 
 
@@ -60,8 +61,8 @@ public class DishController {
      * @return
      */
     @GetMapping(value = "/collect")
-    public AjaxResult collect(){
-        return AjaxResult.success(dishService.collect());
+    public ApiResult collect(){
+        return ApiResult.success(dishService.collect());
     }
 
     /**
@@ -69,13 +70,13 @@ public class DishController {
      * @return
      */
     @PutMapping
-    public AjaxResult update(@RequestParam String userId) {
+    public ApiResult<Boolean> update(@RequestParam String userId) {
         Staff staff = staffService.one(userId, null, null);
         Optional.ofNullable(staff).orElseThrow(() -> new CustomException("用户信息不存在"));
         LambdaUpdateWrapper<Dish> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.set(Dish::getMessageFlag,true)
                 .eq(Dish::getCard,staff.getCardId());
-        return AjaxResult.success(dishService.update(updateWrapper));
+        return ApiResult.success(dishService.update(updateWrapper));
     }
 
 }

src/main/java/com/usky/dxtop/controller/web/MsgLogController.java

@@ -1,6 +1,6 @@
 package com.usky.dxtop.controller.web;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.service.MsgLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +20,7 @@ public class MsgLogController {
     private MsgLogService msgLogService;
 
     @GetMapping("/one")
-    public AjaxResult one(@RequestParam Long id){
-        return AjaxResult.success(msgLogService.getById(id));
+    public ApiResult one(@RequestParam Long id){
+        return ApiResult.success(msgLogService.getById(id));
     }
 }

src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -3,7 +3,8 @@ package com.usky.dxtop.controller.web;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.usky.dxtop.common.annotation.RepeatSubmit;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.utils.DateUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.Order;
@@ -16,9 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 
 /**
- * <p>
- * 订单表 前端控制器
- * </p>
+ * 订单表
  *
  * @author yq
  * @since 2021-08-26
@@ -37,7 +36,7 @@ public class OrderController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping
-    public AjaxResult add(@RequestBody Order order){
+    public ApiResult add(@RequestBody Order order){
         return toAjax(orderService.add(order));
     }
 
@@ -47,7 +46,7 @@ public class OrderController extends BaseController {
      * @return
      */
     @PutMapping
-    public AjaxResult update(@RequestBody Order order){
+    public ApiResult update(@RequestBody Order order){
         order.setOrderFlag(OrderStatus.COMPLETE.getCode());
         return toAjax(orderService.updateById(order));
     }
@@ -58,7 +57,7 @@ public class OrderController extends BaseController {
      * @return
      */
     @DeleteMapping("/{orderNumber}")
-    public AjaxResult remove(@PathVariable("orderNumber") String orderNumber){
+    public ApiResult remove(@PathVariable("orderNumber") String orderNumber){
         return toAjax(orderService.remove(orderNumber));
     }
 
@@ -68,8 +67,8 @@ public class OrderController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    public AjaxResult list(@RequestBody OrderRequest orderRequest){
-        return AjaxResult.success(orderService.list(orderRequest));
+    public ApiResult<CommonPage<Order>> list(@RequestBody OrderRequest orderRequest){
+        return ApiResult.success(orderService.list(orderRequest));
     }
 
     /**
@@ -79,8 +78,8 @@ public class OrderController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping("/topScanPayApi")
-    public AjaxResult getTopScanPayApi(@RequestBody Order order){
-        return AjaxResult.success(orderService.getTopScanPayApi(order));
+    public ApiResult<String> getTopScanPayApi(@RequestBody Order order){
+        return ApiResult.success(orderService.getTopScanPayApi(order));
     }
 
     /**
@@ -89,13 +88,18 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/{orderNumber}")
-    public AjaxResult callTopFindOrderInfoApi(@PathVariable("orderNumber") String orderNumber){
-        return AjaxResult.success(orderService.callTopFindOrderInfoApi(orderNumber));
+    public ApiResult<String> callTopFindOrderInfoApi(@PathVariable("orderNumber") String orderNumber){
+        return ApiResult.success(orderService.callTopFindOrderInfoApi(orderNumber));
     }
 
+    /**
+     * 订单详情
+     * @param orderRequest
+     * @return
+     */
     @PostMapping("/exportDetail")
-    public AjaxResult exportDetail(@RequestBody OrderRequest orderRequest){
-        return AjaxResult.success(orderService.exportDetail(orderRequest));
+    public ApiResult<String> exportDetail(@RequestBody OrderRequest orderRequest){
+        return ApiResult.success(orderService.exportDetail(orderRequest));
     }
 
     /**
@@ -108,12 +112,12 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/orderReportList")
-    public AjaxResult orderReportList(@RequestParam Integer current,
-                                      @RequestParam Integer size,
-                                      @RequestParam(required = false) Date startTime,
-                                      @RequestParam(required = false) Date endTime,
-                                      @RequestParam Integer type){
-        return AjaxResult.success(orderService.orderReportList(current,size,startTime,endTime,type));
+    public ApiResult orderReportList(@RequestParam Integer current,
+                                     @RequestParam Integer size,
+                                     @RequestParam(required = false) Date startTime,
+                                     @RequestParam(required = false) Date endTime,
+                                     @RequestParam Integer type){
+        return ApiResult.success(orderService.orderReportList(current,size,startTime,endTime,type));
     }
 
     /**
@@ -124,10 +128,10 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/reportExport")
-    public AjaxResult reportExport(@RequestParam(required = false) Date startTime,
-                           @RequestParam(required = false) Date endTime,
-                           @RequestParam Integer type){
-        return AjaxResult.success(orderService.reportExport(startTime, endTime, type));
+    public ApiResult<String> reportExport(@RequestParam(required = false) Date startTime,
+                                  @RequestParam(required = false) Date endTime,
+                                  @RequestParam Integer type){
+        return ApiResult.success(orderService.reportExport(startTime, endTime, type));
     }
 
     /**
@@ -137,8 +141,8 @@ public class OrderController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping("/callUnifiedPay")
-    public AjaxResult callUnifiedPay(@RequestBody Order order){
-        return AjaxResult.success(orderService.callUnifiedPay(order));
+    public ApiResult<String> callUnifiedPay(@RequestBody Order order){
+        return ApiResult.success(orderService.callUnifiedPay(order));
     }
 
     /**
@@ -146,8 +150,8 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/payTypeCollect")
-    public AjaxResult payTypeCollect(){
-        return AjaxResult.success(orderService.payTypeCollect());
+    public ApiResult payTypeCollect(){
+        return ApiResult.success(orderService.payTypeCollect());
     }
 
     /**
@@ -155,13 +159,13 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/orderMoney")
-    public AjaxResult orderMoney(){
+    public ApiResult orderMoney(){
         Date date = new Date();
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("IFNULL(sum(money),0) as total","count(*) as count")
                 .and(wrapper -> wrapper.eq("order_flag",OrderStatus.SUCCESS.getCode()).or().eq("order_flag",OrderStatus.COMPLETE.getCode()))
                 .between("create_time",DateUtils.getDayStartTime(date),date);
-        return AjaxResult.success(orderService.getMap(queryWrapper));
+        return ApiResult.success(orderService.getMap(queryWrapper));
     }
 
     /**
@@ -170,16 +174,21 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/dateCollect")
-    public AjaxResult dateCollect(@RequestParam Integer type,
-                                  @RequestParam Date startTime,
-                                  @RequestParam Date endTime){
-        return AjaxResult.success(orderService.dateCollect(type,startTime,endTime));
+    public ApiResult dateCollect(@RequestParam Integer type,
+                                 @RequestParam Date startTime,
+                                 @RequestParam Date endTime){
+        return ApiResult.success(orderService.dateCollect(type,startTime,endTime));
     }
 
+    /**
+     * 支付路径
+     * @param order
+     * @return
+     */
     @RepeatSubmit
     @PostMapping("/backPayPath")
-    public AjaxResult backPayPath(@RequestBody Order order){
-        return AjaxResult.success(orderService.backPayPath(order));
+    public ApiResult backPayPath(@RequestBody Order order){
+        return ApiResult.success(orderService.backPayPath(order));
     }
 
 

src/main/java/com/usky/dxtop/controller/web/QrCodeController.java

@@ -3,7 +3,9 @@ package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.annotation.RepeatSubmit;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.QrCode;
@@ -32,10 +34,10 @@ public class QrCodeController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping
-    public AjaxResult add(@RequestBody QrCode qrCode){
+    public ApiResult add(@RequestBody QrCode qrCode){
         if (UserConstants.NOT_UNIQUE.equals(qrCodeService.checkNameUnique(qrCode)))
         {
-            return AjaxResult.error("新增二维码信息'" + qrCode.getName() + "'失败，二维码信息已存在");
+            throw new CustomException("新增二维码信息'" + qrCode.getName() + "'失败，二维码信息已存在");
         }
         return toAjax(qrCodeService.add(qrCode));
 
@@ -45,11 +47,11 @@ public class QrCodeController extends BaseController {
      * 修改
      */
     @PutMapping
-    public AjaxResult edit(@RequestBody QrCode qrCode)
+    public ApiResult edit(@RequestBody QrCode qrCode)
     {
         if (UserConstants.NOT_UNIQUE.equals(qrCodeService.checkNameUnique(qrCode)))
         {
-            return AjaxResult.error("修改二维码信息'" + qrCode.getName() + "'失败，二维码信息已存在");
+            throw new CustomException("修改二维码信息'" + qrCode.getName() + "'失败，二维码信息已存在");
         }
         qrCode.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(qrCodeService.updateById(qrCode));
@@ -61,11 +63,11 @@ public class QrCodeController extends BaseController {
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam Integer current,
-                           @RequestParam Integer size,
-                           @RequestParam(required = false) String name)
+    public ApiResult<CommonPage<QrCode>> list(@RequestParam Integer current,
+                                      @RequestParam Integer size,
+                                      @RequestParam(required = false) String name)
     {
-        return AjaxResult.success(qrCodeService.list(current, size, name));
+        return ApiResult.success(qrCodeService.list(current, size, name));
     }
 
 
@@ -73,7 +75,7 @@ public class QrCodeController extends BaseController {
      * 删除
      */
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable("id") Long id)
+    public ApiResult remove(@PathVariable("id") Long id)
     {
         return toAjax(qrCodeService.remove(id));
     }

src/main/java/com/usky/dxtop/controller/web/SmJobController.java

@@ -1,6 +1,6 @@
 package com.usky.dxtop.controller.web;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.service.job.SmJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 世贸定时任务
  * @author yq
  * @date 2021/10/11 17:00
  */
@@ -19,14 +20,25 @@ public class SmJobController {
     @Autowired
     private SmJob smJob;
 
+    /**
+     * 获取人员信息
+     * @param personParam
+     * @return
+     */
     @PostMapping("personJob")
-    public AjaxResult personJob(SmJob.PersonParam personParam){
+    public ApiResult personJob(SmJob.PersonParam personParam){
         smJob.personApi(personParam);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
+
+    /**
+     * 获取部门信息
+     * @param groupParam
+     * @return
+     */
     @PostMapping("deptJob")
-    public AjaxResult deptJob(SmJob.GroupParam groupParam){
+    public ApiResult deptJob(SmJob.GroupParam groupParam){
         smJob.groupApi(groupParam);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/controller/web/StaffController.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.controller.web;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.Staff;
@@ -16,6 +17,7 @@ import java.util.List;
 import java.util.Optional;
 
 /**
+ * 充值记录
  * @author yq
  * @date 2021/9/23 13:34
  */
@@ -32,12 +34,12 @@ public class StaffController {
     private DeptService deptService;
 
     /**
-     *
+     * 汇总
      * @return
      */
     @RequestMapping("count")
-    public AjaxResult count(){
-        return AjaxResult.success(staffService.count());
+    public ApiResult count(){
+        return ApiResult.success(staffService.count());
     }
 
 
@@ -47,9 +49,9 @@ public class StaffController {
      * @return
      */
     @PostMapping()
-    public AjaxResult addList(@RequestBody List<StaffRadio> list){
+    public ApiResult addList(@RequestBody List<StaffRadio> list){
         staffRadioService.addList(list);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 
     /**
@@ -57,23 +59,28 @@ public class StaffController {
      * @return
      */
     @GetMapping("staffRadio")
-    public AjaxResult staffRadio(){
-        return AjaxResult.success(staffRadioService.staffRadio());
+    public ApiResult staffRadio(){
+        return ApiResult.success(staffRadioService.staffRadio());
     }
 
+    /**
+     * 分页
+     * @param staffRequest
+     * @return
+     */
     @PostMapping("page")
-    public AjaxResult page(@RequestBody StaffRequest staffRequest){
-        return AjaxResult.success(staffService.page(staffRequest));
+    public ApiResult<CommonPage<Staff>> page(@RequestBody StaffRequest staffRequest){
+        return ApiResult.success(staffService.page(staffRequest));
     }
 
     /**
-     * 发送获取余额信息
+     * 获取余额信息
      * @param card
      * @return
      */
     @GetMapping("cardBalance")
-    public AjaxResult getCardBalance(@RequestParam String card){
-        return AjaxResult.success(staffService.getBalance(card));
+    public ApiResult getCardBalance(@RequestParam String card){
+        return ApiResult.success(staffService.getBalance(card));
     }
 
     /**
@@ -84,20 +91,25 @@ public class StaffController {
      * @return
      */
     @GetMapping("one")
-    public AjaxResult getCardBalance(@RequestParam(required = false) String id,
-                                     @RequestParam(required = false) String phone,
-                                     @RequestParam(required = false) String card){
-        return AjaxResult.success(staffService.one(id,phone,card));
+    public ApiResult<Staff> getCardBalance(@RequestParam(required = false) String id,
+                                    @RequestParam(required = false) String phone,
+                                    @RequestParam(required = false) String card){
+        return ApiResult.success(staffService.one(id,phone,card));
     }
 
+    /**
+     * 修改消息状态
+     * @param staff
+     * @return
+     */
     @PutMapping
-    public AjaxResult update(@RequestBody Staff staff){
+    public ApiResult<Void> update(@RequestBody Staff staff){
         Staff one = staffService.one(staff.getId(), null, staff.getCardId());
         Optional.ofNullable(one).map(s -> {
             s.setOpenId(staff.getOpenId());
             return staffService.updateById(s);
         }).orElseThrow(() ->  new CustomException("用户信息不存在"));
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 
 

src/main/java/com/usky/dxtop/controller/web/SysAsyncController.java

@@ -1,7 +1,7 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.service.ISysAsyncTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 
 /**
+ * 异步任务
  * @author fzq
  */
 @RestController
@@ -21,15 +22,26 @@ public class SysAsyncController {
     @Autowired
     private ISysAsyncTaskService iSysAsyncTaskService;
 
+    /**
+     * 异步上传
+     * @param asyncTaskId
+     * @param startTime
+     * @param endTime
+     * @param funcType
+     * @param userName
+     * @param current
+     * @param size
+     * @return
+     */
     @GetMapping
-    public AjaxResult getList(@RequestParam(required = false) Long asyncTaskId,
-                              @RequestParam(required = false) Date startTime,
-                              @RequestParam(required = false) Date endTime,
-                              @RequestParam(required = false) String funcType,
-                              @RequestParam(required = false) String userName,
-                              Integer current,
-                              Integer size) {
-        return AjaxResult.success(iSysAsyncTaskService.getList(asyncTaskId, startTime, endTime, funcType, userName, current, size));
+    public ApiResult getList(@RequestParam(required = false) Long asyncTaskId,
+                             @RequestParam(required = false) Date startTime,
+                             @RequestParam(required = false) Date endTime,
+                             @RequestParam(required = false) String funcType,
+                             @RequestParam(required = false) String userName,
+                             Integer current,
+                             Integer size) {
+        return ApiResult.success(iSysAsyncTaskService.getList(asyncTaskId, startTime, endTime, funcType, userName, current, size));
     }
 
 }

src/main/java/com/usky/dxtop/controller/web/SysConfigController.java

@@ -1,13 +1,12 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.annotation.RepeatSubmit;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.SysConfig;
@@ -15,14 +14,9 @@ import com.usky.dxtop.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -54,18 +48,18 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
+    public ApiResult getInfo(@PathVariable Long configId)
     {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return ApiResult.success(configService.selectConfigById(configId));
     }
 
     /**
      * 根据参数键名查询参数值
      */
     @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
+    public ApiResult getConfigKey(@PathVariable String configKey)
     {
-        return AjaxResult.success(configService.selectConfigByKey(configKey));
+        return ApiResult.success(configService.selectConfigByKey(configKey));
     }
 
     /**
@@ -75,11 +69,11 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    public ApiResult add(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
-            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            throw new CustomException("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(SecurityUtils.getUsername());
         return toAjax(configService.insertConfig(config));
@@ -91,11 +85,11 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    public ApiResult edit(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
         {
-            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            throw new CustomException("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(configService.updateConfig(config));
@@ -107,7 +101,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
+    public ApiResult remove(@PathVariable Long[] configIds)
     {
         configService.deleteConfigByIds(configIds);
         return success();
@@ -119,9 +113,9 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
+    public ApiResult refreshCache()
     {
         configService.resetConfigCache();
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/controller/web/SysDeptController.java

@@ -1,12 +1,10 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
@@ -16,14 +14,12 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -43,10 +39,10 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
+    public ApiResult list(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(depts);
+        return ApiResult.success(depts);
     }
 
     /**
@@ -54,7 +50,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
@@ -67,7 +63,7 @@ public class SysDeptController extends BaseController
                 it.remove();
             }
         }
-        return AjaxResult.success(depts);
+        return ApiResult.success(depts);
     }
 
     /**
@@ -75,32 +71,32 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    public ApiResult getInfo(@PathVariable Long deptId)
     {
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return ApiResult.success(deptService.selectDeptById(deptId));
     }
 
     /**
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
+    public ApiResult treeselect(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        return ApiResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
     /**
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-        return ajax;
+        Map<String,Object> map = new HashMap<>();
+        map.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        map.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ApiResult.success(map);
     }
 
     /**
@@ -109,11 +105,11 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    public ApiResult add(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            throw new CustomException("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
         return toAjax(deptService.insertDept(dept));
@@ -125,20 +121,20 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    public ApiResult edit(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
         {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            throw new CustomException("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         else if (dept.getParentId().equals(dept.getDeptId()))
         {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            throw new CustomException("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }
         else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
                 && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
         {
-            return AjaxResult.error("该部门包含未停用的子部门！");
+            throw new CustomException("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(deptService.updateDept(dept));
@@ -150,15 +146,15 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    public ApiResult remove(@PathVariable Long deptId)
     {
         if (deptService.hasChildByDeptId(deptId))
         {
-            return AjaxResult.error("存在下级部门,不允许删除");
+            throw new CustomException("存在下级部门,不允许删除");
         }
         if (deptService.checkDeptExistUser(deptId))
         {
-            return AjaxResult.error("部门存在用户,不允许删除");
+            throw new CustomException("部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));
     }

src/main/java/com/usky/dxtop/controller/web/SysDictDataController.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.usky.dxtop.common.annotation.Log;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
@@ -57,23 +57,23 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    public ApiResult getInfo(@PathVariable Long dictCode)
     {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+        return ApiResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
+    public ApiResult dictType(@PathVariable String dictType)
     {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (StringUtils.isNull(data))
         {
             data = new ArrayList<SysDictData>();
         }
-        return AjaxResult.success(data);
+        return ApiResult.success(data);
     }
 
     /**
@@ -82,7 +82,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    public ApiResult add(@Validated @RequestBody SysDictData dict)
     {
         dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.insertDictData(dict));
@@ -94,7 +94,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    public ApiResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.updateDictData(dict));
@@ -106,7 +106,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    public ApiResult remove(@PathVariable Long[] dictCodes)
     {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();

src/main/java/com/usky/dxtop/controller/web/SysDictTypeController.java

@@ -1,13 +1,11 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.SysDictType;
@@ -15,14 +13,9 @@ import com.usky.dxtop.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -51,9 +44,9 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
+    public ApiResult getInfo(@PathVariable Long dictId)
     {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+        return ApiResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
@@ -62,11 +55,11 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    public ApiResult add(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
-            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            throw new CustomException("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictTypeService.insertDictType(dict));
@@ -78,11 +71,11 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    public ApiResult edit(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
-            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            throw new CustomException("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictTypeService.updateDictType(dict));
@@ -94,7 +87,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    public ApiResult remove(@PathVariable Long[] dictIds)
     {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return success();
@@ -106,19 +99,19 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
+    public ApiResult refreshCache()
     {
         dictTypeService.resetDictCache();
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 
     /**
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public ApiResult optionselect()
     {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return AjaxResult.success(dictTypes);
+        return ApiResult.success(dictTypes);
     }
 }

src/main/java/com/usky/dxtop/controller/web/SysFileController.java

@@ -1,7 +1,8 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.model.SysFile;
 import com.usky.dxtop.service.SysFileService;
 import com.usky.dxtop.service.vo.SysFileQueryRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,12 +11,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 系统文件
  * @author yq
  * @since 2021-10-09
  */
@@ -26,8 +25,19 @@ public class SysFileController {
     @Autowired
     private SysFileService sysFileService;
 
+
+    /**
+     * 上传文件
+     * @param multipartFiles
+     * @param urls
+     * @param batchNo
+     * @param businessType
+     * @param uploadType
+     * @param expireAt
+     * @return
+     */
     @PostMapping
-    public AjaxResult uploadFile(
+    public ApiResult<List<SysFile>> uploadFile(
             @RequestParam(value = "files",required = false) MultipartFile[] multipartFiles,
             @RequestParam(value = "urls[]",required = false) String[] urls,
             @RequestParam("batchNo") String batchNo,
@@ -41,23 +51,38 @@ public class SysFileController {
         sysFile.setExpriceAt(expireAt);
         sysFile.setFiles(Arrays.asList(multipartFiles));
         sysFile.setUrls(null != urls?Arrays.asList(urls):null);
-        return AjaxResult.success(sysFileService.addFile(sysFile));
+        return ApiResult.success(sysFileService.addFile(sysFile));
     }
 
+    /**
+     * 获取文件
+     * @param sysFileQueryRequest
+     * @return
+     */
     @PostMapping("getFile")
-    public AjaxResult getFile(@RequestBody SysFileQueryRequest sysFileQueryRequest) {
-        return AjaxResult.success(sysFileService.getFile(sysFileQueryRequest));
+    public ApiResult<List<SysFile>> getFile(@RequestBody SysFileQueryRequest sysFileQueryRequest) {
+        return ApiResult.success(sysFileService.getFile(sysFileQueryRequest));
     }
 
+    /**
+     * 生成批次编号
+     * @return
+     */
     @GetMapping("/generateBatchNo")
-    public AjaxResult generateBatchNo() {
-        return AjaxResult.success(sysFileService.generateBatchNo());
+    public ApiResult<String> generateBatchNo() {
+        return ApiResult.success(sysFileService.generateBatchNo());
     }
 
+    /**
+     * 文件生效
+     * @param batchNo
+     * @param ids
+     * @return
+     */
     @PostMapping("/active")
-    public AjaxResult active(@RequestParam("batchNo") String batchNo,
-                             @RequestParam(value = "ids[]",required = false) String[] ids){
-        return AjaxResult.success(sysFileService.active(batchNo,Arrays.asList(ids)));
+    public ApiResult active(@RequestParam("batchNo") String batchNo,
+                            @RequestParam(value = "ids[]",required = false) String[] ids){
+        return ApiResult.success(sysFileService.active(batchNo,Arrays.asList(ids)));
     }
 }
 

src/main/java/com/usky/dxtop/controller/web/SysLoginController.java

@@ -1,7 +1,7 @@
 package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.constant.Constants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginBody;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.utils.ServletUtils;
@@ -17,7 +17,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -48,14 +50,14 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
+    public ApiResult login(@RequestBody LoginBody loginBody)
     {
-        AjaxResult ajax = AjaxResult.success();
+        Map<String,Object> map = new HashMap<>();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid(),null);
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
+        map.put(Constants.TOKEN, token);
+        return ApiResult.success(map);
     }
 
     /**
@@ -65,12 +67,12 @@ public class SysLoginController
      * @return 结果
      */
     @GetMapping("/loginApi")
-    public AjaxResult getToken(@RequestBody LoginBody loginBody)
+    public ApiResult getToken(@RequestBody LoginBody loginBody)
     {
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid(),false);
-        return AjaxResult.success(token);
+        return ApiResult.success(token);
     }
 
     /**
@@ -79,7 +81,7 @@ public class SysLoginController
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
+    public ApiResult getInfo()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
@@ -87,11 +89,11 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", user);
-        ajax.put("roles", roles);
-        ajax.put("permissions", permissions);
-        return ajax;
+        Map<String,Object> map = new HashMap<>();
+        map.put("user", user);
+        map.put("roles", roles);
+        map.put("permissions", permissions);
+        return ApiResult.success(map);
     }
 
     /**
@@ -100,12 +102,12 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
+    public ApiResult getRouters()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息
         SysUser user = loginUser.getUser();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
-        return AjaxResult.success(menuService.buildMenus(menus));
+        return ApiResult.success(menuService.buildMenus(menus));
     }
 }

src/main/java/com/usky/dxtop/controller/web/SysMenuController.java

@@ -1,14 +1,11 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-
-import com.usky.dxtop.common.core.domain.AjaxResult;
-
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
@@ -19,14 +16,11 @@ import com.usky.dxtop.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -49,12 +43,12 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
+    public ApiResult list(SysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return AjaxResult.success(menus);
+        return ApiResult.success(menus);
     }
 
     /**
@@ -62,35 +56,35 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    public ApiResult getInfo(@PathVariable Long menuId)
     {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return ApiResult.success(menuService.selectMenuById(menuId));
     }
 
     /**
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
+    public ApiResult treeselect(SysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        return ApiResult.success(menuService.buildMenuTreeSelect(menus));
     }
 
     /**
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    public ApiResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return ajax;
+        Map<String,Object> map = new HashMap<>();
+        map.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        map.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ApiResult.success(map);
     }
 
     /**
@@ -99,15 +93,15 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    public ApiResult add(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
         {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            throw new CustomException("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
         else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
         {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            throw new CustomException("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(SecurityUtils.getUsername());
         return toAjax(menuService.insertMenu(menu));
@@ -119,19 +113,19 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    public ApiResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
         {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            throw new CustomException("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
         else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
         {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            throw new CustomException("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         else if (menu.getMenuId().equals(menu.getParentId()))
         {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            throw new CustomException("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(menuService.updateMenu(menu));
@@ -143,15 +137,15 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    public ApiResult remove(@PathVariable("menuId") Long menuId)
     {
         if (menuService.hasChildByMenuId(menuId))
         {
-            return AjaxResult.error("存在子菜单,不允许删除");
+            throw new CustomException("存在子菜单,不允许删除");
         }
         if (menuService.checkMenuExistRole(menuId))
         {
-            return AjaxResult.error("菜单已分配,不允许删除");
+            throw new CustomException("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }

src/main/java/com/usky/dxtop/controller/web/SysNoticeController.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.usky.dxtop.common.annotation.Log;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.utils.SecurityUtils;
@@ -53,9 +53,9 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+    public ApiResult getInfo(@PathVariable Long noticeId)
     {
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+        return ApiResult.success(noticeService.selectNoticeById(noticeId));
     }
 
     /**
@@ -64,7 +64,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    public ApiResult add(@Validated @RequestBody SysNotice notice)
     {
         notice.setCreateBy(SecurityUtils.getUsername());
         return toAjax(noticeService.insertNotice(notice));
@@ -76,7 +76,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    public ApiResult edit(@Validated @RequestBody SysNotice notice)
     {
         notice.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(noticeService.updateNotice(notice));
@@ -88,7 +88,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    public ApiResult remove(@PathVariable Long[] noticeIds)
     {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }

src/main/java/com/usky/dxtop/controller/web/SysPostController.java

@@ -1,13 +1,11 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.SysPost;
@@ -15,14 +13,9 @@ import com.usky.dxtop.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -54,9 +47,9 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
+    public ApiResult getInfo(@PathVariable Long postId)
     {
-        return AjaxResult.success(postService.selectPostById(postId));
+        return ApiResult.success(postService.selectPostById(postId));
     }
 
     /**
@@ -65,15 +58,15 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysPost post)
+    public ApiResult add(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
         {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            throw new CustomException("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         }
         else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
         {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            throw new CustomException("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setCreateBy(SecurityUtils.getUsername());
         return toAjax(postService.insertPost(post));
@@ -85,15 +78,15 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    public ApiResult edit(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
         {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            throw new CustomException("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         }
         else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
         {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            throw new CustomException("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(postService.updatePost(post));
@@ -105,7 +98,7 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    public ApiResult remove(@PathVariable Long[] postIds)
     {
         return toAjax(postService.deletePostByIds(postIds));
     }
@@ -114,9 +107,9 @@ public class SysPostController extends BaseController
      * 获取岗位选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public ApiResult optionselect()
     {
         List<SysPost> posts = postService.selectPostAll();
-        return AjaxResult.success(posts);
+        return ApiResult.success(posts);
     }
 }

src/main/java/com/usky/dxtop/controller/web/SysProfileController.java

@@ -3,9 +3,10 @@ package com.usky.dxtop.controller.web;
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.config.DxConfig;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -40,14 +43,15 @@ public class SysProfileController extends BaseController
      * 个人信息
      */
     @GetMapping
-    public AjaxResult profile()
+    public ApiResult profile()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        AjaxResult ajax = AjaxResult.success(user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return ajax;
+        Map<String,Object> map = new HashMap<>();
+        map.put("user",user);
+        map.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        map.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ApiResult.success(map);
     }
 
     /**
@@ -55,17 +59,17 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult updateProfile(@RequestBody SysUser user)
+    public ApiResult updateProfile(@RequestBody SysUser user)
     {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            throw new CustomException("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            throw new CustomException("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser sysUser = loginUser.getUser();
@@ -79,9 +83,9 @@ public class SysProfileController extends BaseController
             loginUser.getUser().setEmail(user.getEmail());
             loginUser.getUser().setSex(user.getSex());
             tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
+            return ApiResult.success();
         }
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
+        throw new CustomException("修改个人信息异常，请联系管理员");
     }
 
     /**
@@ -89,27 +93,27 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    public ApiResult updatePwd(String oldPassword, String newPassword)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password))
         {
-            return AjaxResult.error("修改密码失败，旧密码错误");
+            throw new CustomException("修改密码失败，旧密码错误");
         }
         if (SecurityUtils.matchesPassword(newPassword, password))
         {
-            return AjaxResult.error("新密码不能与旧密码相同");
+            throw new CustomException("新密码不能与旧密码相同");
         }
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
             tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
+            return ApiResult.success();
         }
-        return AjaxResult.error("修改密码异常，请联系管理员");
+        throw new CustomException("修改密码异常，请联系管理员");
     }
 
     /**
@@ -117,7 +121,7 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
-    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    public ApiResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
     {
         if (!file.isEmpty())
         {
@@ -125,14 +129,14 @@ public class SysProfileController extends BaseController
             String avatar = FileUploadUtils.upload(DxConfig.getAvatarPath(), file);
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
             {
-                AjaxResult ajax = AjaxResult.success();
-                ajax.put("imgUrl", avatar);
+                Map<String,Object> map = new HashMap<>();
+                map.put("imgUrl", avatar);
                 // 更新缓存用户头像
                 loginUser.getUser().setAvatar(avatar);
                 tokenService.setLoginUser(loginUser);
-                return ajax;
+                return ApiResult.success(map);
             }
         }
-        return AjaxResult.error("上传图片异常，请联系管理员");
+        throw new CustomException("上传图片异常，请联系管理员");
     }
 }

src/main/java/com/usky/dxtop/controller/web/SysRegisterController.java

@@ -1,7 +1,7 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.RegisterBody;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.framework.web.service.SysRegisterService;
@@ -28,7 +28,7 @@ public class SysRegisterController extends BaseController
     private ISysConfigService configService;
 
     @PostMapping("/register")
-    public AjaxResult register(@RequestBody RegisterBody user)
+    public ApiResult register(@RequestBody RegisterBody user)
     {
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
         {

src/main/java/com/usky/dxtop/controller/web/SysRoleController.java

@@ -1,14 +1,12 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
@@ -22,16 +20,10 @@ import com.usky.dxtop.service.ISysRoleService;
 import com.usky.dxtop.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -69,9 +61,9 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    public ApiResult getInfo(@PathVariable Long roleId)
     {
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+        return ApiResult.success(roleService.selectRoleById(roleId));
     }
 
     /**
@@ -80,15 +72,15 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public ApiResult add(@Validated @RequestBody SysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            throw new CustomException("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
         else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
         {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            throw new CustomException("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(SecurityUtils.getUsername());
         return toAjax(roleService.insertRole(role));
@@ -101,16 +93,16 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public ApiResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            throw new CustomException("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
         else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
         {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            throw new CustomException("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(SecurityUtils.getUsername());
         
@@ -124,9 +116,9 @@ public class SysRoleController extends BaseController
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
             }
-            return AjaxResult.success();
+            return ApiResult.success();
         }
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        throw new CustomException("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
     }
 
     /**
@@ -135,7 +127,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    public ApiResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.authDataScope(role));
@@ -147,7 +139,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    public ApiResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
         role.setUpdateBy(SecurityUtils.getUsername());
@@ -160,7 +152,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    public ApiResult remove(@PathVariable Long[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
@@ -170,9 +162,9 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public ApiResult optionselect()
     {
-        return AjaxResult.success(roleService.selectRoleAll());
+        return ApiResult.success(roleService.selectRoleAll());
     }
 
     /**
@@ -205,7 +197,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    public ApiResult cancelAuthUser(@RequestBody SysUserRole userRole)
     {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
@@ -216,7 +208,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    public ApiResult cancelAuthUserAll(Long roleId, Long[] userIds)
     {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
@@ -227,7 +219,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    public ApiResult selectAuthUserAll(Long roleId, Long[] userIds)
     {
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }

src/main/java/com/usky/dxtop/controller/web/SysUserController.java

@@ -2,9 +2,10 @@ package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
@@ -18,7 +19,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -58,19 +61,19 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public ApiResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
-        AjaxResult ajax = AjaxResult.success();
+        Map<String,Object> ajax = new HashMap();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId))
         {
-            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+            ajax.put("data", userService.selectUserById(userId));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
         }
-        return ajax;
+        return ApiResult.success(ajax);
     }
 
     /**
@@ -79,21 +82,21 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysUser user)
+    public ApiResult add(@Validated @RequestBody SysUser user)
     {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+            throw new CustomException("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
         else if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+            throw new CustomException("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            throw new CustomException("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -106,18 +109,18 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    public ApiResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            throw new CustomException("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            throw new CustomException("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
@@ -129,7 +132,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public ApiResult remove(@PathVariable Long[] userIds)
     {
         return toAjax(userService.deleteUserByIds(userIds));
     }
@@ -140,7 +143,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
+    public ApiResult resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -154,7 +157,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
+    public ApiResult changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -166,14 +169,14 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    public ApiResult authRole(@PathVariable("userId") Long userId)
     {
-        AjaxResult ajax = AjaxResult.success();
+        Map<String,Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         ajax.put("user", user);
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return ajax;
+        return ApiResult.success(ajax);
     }
 
     /**
@@ -182,7 +185,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    public ApiResult insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.insertUserAuth(userId, roleIds);
         return success();

src/main/java/com/usky/dxtop/controller/web/TopChannelController.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.annotation.RepeatSubmit;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 充值渠道
  *
@@ -36,10 +40,10 @@ public class TopChannelController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopChannel topChannel){
+    public ApiResult add(@Validated @RequestBody TopChannel topChannel){
         if (UserConstants.NOT_UNIQUE.equals(topChannelService.checkNameUnique(topChannel)))
         {
-            return AjaxResult.error("新增渠道信息'" + topChannel.getName() + "'失败，渠道信息已存在");
+            throw new CustomException("新增渠道信息'" + topChannel.getName() + "'失败，渠道信息已存在");
         }
         topChannel.setCreateBy(SecurityUtils.getUsername());
         return toAjax(topChannelService.save(topChannel));
@@ -50,11 +54,11 @@ public class TopChannelController extends BaseController {
      * 修改
      */
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody TopChannel topChannel)
+    public ApiResult edit(@Validated @RequestBody TopChannel topChannel)
     {
         if (UserConstants.NOT_UNIQUE.equals(topChannelService.checkNameUnique(topChannel)))
         {
-            return AjaxResult.error("修改渠道信息'" + topChannel.getName() + "'失败，渠道信息已存在");
+            throw new CustomException("修改渠道信息'" + topChannel.getName() + "'失败，渠道信息已存在");
         }
         topChannel.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(topChannelService.updateById(topChannel));
@@ -66,19 +70,24 @@ public class TopChannelController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public AjaxResult page(@RequestParam Integer current,
-                           @RequestParam Integer size,
-                           @RequestParam(required = false) String name)
+    public ApiResult<CommonPage<TopChannel>> page(@RequestParam Integer current,
+                                      @RequestParam Integer size,
+                                      @RequestParam(required = false) String name)
     {
-        return AjaxResult.success(topChannelService.list(current, size, name));
+        return ApiResult.success(topChannelService.list(current, size, name));
     }
 
+    /**
+     * 集合
+     * @param name
+     * @return
+     */
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam(required = false) String name)
+    public ApiResult<List<TopChannel>> list(@RequestParam(required = false) String name)
     {
         LambdaQueryWrapper<TopChannel> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(StringUtils.isNotBlank(name),TopChannel::getName,name);
-        return AjaxResult.success(topChannelService.list(queryWrapper));
+        return ApiResult.success(topChannelService.list(queryWrapper));
     }
 
 
@@ -86,7 +95,7 @@ public class TopChannelController extends BaseController {
      * 删除
      */
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable("id") Long id)
+    public ApiResult remove(@PathVariable("id") Long id)
     {
         return toAjax(topChannelService.remove(id));
     }
@@ -96,8 +105,8 @@ public class TopChannelController extends BaseController {
      * @return
      */
     @GetMapping("/channelOrderMoney")
-    public AjaxResult channelOrderMoney(){
-        return AjaxResult.success(topChannelService.channelOrderMoney());
+    public ApiResult channelOrderMoney(){
+        return ApiResult.success(topChannelService.channelOrderMoney());
     }
 }
 

src/main/java/com/usky/dxtop/controller/web/TopRadioController.java

@@ -3,7 +3,9 @@ package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.annotation.RepeatSubmit;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.TopRadio;
@@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 充值到账比例
  *
@@ -32,10 +36,10 @@ public class TopRadioController extends BaseController {
      */
     @RepeatSubmit
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody TopRadio topRadio){
+    public ApiResult add(@Validated @RequestBody TopRadio topRadio){
         if (UserConstants.NOT_UNIQUE.equals(topRadioService.checkIdentityUnique(topRadio)))
         {
-            return AjaxResult.error("新增身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
+            throw new CustomException("新增身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
         }
         topRadio.setCreateBy(SecurityUtils.getUsername());
         return toAjax(topRadioService.save(topRadio));
@@ -46,11 +50,11 @@ public class TopRadioController extends BaseController {
      * 修改
      */
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody TopRadio topRadio)
+    public ApiResult edit(@Validated @RequestBody TopRadio topRadio)
     {
         if (UserConstants.NOT_UNIQUE.equals(topRadioService.checkIdentityUnique(topRadio)))
         {
-            return AjaxResult.error("修改身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
+            throw new CustomException("修改身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
         }
         topRadio.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(topRadioService.updateById(topRadio));
@@ -62,11 +66,11 @@ public class TopRadioController extends BaseController {
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult list(@RequestParam Integer current,
-                           @RequestParam Integer size,
-                           @RequestParam(required = false) String identity)
+    public ApiResult<CommonPage<TopRadio>> list(@RequestParam Integer current,
+                                      @RequestParam Integer size,
+                                      @RequestParam(required = false) String identity)
     {
-        return AjaxResult.success(topRadioService.list(current, size, identity));
+        return ApiResult.success(topRadioService.list(current, size, identity));
     }
 
 
@@ -74,7 +78,7 @@ public class TopRadioController extends BaseController {
      * 删除
      */
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable("id") Long id)
+    public ApiResult remove(@PathVariable("id") Long id)
     {
         TopRadio topRadio = new TopRadio();
         topRadio.setId(id);
@@ -82,10 +86,13 @@ public class TopRadioController extends BaseController {
         return toAjax(topRadioService.updateById(topRadio));
     }
 
-
+    /**
+     * 获取全部
+     * @return
+     */
     @GetMapping("/all")
-    public AjaxResult all(){
-        return AjaxResult.success(topRadioService.list());
+    public ApiResult<List<TopRadio>> all(){
+        return ApiResult.success(topRadioService.list());
     }
 
 }

src/main/java/com/usky/dxtop/controller/web/WxController.java

@@ -1,6 +1,6 @@
 package com.usky.dxtop.controller.web;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.service.api.TopApiConfiger;
 import com.usky.dxtop.service.api.WxApi;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 微信
  * @author yq
  * @date 2021/9/22 10:04
  */
@@ -22,6 +23,12 @@ public class WxController {
 
     @Autowired
     private WxApi wxApi;
+
+    /**
+     * 微信登录
+     * @param jsCode
+     * @return
+     */
     @GetMapping("/wxLogin")
     public String wxLogin(@RequestParam String jsCode){
         return wxApi.wxLogin(topApiConfiger.getWxAppId(),topApiConfiger.getWxAppSecret(),jsCode);
@@ -33,8 +40,8 @@ public class WxController {
      * @return
      */
     @GetMapping("/wxAccToken")
-    public AjaxResult getAccToken(@RequestParam String url){
-        return AjaxResult.success(wxApi.getPayParam(topApiConfiger.getWxAppId(), topApiConfiger.getWxAppSecret(), url));
+    public ApiResult getAccToken(@RequestParam String url){
+        return ApiResult.success(wxApi.getPayParam(topApiConfiger.getWxAppId(), topApiConfiger.getWxAppSecret(), url));
     }
 
     /**
@@ -42,14 +49,14 @@ public class WxController {
      * @return
      */
     @GetMapping("/accentToken")
-    public AjaxResult getToken(@RequestParam Integer type){
+    public ApiResult<String> getToken(@RequestParam Integer type){
         String token;
         if (1 == type){
             token =  wxApi.getToken(topApiConfiger.getWxAppId(),topApiConfiger.getWxAppSecret());
         }else {
             token =  wxApi.getToken(WxApi.APP_ID,WxApi.SECRET);
         }
-        return AjaxResult.success(token);
+        return ApiResult.success(token);
     }
 
     /**
@@ -61,11 +68,11 @@ public class WxController {
      * @return
      */
     @GetMapping("/offSendMessage")
-    public AjaxResult offSendMessageT(@RequestParam String openId,
-                                  @RequestParam Object data,
-                                  @RequestParam String templateId,
-                                  @RequestParam(required = false) String detailUrl){
-        return AjaxResult.success(wxApi.sendMessageApi(openId, data, wxApi.getToken(WxApi.APP_ID, WxApi.SECRET), templateId, detailUrl));
+    public ApiResult offSendMessageT(@RequestParam String openId,
+                                     @RequestParam Object data,
+                                     @RequestParam String templateId,
+                                     @RequestParam(required = false) String detailUrl){
+        return ApiResult.success(wxApi.sendMessageApi(openId, data, wxApi.getToken(WxApi.APP_ID, WxApi.SECRET), templateId, detailUrl));
     }
 
     /**
@@ -74,7 +81,7 @@ public class WxController {
      * @return
      */
     @GetMapping("/offOpenId")
-    public AjaxResult getOpenId(@RequestParam String code){
-        return AjaxResult.success(wxApi.getOpenId(WxApi.APP_ID, WxApi.SECRET, code));
+    public ApiResult<String> getOpenId(@RequestParam String code){
+        return ApiResult.success(wxApi.getOpenId(WxApi.APP_ID, WxApi.SECRET, code));
     }
 }

src/main/java/com/usky/dxtop/controller/web/monitor/CacheController.java

@@ -1,12 +1,6 @@
 package com.usky.dxtop.controller.web.monitor;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
@@ -16,6 +10,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.*;
+
 
 /**
  * 缓存监控
@@ -31,7 +27,7 @@ public class CacheController
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
+    public ApiResult getInfo() throws Exception
     {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
@@ -50,6 +46,6 @@ public class CacheController
             pieList.add(data);
         });
         result.put("commandStats", pieList);
-        return AjaxResult.success(result);
+        return ApiResult.success(result);
     }
 }

src/main/java/com/usky/dxtop/controller/web/monitor/ServerController.java

@@ -1,6 +1,6 @@
 package com.usky.dxtop.controller.web.monitor;
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,10 +19,10 @@ public class ServerController
 {
     @PreAuthorize("@ss.hasPermi('monitor:server:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
+    public ApiResult getInfo() throws Exception
     {
         Server server = new Server();
         server.copyTo();
-        return AjaxResult.success(server);
+        return ApiResult.success(server);
     }
 }

src/main/java/com/usky/dxtop/controller/web/monitor/SysLogininforController.java

@@ -3,7 +3,7 @@ package com.usky.dxtop.controller.web.monitor;
 import java.util.List;
 
 import com.usky.dxtop.common.annotation.Log;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.controller.BaseController;
@@ -42,7 +42,7 @@ public class SysLogininforController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    public ApiResult remove(@PathVariable Long[] infoIds)
     {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
@@ -50,9 +50,9 @@ public class SysLogininforController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public ApiResult clean()
     {
         logininforService.cleanLogininfor();
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/controller/web/monitor/SysOperlogController.java

@@ -3,7 +3,7 @@ package com.usky.dxtop.controller.web.monitor;
 import java.util.List;
 
 import com.usky.dxtop.common.annotation.Log;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.controller.BaseController;
@@ -43,7 +43,7 @@ public class SysOperlogController extends BaseController
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    public ApiResult remove(@PathVariable Long[] operIds)
     {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
@@ -51,9 +51,9 @@ public class SysOperlogController extends BaseController
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public ApiResult clean()
     {
         operLogService.cleanOperLog();
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/controller/web/monitor/SysUserOnlineController.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.Constants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.core.redis.RedisCache;
@@ -86,9 +86,9 @@ public class SysUserOnlineController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
+    public ApiResult forceLogout(@PathVariable String tokenId)
     {
         redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/framework/interceptor/RepeatSubmitInterceptor.java

@@ -2,7 +2,7 @@ package com.usky.dxtop.framework.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
 import com.usky.dxtop.common.annotation.RepeatSubmit;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.utils.ServletUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
@@ -33,7 +33,7 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
             {
                 if (this.isRepeatSubmit(request))
                 {
-                    AjaxResult apiResult = AjaxResult.error("不允许重复提交，请稍后再试",null);
+                    ApiResult apiResult = ApiResult.error("不允许重复提交，请稍后再试",null);
                     ServletUtils.renderString(response, JSONObject.toJSONString(apiResult));
                     return false;
                 }

src/main/java/com/usky/dxtop/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -2,7 +2,7 @@ package com.usky.dxtop.framework.security.handle;
 
 import com.alibaba.fastjson.JSON;
 import com.usky.dxtop.common.constant.HttpStatus;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import org.springframework.security.core.AuthenticationException;
@@ -29,6 +29,6 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
     {
         int code = HttpStatus.UNAUTHORIZED;
         String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
-        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
+        ServletUtils.renderString(response, JSON.toJSONString(ApiResult.error(String.valueOf(code), msg)));
     }
 }

src/main/java/com/usky/dxtop/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -3,7 +3,7 @@ package com.usky.dxtop.framework.security.handle;
 import com.alibaba.fastjson.JSON;
 import com.usky.dxtop.common.constant.Constants;
 import com.usky.dxtop.common.constant.HttpStatus;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
@@ -50,6 +50,6 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
             // 记录用户退出日志
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
         }
-        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功")));
+        ServletUtils.renderString(response, JSON.toJSONString(ApiResult.error(String.valueOf(HttpStatus.SUCCESS), "退出成功")));
     }
 }

src/main/java/com/usky/dxtop/framework/web/exception/GlobalExceptionHandler.java

@@ -1,7 +1,7 @@
 package com.usky.dxtop.framework.web.exception;
 
 import com.usky.dxtop.common.constant.HttpStatus;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.exception.BaseException;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.exception.DemoModeException;
@@ -31,68 +31,68 @@ public class GlobalExceptionHandler
      * 基础异常
      */
     @ExceptionHandler(BaseException.class)
-    public AjaxResult baseException(BaseException e)
+    public ApiResult baseException(BaseException e)
     {
-        return AjaxResult.error(e.getMessage());
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR), e.getMessage());
     }
 
     /**
      * 业务异常
      */
     @ExceptionHandler(CustomException.class)
-    public AjaxResult businessException(CustomException e)
+    public ApiResult businessException(CustomException e)
     {
         if (StringUtils.isNull(e.getCode()))
         {
-            return AjaxResult.error(e.getMessage());
+            return ApiResult.error(String.valueOf(HttpStatus.ERROR),e.getMessage());
         }
-        return AjaxResult.error(e.getCode(), e.getMessage());
+        return ApiResult.error(String.valueOf(e.getCode()), e.getMessage());
     }
 
     @ExceptionHandler(NoHandlerFoundException.class)
-    public AjaxResult handlerNoFoundException(Exception e)
+    public ApiResult handlerNoFoundException(Exception e)
     {
         log.error(e.getMessage(), e);
-        return AjaxResult.error(HttpStatus.NOT_FOUND, "路径不存在，请检查路径是否正确");
+        return ApiResult.error(String.valueOf(HttpStatus.NOT_FOUND), "路径不存在，请检查路径是否正确");
     }
 
     @ExceptionHandler(AccessDeniedException.class)
-    public AjaxResult handleAuthorizationException(AccessDeniedException e)
+    public ApiResult handleAuthorizationException(AccessDeniedException e)
     {
         log.error(e.getMessage());
-        return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
+        return ApiResult.error(String.valueOf(HttpStatus.FORBIDDEN), "没有权限，请联系管理员授权");
     }
 
     @ExceptionHandler(AccountExpiredException.class)
-    public AjaxResult handleAccountExpiredException(AccountExpiredException e)
+    public ApiResult handleAccountExpiredException(AccountExpiredException e)
     {
         log.error(e.getMessage(), e);
-        return AjaxResult.error(e.getMessage());
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),e.getMessage());
     }
 
     @ExceptionHandler(UsernameNotFoundException.class)
-    public AjaxResult handleUsernameNotFoundException(UsernameNotFoundException e)
+    public ApiResult handleUsernameNotFoundException(UsernameNotFoundException e)
     {
         log.error(e.getMessage(), e);
-        return AjaxResult.error(e.getMessage());
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),e.getMessage());
     }
 
     @ExceptionHandler(Exception.class)
-    public AjaxResult handleException(Exception e)
+    public ApiResult handleException(Exception e)
     {
         log.error(e.getMessage(), e);
-        return AjaxResult.error(e.getMessage());
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),e.getMessage());
     }
 
     /**
      * 自定义验证异常
      */
     @ExceptionHandler(BindException.class)
-    public AjaxResult validatedBindException(BindException e)
+    public ApiResult validatedBindException(BindException e)
     {
         log.error(e.getMessage(), e);
         String message = e.getAllErrors().get(0).getDefaultMessage();
-        return AjaxResult.error(message);
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),message);
     }
 
     /**
@@ -103,15 +103,15 @@ public class GlobalExceptionHandler
     {
         log.error(e.getMessage(), e);
         String message = e.getBindingResult().getFieldError().getDefaultMessage();
-        return AjaxResult.error(message);
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),message);
     }
 
     /**
      * 演示模式异常
      */
     @ExceptionHandler(DemoModeException.class)
-    public AjaxResult demoModeException(DemoModeException e)
+    public ApiResult demoModeException(DemoModeException e)
     {
-        return AjaxResult.error("演示模式，不允许操作");
+        return ApiResult.error(String.valueOf(HttpStatus.ERROR),"演示模式，不允许操作");
     }
 }

src/main/java/com/usky/dxtop/quartz/controller/SysJobController.java

@@ -2,7 +2,7 @@ package com.usky.dxtop.quartz.controller;
 
 
 import com.usky.dxtop.common.constant.Constants;
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.exception.job.TaskException;
 import com.usky.dxtop.common.utils.SecurityUtils;
@@ -47,9 +47,9 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{jobId}")
-    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
+    public ApiResult getInfo(@PathVariable("jobId") Long jobId)
     {
-        return AjaxResult.success(jobService.selectJobById(jobId));
+        return ApiResult.success(jobService.selectJobById(jobId));
     }
 
     /**
@@ -57,7 +57,7 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:add')")
     @PostMapping
-    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
+    public ApiResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
     {
         if (!CronUtils.isValid(job.getCronExpression()))
         {
@@ -80,7 +80,7 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
     @PutMapping
-    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+    public ApiResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
     {
         if (!CronUtils.isValid(job.getCronExpression()))
         {
@@ -103,7 +103,7 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
+    public ApiResult changeStatus(@RequestBody SysJob job) throws SchedulerException
     {
         SysJob newJob = jobService.selectJobById(job.getJobId());
         newJob.setStatus(job.getStatus());
@@ -115,10 +115,10 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @PutMapping("/run")
-    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
+    public ApiResult run(@RequestBody SysJob job) throws SchedulerException
     {
         jobService.run(job);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 
     /**
@@ -126,9 +126,9 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @DeleteMapping("/{jobIds}")
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+    public ApiResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
     {
         jobService.deleteJobByIds(jobIds);
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }

src/main/java/com/usky/dxtop/quartz/controller/SysJobLogController.java

@@ -1,7 +1,7 @@
 package com.usky.dxtop.quartz.controller;
 
 
-import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.quartz.domain.SysJobLog;
@@ -42,9 +42,9 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long jobLogId)
+    public ApiResult getInfo(@PathVariable Long jobLogId)
     {
-        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
+        return ApiResult.success(jobLogService.selectJobLogById(jobLogId));
     }
 
 
@@ -53,7 +53,7 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @DeleteMapping("/{jobLogIds}")
-    public AjaxResult remove(@PathVariable Long[] jobLogIds)
+    public ApiResult remove(@PathVariable Long[] jobLogIds)
     {
         return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
     }
@@ -63,9 +63,9 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public ApiResult clean()
     {
         jobLogService.cleanJobLog();
-        return AjaxResult.success();
+        return ApiResult.success();
     }
 }