Selaa lähdekoodia

Add Log TRACE_ID

deason 6 vuotta sitten
vanhempi
commit
181572ef97

+ 19 - 8
src/main/java/cn/com/qmth/examcloud/app/core/utils/HttpUtils.java

@@ -10,6 +10,8 @@ package cn.com.qmth.examcloud.app.core.utils;
 import cn.com.qmth.examcloud.app.model.Constants;
 import cn.com.qmth.examcloud.app.model.ResBody;
 import cn.com.qmth.examcloud.app.model.Result;
+import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import com.alibaba.fastjson.JSON;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -28,50 +30,57 @@ import static cn.com.qmth.examcloud.app.model.Constants.*;
  */
 public class HttpUtils {
     private static Logger log = LoggerFactory.getLogger(HttpUtils.class);
+    private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(HttpUtils.class);
 
     public static Result<String> doGet(String requestUrl, String key, String token) throws Exception {
+        String traceId = ThreadUtils.getTraceID();
+
         //封装请求参数
         Request request = new Request.Builder()
                 .url(requestUrl)
                 .get()
                 .addHeader(PARAM_KEY, key)
                 .addHeader(PARAM_TOKEN, token)
-                .addHeader(PARAM_TRACE_ID, ThreadUtils.getTraceID())
+                .addHeader(PARAM_TRACE_ID, traceId)
                 .addHeader(PARAM_CLIENT, PARAM_CLIENT_VALUE)
                 .build();
 
         //执行请求
-        log.debug("[GET] " + requestUrl);
+        log.info("[GET] " + requestUrl + " [TRACE_ID] " + traceId);
         return call(request);
     }
 
     public static Result<String> doPost(String requestUrl, RequestBody formBody, String key, String token) throws Exception {
+        String traceId = ThreadUtils.getTraceID();
+
         //封装请求参数
         Request request = new Request.Builder()
                 .url(requestUrl)
                 .post(formBody)
                 .addHeader(PARAM_KEY, key)
                 .addHeader(PARAM_TOKEN, token)
-                .addHeader(PARAM_TRACE_ID, ThreadUtils.getTraceID())
+                .addHeader(PARAM_TRACE_ID, traceId)
                 .addHeader(PARAM_CLIENT, PARAM_CLIENT_VALUE)
                 .build();
         //执行请求
-        log.debug("[POST] " + requestUrl);
+        log.info("[POST] " + requestUrl + " [TRACE_ID] " + traceId);
         return call(request);
     }
 
     public static Result<String> doPut(String requestUrl, RequestBody formBody, String key, String token) throws Exception {
+        String traceId = ThreadUtils.getTraceID();
+
         //封装请求参数
         Request request = new Request.Builder()
                 .url(requestUrl)
                 .put(formBody)
                 .addHeader(PARAM_KEY, key)
                 .addHeader(PARAM_TOKEN, token)
-                .addHeader(PARAM_TRACE_ID, ThreadUtils.getTraceID())
+                .addHeader(PARAM_TRACE_ID, traceId)
                 .addHeader(PARAM_CLIENT, PARAM_CLIENT_VALUE)
                 .build();
         //执行请求
-        log.debug("[PUT] " + requestUrl);
+        log.info("[PUT] " + requestUrl + " [TRACE_ID] " + traceId);
         return call(request);
     }
 
@@ -80,14 +89,16 @@ public class HttpUtils {
         try {
             response = HttpClientBuilder.getClient().newCall(request).execute();
         } catch (ConnectException e) {
-            log.error(e.getMessage());
+            log.error("HttpConnectException:" + e.getMessage());
             return new Result<>().error("服务访问失败!");
         }
+
         String bodyStr = response.body().string();
         if (response.isSuccessful()) {
+            log.info("[Response] is success!");
             return new Result().success(bodyStr);
         } else {
-            log.warn("[Response] " + bodyStr);
+            log.warn("[Response] is fail! body:" + bodyStr);
             ResBody body = new JsonMapper().fromJson(bodyStr, ResBody.class);
             if (body != null && body.getCode() != null) {
                 if (Constants.CODE_403.equals(body.getCode())) {