Merge branch 'feature-addLog' into 'master'

Controller层增添日志

See merge request !198

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

 package com.edgec.browserbackend.browser.controller;
 
 import com.edgec.browserbackend.account.dto.ResultDto;
-import com.edgec.browserbackend.browser.dto.GroupDto;
 import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
-import com.edgec.browserbackend.common.dto.Result;
-import com.edgec.browserbackend.common.utils.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -23,16 +22,21 @@ import java.util.Map;
 @RequestMapping("/config")
 public class ConfigController {
 
+    private final Logger log = LoggerFactory.getLogger(ConfigController.class);
+
     @Autowired
     private IpResourceService ipResourceService;
 
     @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) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());
@@ -45,10 +49,13 @@ public class ConfigController {
     @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) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());
@@ -61,10 +68,13 @@ public class ConfigController {
     @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) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());

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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/globalfield")
 public class GlobalFieldController {
 
+    private final Logger log = LoggerFactory.getLogger(GroupController.class);
+
     @Autowired
     private GlobalFieldService globalFieldService;
 
@@ -23,8 +27,14 @@ public class GlobalFieldController {
     @GetMapping("/speciallinestate")
     public ResultDto querySpecialLineState() {
         ResultDto resultDto = new ResultDto();
-        resultDto.setStatus(0);
-        resultDto.setData(globalFieldService.querySpecialLineState());
+        String logs = "【addGroup】 ";
+        log.info("{}, params :", logs);
+        try {
+            resultDto.setStatus(0);
+            resultDto.setData(globalFieldService.querySpecialLineState());
+        }catch (Exception e){
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 }

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

 package com.edgec.browserbackend.browser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.Group;
 import com.edgec.browserbackend.browser.dto.GroupDto;
 import com.edgec.browserbackend.browser.service.GroupService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,18 +22,23 @@ import java.util.Map;
 @RequestMapping("/group")
 public class GroupController {
 
+    private final Logger log = LoggerFactory.getLogger(GroupController.class);
+
     @Autowired
     private GroupService groupService;
 
     @RequestMapping("/add")
     public ResultDto addGroup(Principal principal, @RequestBody GroupDto groupDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addGroup】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(groupDto));
         try {
             GroupDto groupDto1 = new GroupDto();
             groupDto1.setId(groupService.addGroup(principal.getName(), groupDto.getName()));
             resultDto.setData(groupDto1);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());
@@ -43,10 +51,13 @@ public class GroupController {
     @RequestMapping("/update")
     public ResultDto updateGroup(Principal principal, @RequestBody Group group) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【updateGroup】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(group));
         try {
             groupService.updateGroup(principal.getName(), group);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());
@@ -59,10 +70,13 @@ public class GroupController {
     @RequestMapping("/del")
     public ResultDto deleteGroup(Principal principal, @RequestBody GroupDto groupDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【deleteGroup】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(groupDto));
         try {
             groupService.deleteGroup(principal.getName(), groupDto.getId());
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());
@@ -75,11 +89,14 @@ public class GroupController {
     @RequestMapping("/list")
     public ResultDto getGroupList(Principal principal) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【getGroupList】 ";
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             List<GroupDto> groupDtos = groupService.getGroupList(principal.getName());
             resultDto.setData(groupDtos);
             resultDto.setStatus(0);
         }catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", e.getErrorCode());

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

 package com.edgec.browserbackend.browser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.WinHistory;
 import com.edgec.browserbackend.browser.dto.HistoryListRequestDto;
@@ -7,6 +8,8 @@ import com.edgec.browserbackend.browser.dto.LoginHistoryDto;
 import com.edgec.browserbackend.browser.dto.OperationHistoryDto;
 import com.edgec.browserbackend.browser.service.HistoryService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,16 +22,21 @@ import java.util.Map;
 @RequestMapping("/history")
 public class HistoryController {
 
+    private final Logger log = LoggerFactory.getLogger(HistoryController.class);
+
     @Autowired
     HistoryService historyService;
 
     @RequestMapping(value = "/login/add", method = RequestMethod.POST)
     public ResultDto addLoginHistory(Principal principal, @RequestBody LoginHistoryDto loginHistoryDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addLoginHistory】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(loginHistoryDto));
         try {
             historyService.addLoginHistory(principal.getName(), loginHistoryDto);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -37,10 +45,13 @@ public class HistoryController {
     @RequestMapping(value = "/operation/add", method = RequestMethod.POST)
     public ResultDto addOperationHistory(Principal principal, @RequestBody OperationHistoryDto operationHistoryDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addOperationHistory】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(operationHistoryDto));
         try {
             historyService.addOperationHistory(principal.getName(), operationHistoryDto);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -49,10 +60,13 @@ public class HistoryController {
     @RequestMapping(value = "/login/list", method = RequestMethod.POST)
     public ResultDto getLoginHistories(Principal principal, @RequestBody HistoryListRequestDto historyListRequestDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【getLoginHistories】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(historyListRequestDto));
         try {
             resultDto.setData(historyService.getLoginHistories(principal.getName(), historyListRequestDto));
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -61,10 +75,13 @@ public class HistoryController {
     @RequestMapping(value = "/operation/list", method = RequestMethod.POST)
     public ResultDto getOperationHistories(Principal principal, @RequestBody HistoryListRequestDto historyListRequestDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【getOperationHistories】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(historyListRequestDto));
         try {
             resultDto.setData(historyService.getOperationHistories(principal.getName(), historyListRequestDto));
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -73,11 +90,14 @@ public class HistoryController {
     @PostMapping("/url/add")
     public void addWinlog(Principal principal, @RequestBody String urlRecord) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addWinlog】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(urlRecord));
         try {
             WinHistory winHistory = new WinHistory(Instant.now().toEpochMilli(), urlRecord);
             historyService.addBrowserWinLog(principal.getName(), winHistory);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
     }

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

 package com.edgec.browserbackend.browser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.UserCode;
 import com.edgec.browserbackend.browser.dto.FavoriteUrl;
@@ -8,6 +9,8 @@ import com.edgec.browserbackend.browser.dto.TempReportDto;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.browser.service.TempService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +25,8 @@ import java.util.Map;
 @RequestMapping("/temp")
 public class TempController {
 
+    private final Logger log = LoggerFactory.getLogger(TempController.class);
+
     @Autowired
     private TempService tempService;
 
@@ -33,7 +38,13 @@ public class TempController {
      */
     @PostMapping(value = "/usercode")
     public void addUserCode(@RequestBody UserCode userCode) {
-        tempService.save(userCode);
+        String logs = "【addUserCode】 ";
+        log.info("{}, params : {}", logs, JSONObject.toJSONString(userCode));
+        try {
+            tempService.save(userCode);
+        }catch (Exception e){
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
     }
 
     @GetMapping("/{ip}")
@@ -47,11 +58,14 @@ public class TempController {
     @GetMapping("/favorites/{shopId}")
     public ResultDto getFavoritesByShopId(@PathVariable("shopId") String shopId) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【getFavoritesByShopId】 ";
+        log.info("{}, params : {}", logs, shopId);
         try {
             List<FavoriteUrl> list = shopService.getFavoritesByShopId(shopId);
             resultDto.setData(list);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -63,11 +77,14 @@ public class TempController {
     @DeleteMapping("/favorites")
     public ResultDto deleteFavoritesByShopId(@RequestBody FavoriteUrlDto favoriteUrlDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addUserCode】 ";
+        log.info("{}, params : {}", logs, JSONObject.toJSONString(favoriteUrlDto));
         try {
             FavoriteUrl favoriteUrl = new FavoriteUrl("", favoriteUrlDto.getUrl());
             resultDto.setData(shopService.deleteFavoritesByShopId(favoriteUrlDto.getShopId(), favoriteUrl));
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;
@@ -79,12 +96,15 @@ public class TempController {
     @PostMapping("/favorites")
     public ResultDto saveFavoritesByShopId(@RequestBody FavoriteUrlDto favoriteUrlDto) {
         ResultDto resultDto = new ResultDto();
+        String logs = "【addUserCode】 ";
+        log.info("{}, params : {}", logs, JSONObject.toJSONString(favoriteUrlDto));
         try {
             FavoriteUrl favoriteUrl = new FavoriteUrl(favoriteUrlDto.getTitle(), favoriteUrlDto.getUrl());
             shopService.saveFavoritesByShopId(favoriteUrlDto.getShopId(), favoriteUrl);
             resultDto.setData(true);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
         }
         return resultDto;

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

 package com.edgec.browserbackend.browser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.Vps;
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -24,31 +27,52 @@ import java.util.List;
 @RestController
 @RequestMapping("/vps")
 public class VpsController {
+
+    private final Logger log = LoggerFactory.getLogger(VpsController.class);
+
     @Autowired
     private VpsService vpsService;
 
     @PostMapping("/add")
     public ResultDto addVps(Principal principal, @Validated @RequestBody Vps vps) {
         ResultDto resultDto = new ResultDto();
-        vps.setOwner1(principal.getName());
-        String s = vpsService.addVps(vps);
-        resultDto.setData(s);
+        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);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 
     @DeleteMapping("/{id}")
     public ResultDto deleteVps(Principal principal, @PathVariable String id) {
         ResultDto resultDto = new ResultDto();
-        vpsService.deleteVps(principal.getName(), id);
-        resultDto.setStatus(0);
+        String logs = "【deleteVps】 ";
+        log.info("{}, params : {}, {}", logs, principal.getName(), id);
+        try {
+            vpsService.deleteVps(principal.getName(), id);
+            resultDto.setStatus(0);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 
     @PutMapping("/update")
     public ResultDto updateVps(@RequestBody Vps vps) {
         ResultDto resultDto = new ResultDto();
-        vpsService.updateVps(vps);
-        resultDto.setStatus(0);
+        String logs = "【updateVps】 ";
+        log.info("{}, params : {}", logs, JSONObject.toJSONString(vps));
+        try {
+            vpsService.updateVps(vps);
+            resultDto.setStatus(0);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 
@@ -58,9 +82,15 @@ public class VpsController {
     @GetMapping("/login_vps/{id}")
     public ResultDto getVps(@PathVariable String id) {
         ResultDto resultDto = new ResultDto();
-        String rdp = vpsService.loginVps(id);
-        resultDto.setStatus(0);
-        resultDto.setData(rdp);
+        String logs = "【getVps】 ";
+        log.info("{}, params : {}", logs, id);
+        try {
+            String rdp = vpsService.loginVps(id);
+            resultDto.setStatus(0);
+            resultDto.setData(rdp);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 
@@ -70,17 +100,22 @@ 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.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);
 
-        Pageable pageable = PageRequest.of(page, size);
-        Page<Vps> pageInfo = vpsService.queryPage(principal.getName(), pageable);
-        resultDto.setData(pageInfo);
-
-        /// 临时这样写，有空了得去掉下面三行
-        PageInfo pageResult = new PageInfo(pageInfo.getPageable().getPageNumber(), pageInfo.getTotalPages(), (int) pageInfo.getTotalElements());
-        VpsPageResultDto<Vps> shopPageResultDto = new VpsPageResultDto<Vps>(pageInfo.getContent(), pageResult);
-        resultDto.setData(shopPageResultDto);
-
-        resultDto.setStatus(0);
+            resultDto.setStatus(0);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }
 
@@ -90,14 +125,19 @@ public class VpsController {
     @PostMapping("/assign")
     public ResultDto assignVpsList(Principal principal, @RequestBody AssignVpsDto assignVpsDto) {
         ResultDto resultDto = new ResultDto();
-        List<String> list = vpsService.assignVpsList(principal.getName(), assignVpsDto);
-        if (list.isEmpty()) {
-            resultDto.setStatus(0);
-        } else {
-            resultDto.setStatus(-1);
-            resultDto.setData(list);
+        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);
+            }
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
         }
-
         return resultDto;
     }
 
@@ -107,11 +147,15 @@ public class VpsController {
     @GetMapping("/list/{id}")
     public ResultDto getVpsList(Principal principal, @PathVariable String id) {
         ResultDto resultDto = new ResultDto();
-        List<String> list = vpsService.queryAssignUserList(principal.getName(), id);
-
-        resultDto.setData(list);
-
-        resultDto.setStatus(0);
+        String logs = "【getVpsList】 ";
+        log.info("{}, params : {}", logs, id);
+        try {
+            List<String> list = vpsService.queryAssignUserList(principal.getName(), id);
+            resultDto.setData(list);
+            resultDto.setStatus(0);
+        } catch (Exception e) {
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+        }
         return resultDto;
     }