From a22c08738a2c3d299c98922120b73c37d1413e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Thu, 23 Feb 2023 11:57:01 +0800
Subject: [PATCH] publish 0.7.0

---
 pom.xml                                       | 22 ++++++-------
 springboot-ademo/pom.xml                      |  2 +-
 .../demo/config/DemoWebConfigurer.java        |  4 +--
 springboot-annotation/pom.xml                 |  2 +-
 springboot-database/pom.xml                   |  2 +-
 springboot-encrypt/pom.xml                    |  2 +-
 springboot-login/pom.xml                      |  2 +-
 springboot-message/pom.xml                    |  2 +-
 springboot-platform/pom.xml                   |  2 +-
 springboot-poi/pom.xml                        |  2 +-
 springboot-util/pom.xml                       |  2 +-
 springboot-web/pom.xml                        |  2 +-
 ...rrentWebUser.java => RequestUserInfo.java} |  7 +++-
 .../tiesheng/core/service/CoreLogService.java | 12 +++----
 .../service/CorePlatformUniqueService.java    | 33 +++++++------------
 .../core/service/TieshengWebConfigurer.java   |  4 +--
 16 files changed, 49 insertions(+), 53 deletions(-)
 rename springboot-web/src/main/java/com/tiesheng/core/pojos/{CurrentWebUser.java => RequestUserInfo.java} (89%)

diff --git a/pom.xml b/pom.xml
index feb6f02..db51aac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>0.6.2</version>
+    <version>0.7.0</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>0.6.2</version>
+                <version>0.7.0</version>
             </dependency>
 
             <dependency>
@@ -136,7 +136,7 @@
                 <plugin>
                     <groupId>com.tiesheng.springboot-plugin</groupId>
                     <artifactId>tiesheng-maven-plugin</artifactId>
-                    <version>0.0.4</version>
+                    <version>0.0.5</version>
                     <executions>
                         <execution>
                             <goals>
diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml
index a292d2c..9897eec 100644
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java b/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
index bbbd8d3..92954b6 100644
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
@@ -1,7 +1,7 @@
 package com.tiesheng.demo.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.core.service.TieshengWebConfigurer;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -19,7 +19,7 @@ public class DemoWebConfigurer implements TieshengWebConfigurer {
     GlobalConfig globalConfig;
 
     @Override
-    public CurrentWebUser getCurrentUserName(TokenBean tokenBean) {
+    public RequestUserInfo getCurrentUserName(TokenBean tokenBean) {
         return null;
     }
 
diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml
index cf1a06a..57ced3d 100644
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>
diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml
index 00d3e64..c487592 100644
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>
diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml
index f90b3da..94b40e4 100644
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>
diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml
index 283a418..6d7dcdb 100644
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>
diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml
index e29bd11..48609b3 100644
--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>
diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml
index 8679e19..3383b9b 100644
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>
diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml
index d936f4d..cbf1fd4 100644
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>
diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml
index 9d391c1..1fb4316 100644
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml
index bda8a17..761284a 100644
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>0.6.2</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/CurrentWebUser.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java
similarity index 89%
rename from springboot-web/src/main/java/com/tiesheng/core/pojos/CurrentWebUser.java
rename to springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java
index d045a70..bf64f2b 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/CurrentWebUser.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/RequestUserInfo.java
@@ -1,6 +1,11 @@
 package com.tiesheng.core.pojos;
 
-public class CurrentWebUser {
+/**
+ * 当前token的数据
+ *
+ * @author hao
+ */
+public class RequestUserInfo {
 
     private String id;
     private String name;
diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java b/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
index b4a9070..37f40b0 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
@@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.tiesheng.core.mapper.CoreLogLoginMapper;
 import com.tiesheng.core.mapper.CoreLogMessageMapper;
 import com.tiesheng.core.mapper.CoreLogOperationMapper;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CoreLogLogin;
 import com.tiesheng.core.pojos.dao.CoreLogMessage;
 import com.tiesheng.core.pojos.dao.CoreLogOperation;
@@ -55,9 +55,9 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
      */
     public void addOperationLog(String title, String subject, Object params) {
         CoreLogOperation operation = new CoreLogOperation();
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
-        operation.setUserId(currentWebUser.getId());
-        operation.setUserName(currentWebUser.getName());
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get());
+        operation.setUserId(requestUserInfo.getId());
+        operation.setUserName(requestUserInfo.getName());
         operation.setTitle(title);
         operation.setSubject(subject);
         if (params != null) {
@@ -85,8 +85,8 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         login.setUserId(platformUnique.getUserId());
         login.setPlatform(platformUnique.getPlatform());
 
-        CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(tokenBean);
-        login.setUserName(currentWebUser.getName());
+        RequestUserInfo requestUserInfo = tieshengWebConfigurer.getCurrentUserName(tokenBean);
+        login.setUserName(requestUserInfo.getName());
 
         login.setIp(ip);
         login.setAddress(ip2regionConfig.search(login.getIp()));
diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java b/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
index a70d0a2..f74cf34 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
@@ -1,7 +1,6 @@
 package com.tiesheng.core.service;
 
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * @author hao
@@ -35,15 +33,12 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
             platformUnique.setUniqueId(loginInfo.getUnique());
         }
         platformUnique.setInfo(loginInfo.getInfo());
+        saveOrUpdate(platformUnique);
 
         TokenBean tokenBean = tieshengWebConfigurer.loginConfigurer().doLogin(platformUnique, loginInfo.getTo());
         if (tokenBean != null) {
-            platformUnique.setUserId(tokenBean.getId());
-            platformUnique.setIsDeleted(0);
-            saveOrUpdate(platformUnique);
-
             // 添加登录日志
-            coreLogService.addLoginLog(platformUnique,tokenBean);
+            coreLogService.addLoginLog(platformUnique, tokenBean);
         }
         return tokenBean;
     }
@@ -55,22 +50,18 @@ public class CorePlatformUniqueService extends TsServiceBase<CorePlatformUniqueM
 
 
     /**
-     * 通过平台和用户id查询
+     * 更新用户id
      *
-     * @param platform
-     * @param userIds
+     * @param uniqueId
+     * @param userId
      * @return
      */
-    private List<CorePlatformUnique> getByPlatformAndUser(String platform, List<String> userIds) {
-        if (CollUtil.isEmpty(userIds)) {
-            return CollUtil.newArrayList();
-        }
-
-        QueryWrapper<CorePlatformUnique> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("user_id", userIds);
-        queryWrapper.eq("platform", platform);
-        queryWrapper.last("limit 1");
-        return list(queryWrapper);
+    public boolean updateUserId(String uniqueId, String userId) {
+        return update(new UpdateWrapper<CorePlatformUnique>().eq("unique_id", uniqueId)
+                .set("user_id", userId)
+                .set("is_deleted", 0)
+        );
     }
 
+
 }
diff --git a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java b/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java
index af6f90c..9993520 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java
@@ -1,7 +1,7 @@
 package com.tiesheng.core.service;
 
 import cn.hutool.log.LogFactory;
-import com.tiesheng.core.pojos.CurrentWebUser;
+import com.tiesheng.core.pojos.RequestUserInfo;
 import com.tiesheng.core.pojos.dao.CorePlatformUnique;
 import com.tiesheng.login.config.token.bean.TokenBean;
 import com.tiesheng.util.exception.ApiRespEnum;
@@ -22,7 +22,7 @@ public interface TieshengWebConfigurer {
      *
      * @return
      */
-    CurrentWebUser getCurrentUserName(TokenBean userId);
+    RequestUserInfo getCurrentUserName(TokenBean userId);
 
 
     /**