Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/controller/SignalServiceController.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.feign.pojo.vo.*;
 import net.wanji.feign.service.UtcFeignClients;
-import net.wanji.web.common.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -101,9 +100,6 @@ public class SignalServiceController {
     @PostMapping("/recoverSchedule")
     public JsonViewObject recoverSchedule(@RequestParam String code) throws Exception {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-        if (StringUtils.isBlank(code)) {
-            return jsonViewObject.fail("路口编号不能为空");
-        }
         jsonViewObject = utcFeignClients.recoverSchedule(code);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("恢复时间表-恢复路口时间表执行UTC服务调用异常");

signal-control-service/src/main/java/net/wanji/web/handler/GlobalExceptionHandler.java

@@ -25,7 +25,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(value = CrossException.class)
     public JsonViewObject exceptionHandler(HttpServletRequest req, CrossException e) {
-        log.error("发生业务异常！原因是：{}", e.getErrorMsg());
+        log.error("发生业务异常:", e);
         return JsonViewObject.newInstance().fail("发生业务异常！原因是：{}" + e.getErrorMsg());
     }
 
@@ -42,7 +42,7 @@ public class GlobalExceptionHandler {
             StackTraceElement element = e.getStackTrace()[0];
             errorMessage = element.getClassName() + " " + element.getLineNumber();
         }
-        log.error("发生空指针异常！位置在：{}", errorMessage);
+        log.error("发生空指针异常:", e);
         return JsonViewObject.newInstance().fail("发生空指针异常！位置在：" + errorMessage);
     }
 
@@ -56,7 +56,7 @@ public class GlobalExceptionHandler {
         if (fieldError != null) {
             errorMessage = fieldError.getDefaultMessage();
         }
-        log.error("发生参数异常！原因是：{}", errorMessage);
+        log.error("发生参数异常:", e);
         return JsonViewObject.newInstance().fail("发生参数异常！原因是：" + errorMessage);
     }
 
@@ -72,7 +72,7 @@ public class GlobalExceptionHandler {
         } else {
             errorMessage = e.getMessage();
         }
-        log.error("未知异常！原因是：{}", errorMessage);
+        log.error("未知异常:", e);
         return JsonViewObject.newInstance().fail("未知异常！原因是：" + errorMessage);
     }
 }

signal-utc-service/src/main/java/net/wanji/utc/handler/GlobalExceptionHandler.java

@@ -25,7 +25,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(value = ControlException.class)
     public Result<String> exceptionHandler(HttpServletRequest req, ControlException e) {
-        log.error("发生业务异常！原因是：{}", e.getErrorMsg());
+        log.error("发生业务异常:", e);
         return Result.error(e.getErrorCode(), e.getErrorMsg());
     }
 
@@ -42,7 +42,7 @@ public class GlobalExceptionHandler {
             StackTraceElement element = e.getStackTrace()[0];
             errorMessage = element.getClassName() + " " + element.getLineNumber();
         }
-        log.error("发生空指针异常！位置在：{}", errorMessage);
+        log.error("发生空指针异常:", e);
         return Result.error(INTERNAL_SERVER_ERROR.getResultCode(), "发生空指针异常！位置在：" + errorMessage);
     }
 
@@ -56,7 +56,7 @@ public class GlobalExceptionHandler {
         if (fieldError != null) {
             errorMessage = fieldError.getDefaultMessage();
         }
-        log.error("发生参数异常！原因是：{}", errorMessage);
+        log.error("发生参数异常:", e);
         return Result.error(INTERNAL_SERVER_ERROR.getResultCode(), "发生参数异常！原因是：" + errorMessage);
     }
 
@@ -72,7 +72,7 @@ public class GlobalExceptionHandler {
         } else {
             errorMessage = e.getMessage();
         }
-        log.error("未知异常！原因是：{}", errorMessage);
+        log.error("未知异常:", e);
         return Result.error(INTERNAL_SERVER_ERROR.getResultCode(), "未知异常！原因是：" + errorMessage);
     }
 }