czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉只能一个终端登录限制

Browse Source
This commit is contained in:
zhujunshuai
2023-02-08 11:51:13 +08:00
parent 9740cbc4b7
commit 023f923889
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
View File

@@ -103,15 +103,19 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
// return false; // return false;
// } // }
UserApp userApp = new UserApp(); UserApp userApp = new UserApp();
userApp.setUserId(userInfo.getId()); userApp.setUserId(userInfo.getId());
userApp = userAppService.queryUserApp(userApp); userApp = userAppService.queryUserApp(userApp);
if (!requestToken.equals(userApp.getToken())) { //TODO 去掉设备登录注释
/* if (!requestToken.equals(userApp.getToken())) {
Result<Object> result = new Result<>(); Result<Object> result = new Result<>();
result.setCode(ResultCode.NOT_TOKEN).setMessage("您在其他设备中登录"); result.setCode(ResultCode.NOT_TOKEN).setMessage("您在其他设备中登录");
ComUtil.responseResult(response, result); ComUtil.responseResult(response, result);
return false; return false;
} }*/
if (StringUtils.isNotBlank(merchantCode) && "staff".equals(userApp.getUserType())) { if (StringUtils.isNotBlank(merchantCode) && "staff".equals(userApp.getUserType())) {
MerchantStaffConn staffConn = new MerchantStaffConn().setMerchantCode(merchantCode); MerchantStaffConn staffConn = new MerchantStaffConn().setMerchantCode(merchantCode);

6
pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
View File

@@ -377,7 +377,11 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
// 获取当前用户的详情信息来判断用户的登陆类型 // 获取当前用户的详情信息来判断用户的登陆类型
UserApp queryUserApp = new UserApp().setUserId(checkUserInfo.getId()); UserApp queryUserApp = new UserApp().setUserId(checkUserInfo.getId());
queryUserApp = userAppMapper.selectOne(new QueryWrapper<>(queryUserApp)); 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(); UserApp uApp = new UserApp();
uApp.setToken(genRandomNum); uApp.setToken(genRandomNum);
uApp.setId(queryUserApp.getId()); uApp.setId(queryUserApp.getId());