Merge branch 'feature-addLog' into 'master'

Controller层增添日志 -- 减少不必要日志打印

See merge request !199

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

@@ -23,7 +23,6 @@ public class GlobalFieldController {
     @Autowired
     private GlobalFieldService globalFieldService;
 
-
     @GetMapping("/speciallinestate")
     public ResultDto querySpecialLineState() {
         ResultDto resultDto = new ResultDto();

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

@@ -31,7 +31,7 @@ public class HistoryController {
     public ResultDto addLoginHistory(Principal principal, @RequestBody LoginHistoryDto loginHistoryDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【addLoginHistory】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(loginHistoryDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             historyService.addLoginHistory(principal.getName(), loginHistoryDto);
             resultDto.setStatus(0);
@@ -46,7 +46,7 @@ public class HistoryController {
     public ResultDto addOperationHistory(Principal principal, @RequestBody OperationHistoryDto operationHistoryDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【addOperationHistory】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(operationHistoryDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             historyService.addOperationHistory(principal.getName(), operationHistoryDto);
             resultDto.setStatus(0);
@@ -61,7 +61,7 @@ public class HistoryController {
     public ResultDto getLoginHistories(Principal principal, @RequestBody HistoryListRequestDto historyListRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【getLoginHistories】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(historyListRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             resultDto.setData(historyService.getLoginHistories(principal.getName(), historyListRequestDto));
             resultDto.setStatus(0);
@@ -76,7 +76,7 @@ public class HistoryController {
     public ResultDto getOperationHistories(Principal principal, @RequestBody HistoryListRequestDto historyListRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【getOperationHistories】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(historyListRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             resultDto.setData(historyService.getOperationHistories(principal.getName(), historyListRequestDto));
             resultDto.setStatus(0);
@@ -91,7 +91,7 @@ public class HistoryController {
     public void addWinlog(Principal principal, @RequestBody String urlRecord) {
         ResultDto resultDto = new ResultDto();
         String logs = "【addWinlog】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(urlRecord));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             WinHistory winHistory = new WinHistory(Instant.now().toEpochMilli(), urlRecord);
             historyService.addBrowserWinLog(principal.getName(), winHistory);

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

@@ -44,7 +44,7 @@ public class IpControlloer {
     public ResultDto buyIp(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【buyIp】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             List<String> ipResourceDto = ipResourceService.buyIp(principal.getName(), ipResourceRequestDto);
             resultDto.setData(ipResourceDto);
@@ -78,7 +78,7 @@ public class IpControlloer {
     public ResultDto renewIp(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【renewIp】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             resultDto.setData(ipResourceService.renewIp(principal.getName(), ipResourceRequestDto));
             resultDto.setStatus(0);
@@ -111,7 +111,7 @@ public class IpControlloer {
     public ResultDto deleteIp(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【deleteIp】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             resultDto.setData(ipResourceService.deleteIp(principal.getName(), ipResourceRequestDto));
             resultDto.setStatus(0);
@@ -137,7 +137,7 @@ public class IpControlloer {
     public ResultDto getIpList(Principal principal, @RequestBody IpListRequestDto ipListRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【getIpList】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipListRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             IpPageResultDto ipResourceDto = ipResourceService.getIpList(principal.getName(), ipListRequestDto.getGroupType(), ipListRequestDto.getPage(),
                     ipListRequestDto.getAmount(), ipListRequestDto.getFilter());
@@ -165,7 +165,7 @@ public class IpControlloer {
     public ResultDto updateIp(Principal principal, @RequestBody IpResourceUpdateDto ipResourceUpdateDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【updateIp】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceUpdateDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ipResourceService.updateIp(principal.getName(), ipResourceUpdateDto);
             resultDto.setStatus(0);
@@ -198,7 +198,7 @@ public class IpControlloer {
     public ResultDto queryIp(Principal principal, @RequestBody IpResourceUpdateDto ipResourceUpdateDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【queryIp】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceUpdateDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             HashMap<String, Boolean> map = new HashMap<>();
             map.put("found", ipResourceService.queryIpExist(principal.getName(), ipResourceUpdateDto));
@@ -226,7 +226,7 @@ public class IpControlloer {
     public ResultDto queryIpDetail(Principal principal, @RequestBody IpResourceRequestDto ipResourceRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【queryIpDetail】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(ipResourceRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             resultDto.setData(ipResourceService.queryIp(principal.getName(), ipResourceRequestDto));
             resultDto.setStatus(0);

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

@@ -39,7 +39,7 @@ public class ShopController {
     public ResultDto addShop(Principal principal, @RequestBody ShopResultDto shopResultDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【addShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopResultDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ShopStringResultDto shopStringResultDto = new ShopStringResultDto();
             shopStringResultDto.setId(shopService.addShop(principal.getName(), shopResultDto));
@@ -56,7 +56,7 @@ public class ShopController {
     public ResultDto addShops(Principal principal, @RequestParam("file") MultipartFile file) {
         ResultDto resultDto = new ResultDto();
         String logs = "【addShops】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(file));
+        log.info("{}, params : {}", logs, principal.getName());
 
         String name = file.getOriginalFilename();
         if (name.length() < 6 || !name.substring(name.length() - 5).equals(".xlsx")) {
@@ -84,7 +84,7 @@ public class ShopController {
     public ResultDto updateShop(Principal principal, @RequestBody ShopResultDto shopResultDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【updateShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopResultDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ShopStringResultDto shopStringResultDto = new ShopStringResultDto();
             shopStringResultDto.setId(shopService.updateShop(principal.getName(), shopResultDto));
@@ -101,7 +101,7 @@ public class ShopController {
     public ResultDto deleteShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【deleteShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             shopService.deleteShop(principal.getName(), shopRequestDto.getShopId());
             resultDto.setStatus(0);
@@ -116,7 +116,7 @@ public class ShopController {
     public ResultDto bindShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【bindShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ipAndShopService.bindShop(principal.getName(), shopRequestDto);
             resultDto.setStatus(0);
@@ -132,7 +132,7 @@ public class ShopController {
     public ResultDto unBindShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【unBindShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ipAndShopService.unBindShop(principal.getName(), shopRequestDto);
             resultDto.setStatus(0);
@@ -150,7 +150,7 @@ public class ShopController {
     public ResultDto transferShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【transfer】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             shopService.transferShop(principal.getName(), shopRequestDto.getShopId(), shopRequestDto.getToGroup());
             resultDto.setStatus(0);
@@ -168,7 +168,7 @@ public class ShopController {
     public ResultDto assignShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【assignShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             shopService.assignShops(principal.getName(), shopRequestDto.getShopIds(), shopRequestDto.getToUsers());
             resultDto.setStatus(0);
@@ -184,21 +184,21 @@ public class ShopController {
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public ResultDto getShopList(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
-        log.info("shop list params {}", JSONObject.toJSONString(shopRequestDto));
         long start = System.currentTimeMillis();
         ResultDto resultDto = new ResultDto();
         String logs = "【getShopList】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ShopPageResultDto shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(),
                     shopRequestDto.getPage(), shopRequestDto.getAmount(), shopRequestDto.getFilter(), null);
             resultDto.setData(shopDtos);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
-            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            //log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
+        } catch (Exception e){
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
         }
-        log.info("getshoplist totalTime：{}, {},{}", principal.getName(), System.currentTimeMillis() - start, Thread.currentThread().getName());
         return resultDto;
     }
 
@@ -208,11 +208,10 @@ public class ShopController {
      */
     @RequestMapping(value = "/penghai/list", method = RequestMethod.POST)
     public ResultDto getPenghaiShopList(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
-        log.info("shop list params {}", JSONObject.toJSONString(shopRequestDto));
         long start = System.currentTimeMillis();
         ResultDto resultDto = new ResultDto();
         String logs = "【getPenghaiShopList】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
 
             ShopPageResultDto shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(),
@@ -220,10 +219,11 @@ public class ShopController {
             resultDto.setData(shopDtos);
             resultDto.setStatus(0);
         } catch (ClientRequestException e) {
-            log.error("{}, Exception : {}", logs, e.getMessage(), e);
+            //log.error("{}, Exception : {}", logs, e.getMessage(), e);
             dealClientRequestException(resultDto, e);
+        } catch (Exception e){
+            log.error("{}, Exception : {}", logs, e.getMessage(), e);
         }
-        log.info("getshoplist totalTime：{},{}, {},{}", "penghai", principal.getName(), System.currentTimeMillis() - start, Thread.currentThread().getName());
         return resultDto;
     }
 
@@ -234,7 +234,7 @@ public class ShopController {
     public ResultDto getShopSubUsers(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【getShopSubUsers】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             List<String> subUsers = shopService.getShopUsers(principal.getName(), shopRequestDto.getShopId());
             resultDto.setData(subUsers);
@@ -250,7 +250,7 @@ public class ShopController {
     public ResultDto getBatchShopSubUsers(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【getBatchShopSubUsers】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             List<String> subUsers = shopService.getBatchShopUsers(principal.getName(), shopRequestDto.getShopIds());
             resultDto.setData(subUsers);
@@ -269,7 +269,7 @@ public class ShopController {
     public ResultDto queryShop(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         String logs = "【queryShop】 ";
-        log.info("{}, params : {}, {}", logs, principal.getName(), JSONObject.toJSONString(shopRequestDto));
+        log.info("{}, params : {}", logs, principal.getName());
         try {
             ShopResultDto shopDto = shopService.queryShop(principal.getName(), shopRequestDto.getShopId());
             resultDto.setData(shopDto);