From cde422979a31687ecf6a3b27ece31544ce0db9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Mon, 9 Jan 2023 16:41:16 +0800
Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E7=99=BB=E5=BD=95=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/src/main/resources/application.yml               |  4 ++--
 .../core/config/web/DefaultWebConfigurer.java         | 11 +++++++++++
 .../core/config/web/TieshengWebConfigurer.java        |  8 +-------
 .../com/tiesheng/core/service/CoreLogService.java     |  4 ++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/demo/src/main/resources/application.yml b/demo/src/main/resources/application.yml
index 7936be6..78a422b 100644
--- a/demo/src/main/resources/application.yml
+++ b/demo/src/main/resources/application.yml
@@ -11,8 +11,8 @@ spring:
 platform:
   wxmp:
     global:
-      app-id: wx7830e1085881b432
-      app-secret: d7757f980b38b5bd8125d45767c40e04
+      app-id: wxa0343fe519824651
+      app-secret: 776f089ba70bcd66455a7c7893f810b9
 
 tiesheng:
   token:
diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/config/web/DefaultWebConfigurer.java b/tiesheng-web/src/main/java/com/tiesheng/core/config/web/DefaultWebConfigurer.java
index 4d7bc02..e198842 100644
--- a/tiesheng-web/src/main/java/com/tiesheng/core/config/web/DefaultWebConfigurer.java
+++ b/tiesheng-web/src/main/java/com/tiesheng/core/config/web/DefaultWebConfigurer.java
@@ -1,5 +1,7 @@
 package com.tiesheng.core.config.web;
 
+import com.tiesheng.core.config.web.bean.CurrentWebUser;
+import com.tiesheng.login.config.token.TsTokenConfig;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
 
@@ -10,4 +12,13 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConditionalOnMissingBean(value = TieshengWebConfigurer.class, ignored = DefaultWebConfigurer.class)
 public class DefaultWebConfigurer implements TieshengWebConfigurer {
+
+    @Override
+    public CurrentWebUser getCurrentUserName() {
+        CurrentWebUser webUser = new CurrentWebUser();
+        webUser.setId(TsTokenConfig.getWithoutThr().getId());
+        webUser.setName(webUser.getId());
+        return webUser;
+    }
+
 }
diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/config/web/TieshengWebConfigurer.java b/tiesheng-web/src/main/java/com/tiesheng/core/config/web/TieshengWebConfigurer.java
index 5e3a5ec..d11aabf 100644
--- a/tiesheng-web/src/main/java/com/tiesheng/core/config/web/TieshengWebConfigurer.java
+++ b/tiesheng-web/src/main/java/com/tiesheng/core/config/web/TieshengWebConfigurer.java
@@ -3,7 +3,6 @@ package com.tiesheng.core.config.web;
 import cn.hutool.log.LogFactory;
 import com.tiesheng.core.config.web.bean.CurrentWebUser;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
-import com.tiesheng.login.config.token.TsTokenConfig;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.exception.ApiRespEnum;
@@ -26,12 +25,7 @@ public interface TieshengWebConfigurer {
      *
      * @return
      */
-    default CurrentWebUser getCurrentUserName() {
-        CurrentWebUser webUser = new CurrentWebUser();
-        webUser.setId(TsTokenConfig.getWithoutThr().getId());
-        webUser.setName(webUser.getId());
-        return webUser;
-    }
+    CurrentWebUser getCurrentUserName();
 
 
     /**
diff --git a/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreLogService.java b/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
index 0381a99..0856b90 100644
--- a/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
+++ b/tiesheng-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
@@ -67,10 +67,14 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         HttpServletRequest request = ServletKit.getRequest();
         String ip = ServletUtil.getClientIP(request);
 
+
         CoreLogLogin login = new CoreLogLogin();
         login.setUserId(platformUnique.getUserId());
         login.setPlatform(platformUnique.getPlatform());
 
+        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName();
+        login.setUserName(currentWebUser.getName());
+
         login.setIp(ip);
         DataBlock dataBlock = Ip2Region.getInstance().btreeSearch(ip);
         login.setAddress(dataBlock.getRegion());