Merge remote-tracking branch 'origin/qiyanduan02-03'

# Conflicts:
#	src/main/resources/application-prod.yml

src/main/java/cn/meteor/beyondclouds/common/handler/GlobalExceptionHandler.java

 package cn.meteor.beyondclouds.common.handler;
 
+import cn.meteor.beyondclouds.common.enums.ErrorCode;
 import cn.meteor.beyondclouds.config.properties.BeyondCloudsProperties;
 import cn.meteor.beyondclouds.core.api.Response;
-import cn.meteor.beyondclouds.common.enums.ErrorCode;
 import cn.meteor.beyondclouds.core.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
 
 /**
  * 全局异常捕获器，捕获在Controller层未处理异常
@@ -27,9 +30,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = Exception.class)
     public Response<String> exceptionHandler(HttpServletRequest request, Exception e) {
         boolean debugMode = beyondCloudsProperties.getDebug();
-        if (debugMode) {
         e.printStackTrace();
-        }
         if (e instanceof ServiceException) {
             ServiceException exception = (ServiceException) e;
             return Response.error(exception.getErrorCode(), exception.getErrorMsg());
@@ -37,7 +38,15 @@ public class GlobalExceptionHandler {
             return Response.error(ErrorCode.OPERATION_FAILED.code(), e.getMessage());
         } else {
             if (debugMode) {
-                return Response.error(ErrorCode.OPERATION_FAILED.code(), e.getMessage());
+                ByteArrayOutputStream byteBuff = new ByteArrayOutputStream();
+                e.printStackTrace(new PrintStream(byteBuff));
+                String errTrace = byteBuff.toString();
+                try {
+                    byteBuff.close();
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+                return Response.error(ErrorCode.OPERATION_FAILED.code(), errTrace);
             } else {
                 return Response.error();
             }

src/main/resources/application-prod.yml

@@ -2,8 +2,8 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true
-    username: root
-    password: 2018006709
+    username: beyond
+    password: Beyond2020#
 
 swagger:
   enable: true