Merge branch 'feature-ResponseUtils' into 'master'

优化Response

See merge request !202

src/main/java/com/edgec/browserbackend/browser/controller/ConfigController.java

@@ -3,6 +3,7 @@ package com.edgec.browserbackend.browser.controller;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,77 +11,74 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * @Desc
- * @Author jason
- * @CreateTime 2020/3/11 7:52 下午
- **/
+ * @author jason
+ */
 @RestController
 @RequestMapping("/config")
 public class ConfigController {
 
-    private final Logger log = LoggerFactory.getLogger(ConfigController.class);
-
     @Autowired
     private IpResourceService ipResourceService;
 
+    private final Logger log = LoggerFactory.getLogger(ConfigController.class);
+
+    /**
+     * 获取ip配置选项
+     *
+     * @return ResultDto
+     */
     @RequestMapping(value = "/ipOptions", method = RequestMethod.POST)
     public ResultDto getIpOptions() {
-        ResultDto resultDto = new ResultDto();
         String logs = "【getIpOptions】 ";
-        log.info("{}, params : ", logs);
         try {
-            resultDto.setData(ipResourceService.getIpOptions());
-            resultDto.setStatus(0);
-        }catch (ClientRequestException e) {
+            return ResponseUtil.success(ipResourceService.getIpOptions());
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
+        } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
-            resultDto.setStatus(-1);
-            Map<String, Object> statusInfo = new HashMap<>();
-            statusInfo.put("code", e.getErrorCode());
-            statusInfo.put("message", e.getMessage());
-            resultDto.setStatusInfo(statusInfo);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
+    /**
+     * todo--不知道
+     *
+     * @return ResultDto
+     */
     @RequestMapping(value = "/setipOptions", method = RequestMethod.POST)
     public ResultDto setIpOptions() {
-        ResultDto resultDto = new ResultDto();
         String logs = "【setIpOptions】 ";
-        log.info("{}, params : ", logs);
         try {
             ipResourceService.setIpOptions();
-            resultDto.setStatus(0);
-        }catch (ClientRequestException e) {
+            return ResponseUtil.success();
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
+        } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
-            resultDto.setStatus(-1);
-            Map<String, Object> statusInfo = new HashMap<>();
-            statusInfo.put("code", e.getErrorCode());
-            statusInfo.put("message", e.getMessage());
-            resultDto.setStatusInfo(statusInfo);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
+    /**
+     * 获取所属平台配置选项
+     *
+     * @return ResultDto
+     */
     @RequestMapping(value = "/platformOptions", method = RequestMethod.POST)
     public ResultDto getPlatformOptions() {
-        ResultDto resultDto = new ResultDto();
         String logs = "【getPlatformOptions】 ";
-        log.info("{}, params : ", logs);
         try {
-            resultDto.setData(ipResourceService.getPlatformOptions());
-            resultDto.setStatus(0);
-        }catch (ClientRequestException e) {
+            return ResponseUtil.success(ipResourceService.getPlatformOptions());
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
+        } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
-            resultDto.setStatus(-1);
-            Map<String, Object> statusInfo = new HashMap<>();
-            statusInfo.put("code", e.getErrorCode());
-            statusInfo.put("message", e.getMessage());
-            resultDto.setStatusInfo(statusInfo);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 }

src/main/java/com/edgec/browserbackend/browser/controller/GlobalFieldController.java

@@ -2,6 +2,8 @@ package com.edgec.browserbackend.browser.controller;
 
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.service.GlobalFieldService;
+import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,31 +11,30 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
 /**
  * @author xuxin
- * @date 2020/8/3 18:28
- * @description
  */
 @RestController
 @RequestMapping("/globalfield")
 public class GlobalFieldController {
 
-    private final Logger log = LoggerFactory.getLogger(GroupController.class);
+    private final Logger log = LoggerFactory.getLogger(GlobalFieldController.class);
 
     @Autowired
     private GlobalFieldService globalFieldService;
 
     @GetMapping("/speciallinestate")
     public ResultDto querySpecialLineState() {
-        ResultDto resultDto = new ResultDto();
-        String logs = "【addGroup】 ";
-        log.info("{}, params :", logs);
+        String logs = "【querySpecialLineState】 ";
         try {
-            resultDto.setStatus(0);
-            resultDto.setData(globalFieldService.querySpecialLineState());
-        }catch (Exception e){
+            return ResponseUtil.success(globalFieldService.querySpecialLineState());
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
+        } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 }

src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java

@@ -92,7 +92,7 @@ public class ShopController {
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
             shopResultDto.setShopCookie("");
-            log.error("{} step-2, Exception : {},{},{}", logs, principal.getName(), JSONObject.toJSONString(shopResultDto), e.getMessage(), e);
+            log.warn("{} step-2, Exception : {},{},{}", logs, principal.getName(), JSONObject.toJSONString(shopResultDto), e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;

src/main/java/com/edgec/browserbackend/browser/controller/VpsController.java

@@ -7,6 +7,8 @@ import com.edgec.browserbackend.browser.dto.AssignVpsDto;
 import com.edgec.browserbackend.browser.dto.PageInfo;
 import com.edgec.browserbackend.browser.dto.VpsPageResultDto;
 import com.edgec.browserbackend.browser.service.VpsService;
+import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import com.edgec.browserbackend.common.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +23,6 @@ import java.util.List;
 
 /**
  * @author xuxin
- * @date 2020/8/13 11:49
- * @description
  */
 @RestController
 @RequestMapping("/vps")
@@ -35,45 +35,50 @@ public class VpsController {
 
     @PostMapping("/add")
     public ResultDto addVps(Principal principal, @Validated @RequestBody Vps vps) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【addVps】 ";
         log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(vps));
         try {
             vps.setOwner1(principal.getName());
-            String s = vpsService.addVps(vps);
-            resultDto.setData(s);
+            return ResponseUtil.success(vpsService.addVps(vps));
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     @DeleteMapping("/{id}")
     public ResultDto deleteVps(Principal principal, @PathVariable String id) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【deleteVps】 ";
         log.info("{}, params : {}, {}", logs, principal.getName(), id);
         try {
             vpsService.deleteVps(principal.getName(), id);
-            resultDto.setStatus(0);
+            return ResponseUtil.success();
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     @PutMapping("/update")
     public ResultDto updateVps(@RequestBody Vps vps) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【updateVps】 ";
         log.info("{}, params : {}", logs, JSONObject.toJSONString(vps));
         try {
             vpsService.updateVps(vps);
-            resultDto.setStatus(0);
+            return ResponseUtil.success();
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     /**
@@ -81,17 +86,17 @@ public class VpsController {
      */
     @GetMapping("/login_vps/{id}")
     public ResultDto getVps(@PathVariable String id) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【getVps】 ";
         log.info("{}, params : {}", logs, id);
         try {
-            String rdp = vpsService.loginVps(id);
-            resultDto.setStatus(0);
-            resultDto.setData(rdp);
+            return ResponseUtil.success(vpsService.loginVps(id));
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     /**
@@ -99,24 +104,24 @@ public class VpsController {
      */
     @GetMapping("/list")
     public ResultDto getVpsList(Principal principal, @RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【getVpsList】 ";
         log.info("{}, params : {}, {}, {}", logs, principal.getName(), page, size);
         try {
             Pageable pageable = PageRequest.of(page, size);
             Page<Vps> pageInfo = vpsService.queryPage(principal.getName(), pageable);
+            ResultDto resultDto = new ResultDto();
             resultDto.setData(pageInfo);
 
             /// 临时这样写，有空了得去掉下面三行
             PageInfo pageResult = new PageInfo(pageInfo.getPageable().getPageNumber(), pageInfo.getTotalPages(), (int) pageInfo.getTotalElements());
-            VpsPageResultDto<Vps> shopPageResultDto = new VpsPageResultDto<>(pageInfo.getContent(), pageResult);
-            resultDto.setData(shopPageResultDto);
-
-            resultDto.setStatus(0);
+            return ResponseUtil.success(new VpsPageResultDto<>(pageInfo.getContent(), pageResult));
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     /**
@@ -124,21 +129,18 @@ public class VpsController {
      */
     @PostMapping("/assign")
     public ResultDto assignVpsList(Principal principal, @RequestBody AssignVpsDto assignVpsDto) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【assignVpsList】 ";
         log.info("{}, params : {}", logs, JSONObject.toJSONString(assignVpsDto));
         try {
             List<String> list = vpsService.assignVpsList(principal.getName(), assignVpsDto);
-            if (list.isEmpty()) {
-                resultDto.setStatus(0);
-            } else {
-                resultDto.setStatus(-1);
-                resultDto.setData(list);
-            }
+            return list.isEmpty() ? ResponseUtil.success() : ResponseUtil.error(list);
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
     /**
@@ -146,17 +148,17 @@ public class VpsController {
      */
     @GetMapping("/list/{id}")
     public ResultDto getVpsList(Principal principal, @PathVariable String id) {
-        ResultDto resultDto = new ResultDto();
         String logs = "【getVpsList】 ";
         log.info("{}, params : {}", logs, id);
         try {
-            List<String> list = vpsService.queryAssignUserList(principal.getName(), id);
-            resultDto.setData(list);
-            resultDto.setStatus(0);
+            return ResponseUtil.success(vpsService.queryAssignUserList(principal.getName(), id));
+        } catch (ClientRequestException e) {
+            log.warn("{}, ClientRequestException : {}", logs, e.getErrorCode().getReason());
+            return ResponseUtil.error(e.getErrorCode());
         } catch (Exception e) {
             log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            return ResponseUtil.error(e.getMessage());
         }
-        return resultDto;
     }
 
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -195,7 +195,7 @@ public class ShopServiceImpl implements ShopService {
         UserShop userShop = userShopRepository.findByUsernameAndShopId(username, shopResultDto.getShopId());
         if (userShop == null) {
             shopResultDto.setShopCookie("");
-            logger.error("{} step-1, Exception : {},{}", "【updateShop】 ", username, JSONObject.toJSONString(shopResultDto));
+            logger.warn("{} step-1, Exception : {},{}", "【updateShop】 ", username, JSONObject.toJSONString(shopResultDto));
             throw new ClientRequestException(BrowserErrorCode.SHOPNOTEXIST);
         }
 

src/main/java/com/edgec/browserbackend/common/utils/ResponseUtil.java

+package com.edgec.browserbackend.common.utils;
+
+import com.edgec.browserbackend.account.dto.ResultDto;
+import com.edgec.browserbackend.common.commons.error.ErrorCode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author JMW
+ */
+public class ResponseUtil {
+
+    /**成功且带数据**/
+    public static ResultDto success(Object object){
+        ResultDto result = new ResultDto();
+        result.setStatus(0);
+        result.setData(object);
+        return result;
+    }
+
+    /**成功但不带数据**/
+    public static ResultDto success(){
+        return success(null);
+    }
+
+    /**失败**/
+    public static ResultDto error(ErrorCode errorCode){
+        ResultDto result = new ResultDto();
+        result.setStatus(-1);
+        Map<String, Object> statusInfo = new HashMap<>(16);
+        statusInfo.put("code", errorCode);
+        statusInfo.put("message", errorCode.getReason());
+        result.setStatusInfo(statusInfo);
+        return result;
+    }
+
+    /**失败**/
+    public static ResultDto error(String message){
+        ResultDto result = new ResultDto();
+        result.setStatus(-1);
+        Map<String, Object> statusInfo = new HashMap<>(16);
+        statusInfo.put("code", 80001);
+        statusInfo.put("message", message);
+        result.setStatusInfo(statusInfo);
+        return result;
+    }
+
+    /**失败且带数据**/
+    public static ResultDto error(Object object){
+        ResultDto result = new ResultDto();
+        result.setStatus(-1);
+        result.setData(object);
+        return result;
+    }
+}