Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -130,11 +130,11 @@ public class BaseController {
                     .collect(Collectors.joining());
             return failed(errorMsg);
         }
-        printErrorRequestLog(request);
+        String requestLog = printErrorRequestLog(request);
         try {
             Map<String,Object> paramMap = new HashMap<>(2);
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("content","系统繁忙请及时处理: " + request.getRequestURL() + "   " + e);
+            jsonObject.put("content","系统繁忙请及时处理: " + requestLog + "   " + e);
             paramMap.put("text",jsonObject.toJSONString());
             paramMap.put("msgtype","text");
             Map<String,String> headers = new HashMap<>(1);
@@ -149,23 +149,27 @@ public class BaseController {
         return failed("系统繁忙");
     }
 
-    private void printErrorRequestLog(HttpServletRequest request){
+    private String printErrorRequestLog(HttpServletRequest request){
+        StringBuffer sb = new StringBuffer();
         // 打印请求日志或执行其他逻辑
-        businessLogger.info("Request URI: {}", request.getRequestURI());
+        sb.append("Request URI: ").append(request.getRequestURI());
+//        businessLogger.info("Request URI: {}", request.getRequestURI());
         Map<String, String> requestParams = getRequestParameters(request);
         if (!requestParams.isEmpty()) {
-            businessLogger.info("Request Parameters: {}", requestParams);
+//            businessLogger.info("Request Parameters: {}", requestParams);
+            sb.append(", Request Parameters: ").append(requestParams);
         }
-
         Map<String, String> requestHeaders = getRequestHeaders(request);
         if (!requestHeaders.isEmpty()) {
-            businessLogger.info("Request Headers: {}", requestHeaders);
+//            businessLogger.info("Request Headers: {}", requestHeaders);
+            sb.append(", Request Headers: ").append(requestHeaders);
         }
-
         String requestBody = getRequestBody(request);
         if (!requestBody.isEmpty()) {
-            businessLogger.info("Request JSON: {}", requestBody);
+//            businessLogger.info("Request JSON: {}", requestBody);
+            sb.append(", Request JSON: ").append(requestBody);
         }
+        return sb.toString();
     }
 
     private Map<String, String> getRequestParameters(HttpServletRequest request) {