From 023f923889887b912c3c306abf08fc334fcb3e8b Mon Sep 17 00:00:00 2001
From: zhujunshuai <602228920@qq.com>
Date: Wed, 8 Feb 2023 11:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=AA=E8=83=BD=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=88=E7=AB=AF=E7=99=BB=E5=BD=95=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/interceptor/TokenRegistryInterceptor.java    | 8 ++++++--
 .../pluss/platform/userInfo/impl/BaseUserInfoService.java | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
index 83bf2ea..af65122 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
@@ -103,15 +103,19 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
 //                return false;
 //            }
 
+
+
+
             UserApp userApp = new UserApp();
             userApp.setUserId(userInfo.getId());
             userApp = userAppService.queryUserApp(userApp);
-            if (!requestToken.equals(userApp.getToken())) {
+            //TODO 去掉设备登录注释
+           /* if (!requestToken.equals(userApp.getToken())) {
                 Result<Object> result = new Result<>();
                 result.setCode(ResultCode.NOT_TOKEN).setMessage("您在其他设备中登录");
                 ComUtil.responseResult(response, result);
                 return false;
-            }
+            }*/
 
             if (StringUtils.isNotBlank(merchantCode) && "staff".equals(userApp.getUserType())) {
                 MerchantStaffConn staffConn = new MerchantStaffConn().setMerchantCode(merchantCode);
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
index be59519..17cafd5 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
@@ -377,7 +377,11 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
         // 获取当前用户的详情信息来判断用户的登陆类型
         UserApp queryUserApp = new UserApp().setUserId(checkUserInfo.getId());
         queryUserApp = userAppMapper.selectOne(new QueryWrapper<>(queryUserApp));
-        String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+
+        // TODO 去掉该用户只能登录一个设备
+        //String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+        String genRandomNum = loginName;
+
         UserApp uApp = new UserApp();
         uApp.setToken(genRandomNum);
         uApp.setId(queryUserApp.getId());