接口完善

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

@@ -33,7 +33,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 初始化一个新创建的 AjaxResult 对象
-     * 
+     *
      * @param code 状态码
      * @param msg 返回内容
      */
@@ -45,7 +45,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 初始化一个新创建的 AjaxResult 对象
-     * 
+     *
      * @param code 状态码
      * @param msg 返回内容
      * @param data 数据对象
@@ -62,7 +62,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回成功消息
-     * 
+     *
      * @return 成功消息
      */
     public static AjaxResult success()
@@ -72,7 +72,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回成功数据
-     * 
+     *
      * @return 成功消息
      */
     public static AjaxResult success(Object data)
@@ -82,7 +82,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回成功消息
-     * 
+     *
      * @param msg 返回内容
      * @return 成功消息
      */
@@ -93,7 +93,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回成功消息
-     * 
+     *
      * @param msg 返回内容
      * @param data 数据对象
      * @return 成功消息
@@ -105,7 +105,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回错误消息
-     * 
+     *
      * @return
      */
     public static AjaxResult error()
@@ -115,7 +115,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回错误消息
-     * 
+     *
      * @param msg 返回内容
      * @return 警告消息
      */
@@ -126,7 +126,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回错误消息
-     * 
+     *
      * @param msg 返回内容
      * @param data 数据对象
      * @return 警告消息
@@ -138,7 +138,7 @@ public class AjaxResult extends HashMap<String, Object>
 
     /**
      * 返回错误消息
-     * 
+     *
      * @param code 状态码
      * @param msg 返回内容
      * @return 警告消息

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

@@ -1,97 +0,0 @@
-package com.usky.dxtop.common.core.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.beans.Transient;
-import java.io.Serializable;
-
-
-/**
- * <p>Api 调用结果统一包装类</p>
- *
- * @param <T>
- * @author chenpeng
- * Create time 2018年11月30日 下午5:17:42
- */
-@Data
-@ApiModel(description = "API 响应结果")
-public class ApiResult<T> implements Serializable {
-
-    private static final long serialVersionUID = 5247512550376272642L;
-
-    private static final String SUCCESS_CODE = "0";
-
-    @ApiModelProperty(value = "状态", required = true)
-    private ResultStatus status;
-
-    @ApiModelProperty(value = "状态码", required = true)
-    private String code;
-
-    @ApiModelProperty(value = "消息")
-    private String msg;
-
-    @ApiModelProperty(value = "内容")
-    private T data;
-
-    @ApiModelProperty(value = "异常类")
-    private String exception;
-
-    public ApiResult() {
-    }
-
-    public ApiResult(T content) {
-        this.status = ResultStatus.SUCCESS;
-        this.code = SUCCESS_CODE;
-        this.data = content;
-    }
-
-    public ApiResult(String code, String message) {
-        this.status = ResultStatus.ERROR;
-        this.code = code;
-        this.msg = message;
-    }
-
-    public static <T> ApiResult<T> success(T content) {
-        return new ApiResult<>(content);
-    }
-
-    public static ApiResult<Void> success() {
-        return new ApiResult<>(null);
-    }
-
-    public static <T> ApiResult<T> error(String code, String message) {
-        return new ApiResult<>(code, message);
-    }
-
-    public static <T> ApiResult<T> error(String code, String exception, String message) {
-        ApiResult<T> apiResult = new ApiResult<>(code, message);
-        apiResult.setException(exception);
-        return apiResult;
-    }
-
-    @Transient
-    public boolean isSuccess() {
-        return ResultStatus.SUCCESS == status;
-    }
-
-    @Transient
-    public boolean isError() {
-        return !isSuccess();
-    }
-
-    /**
-     * 业务响应状态
-     */
-    public enum ResultStatus {
-        /**
-         * 返回状态：成功
-         */
-        SUCCESS,
-        /**
-         * 返回状态：失败
-         */
-        ERROR
-    }
-}

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

@@ -0,0 +1,37 @@
+package com.usky.dxtop.controller.web;
+
+import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.domain.model.LoginBody;
+import com.usky.dxtop.framework.web.service.SysLoginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 登录
+ * @author yq
+ * @date 2021/9/17 11:08
+ */
+@RestController
+public class ApiLoginController {
+
+
+    @Autowired
+    private SysLoginService loginService;
+
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/loginApi")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid(),false);
+        return AjaxResult.success(token);
+    }
+}

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

@@ -1,12 +1,11 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.ApiResult;
-import com.usky.dxtop.common.core.page.CommonPage;
-import com.usky.dxtop.model.Charge;
+import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.service.ChargeService;
 import com.usky.dxtop.service.vo.ChargeRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -29,8 +28,8 @@ public class ChargeController {
      * @return
      */
     @PostMapping("/page")
-    public ApiResult<CommonPage<Charge>> page(@RequestBody ChargeRequest chargeRequest){
-        return ApiResult.success(chargeService.page(chargeRequest));
+    public AjaxResult page(@Validated @RequestBody ChargeRequest chargeRequest){
+        return AjaxResult.success(chargeService.page(chargeRequest));
     }
 
     /**
@@ -39,8 +38,8 @@ public class ChargeController {
      * @return
      */
     @GetMapping(value = "/{seq}")
-    public ApiResult<Charge> one(@PathVariable Long seq){
-        return ApiResult.success(chargeService.one(seq));
+    public AjaxResult one(@PathVariable Long seq){
+        return AjaxResult.success(chargeService.one(seq));
     }
 
 

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

@@ -1,12 +1,11 @@
 package com.usky.dxtop.controller.web;
 
 
-import com.usky.dxtop.common.core.domain.ApiResult;
-import com.usky.dxtop.common.core.page.CommonPage;
-import com.usky.dxtop.model.Dish;
+import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.service.DishService;
 import com.usky.dxtop.service.vo.DishRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -30,8 +29,8 @@ public class DishController {
      * @return
      */
     @PostMapping("page")
-    public ApiResult<CommonPage<Dish>> page(@RequestBody DishRequest dishRequest){
-        return ApiResult.success(dishService.page(dishRequest));
+    public AjaxResult page(@Validated @RequestBody DishRequest dishRequest){
+        return AjaxResult.success(dishService.page(dishRequest));
     }
 
     /**
@@ -40,8 +39,8 @@ public class DishController {
      * @return
      */
     @GetMapping(value = "/{seq}")
-    public ApiResult<Dish> one(@PathVariable Long seq){
-        return ApiResult.success(dishService.one(seq));
+    public AjaxResult one(@PathVariable Long seq){
+        return AjaxResult.success(dishService.one(seq));
     }
 }
 

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

@@ -3,29 +3,13 @@ package com.usky.dxtop.controller.web;
 
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.domain.AjaxResult;
-import com.usky.dxtop.common.core.page.TableDataInfo;
-import com.usky.dxtop.common.exception.CustomException;
-import com.usky.dxtop.common.utils.QRCodeUtil;
 import com.usky.dxtop.common.utils.SecurityUtils;
-import com.usky.dxtop.common.utils.file.FileUtils;
-import com.usky.dxtop.common.utils.sign.Base64;
-import com.usky.dxtop.common.utils.spring.GlobalUtils;
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.QrCode;
-import com.usky.dxtop.model.TopRadio;
 import com.usky.dxtop.service.QrCodeService;
-import com.usky.dxtop.service.TopRadioService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.*;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.util.List;
-
 /**
  *  二维码管理
  *

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

@@ -1,8 +1,5 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-import java.util.Set;
-
 import com.usky.dxtop.common.constant.Constants;
 import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.common.core.domain.model.LoginBody;
@@ -15,13 +12,14 @@ import com.usky.dxtop.model.SysMenu;
 import com.usky.dxtop.model.SysUser;
 import com.usky.dxtop.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Set;
+
 
 /**
  * 登录验证
@@ -55,7 +53,7 @@ public class SysLoginController
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+                loginBody.getUuid(),null);
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }

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

@@ -1,18 +1,13 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 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.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.utils.SecurityUtils;
-import com.usky.dxtop.common.utils.ServletUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
-import com.usky.dxtop.framework.web.service.TokenService;
 import com.usky.dxtop.model.SysRole;
 import com.usky.dxtop.model.SysUser;
 import com.usky.dxtop.service.ISysPostService;
@@ -20,16 +15,11 @@ 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;
+import java.util.stream.Collectors;
 
 
 

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

@@ -5,21 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.domain.AjaxResult;
-import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
-import com.usky.dxtop.model.Order;
 import com.usky.dxtop.model.TopChannel;
-import com.usky.dxtop.model.TopRadio;
 import com.usky.dxtop.service.TopChannelService;
-import com.usky.dxtop.service.TopRadioService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 充值渠道
  *
@@ -71,8 +64,8 @@ public class TopChannelController extends BaseController {
      */
     @GetMapping("/page")
     public AjaxResult page(@RequestParam Integer current,
-                              @RequestParam Integer size,
-                              @RequestParam(required = false) String name)
+                           @RequestParam Integer size,
+                           @RequestParam(required = false) String name)
     {
         return AjaxResult.success(topChannelService.list(current, size, name));
     }

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

@@ -1,27 +1,15 @@
 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.page.TableDataInfo;
-import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.controller.BaseController;
-import com.usky.dxtop.model.SysConfig;
-import com.usky.dxtop.model.SysDictData;
 import com.usky.dxtop.model.TopRadio;
-import com.usky.dxtop.service.ISysConfigService;
 import com.usky.dxtop.service.TopRadioService;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 充值到账比例
  *

src/main/java/com/usky/dxtop/framework/config/SecurityConfig.java

@@ -98,7 +98,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/top/notify","/dxtop/order/topScanPayApi").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/top/notify","/dxtop/order/topScanPayApi","/loginApi").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

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

@@ -1,16 +1,16 @@
 package com.usky.dxtop.framework.interceptor;
 
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+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.utils.ServletUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import com.alibaba.fastjson.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 
 /**
@@ -33,8 +33,8 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
             {
                 if (this.isRepeatSubmit(request))
                 {
-                    AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
-                    ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+                    AjaxResult apiResult = AjaxResult.error("500","不允许重复提交，请稍后再试");
+                    ServletUtils.renderString(response, JSONObject.toJSONString(apiResult));
                     return false;
                 }
             }

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

@@ -19,7 +19,7 @@ import org.springframework.web.servlet.NoHandlerFoundException;
 
 /**
  * 全局异常处理器
- * 
+ *
  * @author ruoyi
  */
 @RestControllerAdvice

src/main/java/com/usky/dxtop/framework/web/service/SysLoginService.java

@@ -1,7 +1,5 @@
 package com.usky.dxtop.framework.web.service;
 
-import javax.annotation.Resource;
-
 import com.usky.dxtop.common.constant.Constants;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.core.redis.RedisCache;
@@ -25,6 +23,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 
 /**
  * 登录校验方法
@@ -58,9 +58,11 @@ public class SysLoginService
      * @param uuid 唯一标识
      * @return 结果
      */
-    public String login(String username, String password, String code, String uuid)
+    public String login(String username, String password, String code, String uuid,Boolean captchaOnOff)
     {
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        if (null == captchaOnOff){
+            captchaOnOff = configService.selectCaptchaOnOff();
+        }
         // 验证码开关
         if (captchaOnOff)
         {

src/main/java/com/usky/dxtop/service/vo/ChargeRequest.java

@@ -2,6 +2,9 @@ package com.usky.dxtop.service.vo;
 
 import lombok.Data;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -30,10 +33,14 @@ public class ChargeRequest {
     /**
      * 页数
      */
+    @NotNull
+    @Min(value = 1,message = "页数不能为0")
     private Integer current;
     /**
      * 条数
      */
+    @NotNull
+    @Max(value = 500,message = "条数不能超过500")
     private Integer size;
     /**
      * 用戶id

src/main/java/com/usky/dxtop/service/vo/DishRequest.java

@@ -2,6 +2,9 @@ package com.usky.dxtop.service.vo;
 
 import lombok.Data;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -29,10 +32,14 @@ public class DishRequest {
     /**
      * 页数
      */
+    @NotNull
+    @Min(value = 1,message = "页数不能为0")
     private Integer current;
     /**
      * 条数
      */
+    @NotNull
+    @Max(value = 500,message = "条数不能超过500")
     private Integer size;
     /**
      * 用戶id

src/main/resources/smart-doc.json

@@ -1,10 +1,10 @@
 {
   "outPath":"./src/main/resources/static/doc",
-  "serverUrl": "http://172.16.120.104",
+  "serverUrl": "http://https://wx.ewoogi.com/dxapi",
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,
-  "packageFilters": "com.usky.dxtop.controller.web",
+  "packageFilters": "com.usky.dxtop.controller.web.ChargeController,com.usky.dxtop.controller.web.DishController,com.usky.dxtop.controller.web.ApiLoginController",
   "requestExample":"false",
   "responseExample":"true",
   "projectName": "mhfire",