소스 검색

设置返回值

yq 3 년 전
부모
커밋
21549e7e99

+ 5 - 5
src/main/java/com/usky/dxtop/controller/web/CompanyController.java

@@ -9,12 +9,11 @@ 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;
-import com.usky.dxtop.service.SysFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 产品
+ * 产品信息
  * @author yq
  * @since 2021-09-29
  */
@@ -25,8 +24,7 @@ public class CompanyController extends BaseController {
 
     @Autowired
     private CompanyService companyService;
-    @Autowired
-    private SysFileService sysFileService;
+
     /**
      * 新增
      * @param company
@@ -54,7 +52,9 @@ public class CompanyController extends BaseController {
 
     /**
      * 分页
-     * @param
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
      * @return
      */
     @GetMapping("/list")

+ 3 - 1
src/main/java/com/usky/dxtop/controller/web/QrCodeController.java

@@ -59,7 +59,9 @@ public class QrCodeController extends BaseController {
 
     /**
      * 分页
-     * @param
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
      * @return
      */
     @GetMapping("/list")

+ 4 - 2
src/main/java/com/usky/dxtop/controller/web/TopChannelController.java

@@ -65,8 +65,10 @@ public class TopChannelController extends BaseController {
     }
 
     /**
-     * 分页
-     * @param
+     *
+     * @param current 页数
+     * @param size 条数
+     * @param name 名称
      * @return
      */
     @GetMapping("/page")

+ 4 - 2
src/main/java/com/usky/dxtop/controller/web/TopRadioController.java

@@ -61,8 +61,10 @@ public class TopRadioController extends BaseController {
     }
 
     /**
-     * 分页
-     * @param
+     *
+     * @param current 页数
+     * @param size 条数
+     * @param identity 身份信息
      * @return
      */
     @GetMapping("/list")

+ 3 - 3
src/main/java/com/usky/dxtop/controller/web/WxController.java

@@ -30,8 +30,8 @@ public class WxController {
      * @return
      */
     @GetMapping("/wxLogin")
-    public String wxLogin(@RequestParam String jsCode){
-        return wxApi.wxLogin(topApiConfiger.getWxAppId(),topApiConfiger.getWxAppSecret(),jsCode);
+    public ApiResult<String> wxLogin(@RequestParam String jsCode){
+        return ApiResult.success(wxApi.wxLogin(topApiConfiger.getWxAppId(), topApiConfiger.getWxAppSecret(), jsCode));
     }
 
     /**
@@ -68,7 +68,7 @@ public class WxController {
      * @return
      */
     @GetMapping("/offSendMessage")
-    public ApiResult offSendMessageT(@RequestParam String openId,
+    public ApiResult<String> offSendMessageT(@RequestParam String openId,
                                      @RequestParam Object data,
                                      @RequestParam String templateId,
                                      @RequestParam(required = false) String detailUrl){

+ 1 - 1
src/main/java/com/usky/dxtop/framework/interceptor/RepeatSubmitInterceptor.java

@@ -33,7 +33,7 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
             {
                 if (this.isRepeatSubmit(request))
                 {
-                    ApiResult apiResult = ApiResult.error("不允许重复提交,请稍后再试",null);
+                    ApiResult apiResult = ApiResult.error("不允许重复提交,请稍后再试","不允许重复提交,请稍后再试");
                     ServletUtils.renderString(response, JSONObject.toJSONString(apiResult));
                     return false;
                 }

+ 1 - 2
src/main/java/com/usky/dxtop/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -2,7 +2,6 @@ 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.ApiResult;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.utils.ServletUtils;
@@ -50,6 +49,6 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
             // 记录用户退出日志
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
         }
-        ServletUtils.renderString(response, JSON.toJSONString(ApiResult.error(String.valueOf(HttpStatus.SUCCESS), "退出成功")));
+        ServletUtils.renderString(response, JSON.toJSONString(ApiResult.success("退出成功")));
     }
 }

+ 6 - 6
src/main/resources/smart-doc.json

@@ -4,12 +4,12 @@
   "isStrict": false,
   "coverOld": true,
   "allInOne": true,
-  "packageFilters": "com.usky.dxtop.controller.web.ChargeController,com.usky.dxtop.controller.web.DishController,com.usky.dxtop.controller.web.ApiLoginController",
+  "packageFilters": "com.usky.dxtop.controller.web",
   "requestExample":"false",
   "responseExample":"true",
-  "projectName": "mhfire",
-  "appKey": "20210816876780111989309440",
-  "appToken":"33826dd2207a4e60a03b7c8dce29651a",
-  "secret": "8Hu.QnM2JN.$AcH5kvFr-7@.3qcaf6an",
-  "openUrl": "http://localhost:7700/api"
+  "projectName": "东信充值",
+  "appKey": "20211216921084883495813120",
+  "appToken":"14772ccca12648228c78c21246d7fe94",
+  "secret": "N@Pd,KXAHki*BW3=zK.XPNykf!=CM79J",
+  "openUrl": "http://101.133.214.75:7700/api"
 }