From afaef4d1b2e6d33825ebcc0301cbeb87f5c67a7a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 12 Mar 2023 13:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/base/db/DBInitialize.java    |  1 +
 .../rest/interceptor/BaseAuthInterceptor.java |  2 +-
 .../rest/interceptor/VisitLogInterceptor.java | 44 +++++--------------
 .../src/main/resources/app.yml                |  2 -
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
index e9d99001..fa754379 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java
@@ -64,6 +64,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 	@Override
 	public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
 		// TODO 该事件有50%的概率不触发
+		System.out.println("11");
 	}
 
 	/**
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
index 19be266c..8e85d170 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
@@ -67,7 +67,7 @@ public class BaseAuthInterceptor implements RouterInterceptor {
 
     @Override
     public Object postResult(Context ctx, Object result) throws Throwable {
-//        SystemContextHolder.remove();
+        SystemContextHolder.remove();
         if (result instanceof ResponseBody) {
             return result;
         }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java
index dd95b364..1c9b713d 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java
@@ -1,12 +1,8 @@
 package fun.asgc.neutrino.proxy.server.base.rest.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
-import fun.asgc.neutrino.proxy.server.base.rest.SystemContext;
-import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.boot.jlhttp.HTTPServer;
-import org.noear.solon.boot.jlhttp.JlHttpContext;
 import org.noear.solon.core.handle.Action;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Handler;
@@ -28,37 +24,19 @@ public class VisitLogInterceptor implements RouterInterceptor {
             chain.doIntercept(ctx, mainHandler);
             return;
         }
-        SystemContext systemContext = SystemContextHolder.getContext();
-        if (null == systemContext) {
-            chain.doIntercept(ctx, mainHandler);
-            return;
-        }
-        Action action = (Action) mainHandler;
-        systemContext.setAction(action);
-        systemContext.setReceiveTime(new Date());
+
+        Date startTime = new Date();
+
         chain.doIntercept(ctx, mainHandler);
-    }
 
-    @Override
-    public Object postResult(Context ctx, Object result) throws Throwable {
-        SystemContext systemContext = SystemContextHolder.getContext();
-        if (null != systemContext) {
-            // 如果更换了其他插件，则此处需要调整
-            JlHttpContext jlHttpContext = (JlHttpContext) ctx;
-            HTTPServer.Request request = (HTTPServer.Request) jlHttpContext.request();
-
-            Date receiveTime = SystemContextHolder.getContext().getReceiveTime();
-            Date now = new Date();
-            long elapsedTime = now.getTime() - receiveTime.getTime();
-            log.info("\n-----------------------------------------------------------------接口请求日志：\n{} url:{} 执行耗时:{}\n请求体参数:{}\n响应结果:{}\n客户端IP:{}\n",
-                    request.getMethod(), request.getPath(), getElapsedTimeStr(elapsedTime),
-                    JSONObject.toJSONString(request.getParams()),
-                    JSONObject.toJSONString(result),
-                    SystemContextHolder.getIp()
-            );
-        }
-        SystemContextHolder.remove();
-        return RouterInterceptor.super.postResult(ctx, result);
+        Date now = new Date();
+        long elapsedTime = now.getTime() - startTime.getTime();
+        log.info("\n-----------------------------------------------------------------接口请求日志：\n{} url:{} 执行耗时:{}\n请求体参数:{}\n响应结果:{}\n客户端IP:{}\n",
+                ctx.method(), ctx.path(), getElapsedTimeStr(elapsedTime),
+                JSONObject.toJSONString(ctx.paramMap()),
+                JSONObject.toJSONString(JSONObject.toJSONString(ctx.result)),
+                ctx.realIp()
+        );
     }
 
     /**
diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml
index 3cc90636..076fff32 100644
--- a/neutrino-proxy-server/src/main/resources/app.yml
+++ b/neutrino-proxy-server/src/main/resources/app.yml
@@ -25,8 +25,6 @@ neutrino:
       driver-class: org.sqlite.JDBC
       username:
       password:
-  job:
-    enable: true
 
 #添加MIME印射（如果有需要？）
 #是否启用静态文件服务。（可不配，默认为启用）