优化调整

axzo-common-autoconfigure/src/main/java/cn/axzo/framework/autoconfigure/web/swagger/AxzoProperties.java

@@ -16,8 +16,6 @@ public class AxzoProperties {
 
     private Swagger swagger;
 
-    private YApi yApi;
-
     @Data
     public static class Swagger {
         private boolean enabled = false;
@@ -35,32 +33,4 @@ public class AxzoProperties {
         private String host = null;
         private String[] protocols = new String[0];
     }
-
-    @Data
-    public static class YApi {
-        /**
-         * 是否同步YApi
-         */
-        public boolean enabled = false;
-
-        /**
-         * 数据同步方式 normal"(普通模式) , "good"(智能合并), "merge"(完全覆盖) 三种模式
-         */
-        private String merge = "normal";
-
-        /**
-         * 对应文件夹的 token
-         */
-        private String token;
-
-        /**
-         * json 数据来源(代替 json 字符串)。
-         */
-        private String url;
-
-        /**
-         * 组名称，一般 默认 default
-         */
-        private String groupName = "default";
-    }
 }

axzo-common-clients/retrofit-starter/src/main/java/cn/axzo/framework/client/retrofit/HttpLogInterceptor.java

@@ -1,5 +1,6 @@
 package cn.axzo.framework.client.retrofit;
 
+import cn.axzo.framework.core.net.FilterUtil;
 import cn.axzo.framework.domain.http.*;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static cn.axzo.framework.core.Constants.CLIENT_MARKER;
+import static java.lang.System.nanoTime;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static okhttp3.Protocol.HTTP_1_1;
 
 /**
@@ -46,7 +50,33 @@ public class HttpLogInterceptor implements Interceptor {
     @Override
     @ParametersAreNonnullByDefault
     public Response intercept(Chain chain) throws IOException {
-        return null;
+        //0.判断该请求是否要打日志
+        Request request = chain.request();
+        if (FilterUtil.matchFiltersURL(request.url().encodedPath(), ignoreUrlPatterns)) {
+            return chain.proceed(request);
+        }
+
+        // 1.请求日志
+        HttpRequestLog requestLog = _requestLog(chain.connection(), request);
+
+        // 2.发送请求, 接收响应
+        long startNs = nanoTime();
+        Response response;
+        try {
+            response = chain.proceed(request);
+        } catch (Exception e) {
+            // 3.异常响应日志
+            long tookMs = NANOSECONDS.toMillis(nanoTime() - startNs);
+            HttpResponseLog responseLog = _responseLog(request, tookMs, e);
+            log.error(CLIENT_MARKER, formatter.format(requestLog, responseLog), e);
+            throw e;
+        }
+
+        // 3.正常响应日志
+        long tookMs = NANOSECONDS.toMillis(nanoTime() - startNs);
+        HttpResponseLog responseLog = _responseLog(response, tookMs);
+        log.info(CLIENT_MARKER, formatter.format(requestLog, responseLog));
+        return response;
     }
 
     /**