From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

---
 server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
index 7380b23..ea8f3ab 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
@@ -1,7 +1,6 @@
 package doumeemes.service.system.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.iflytek.antelope.other.client.dto.resp.UserDTO;
 import doumeemes.biz.system.SystemDictDataBiz;
 import doumeemes.config.shiro.ShiroToken;
@@ -13,9 +12,7 @@
 import doumeemes.core.utils.dingding.DingDingUtil;
 import doumeemes.core.utils.dingding.LingyangUtil;
 import doumeemes.core.utils.edpg.EdgpServerUtil;
-import doumeemes.core.utils.edpg.EdgpUtil;
 import doumeemes.core.utils.edpg.bean.AppUserInfoModel;
-import doumeemes.dao.business.dto.CompanyInitDataDTO;
 import doumeemes.dao.business.model.Company;
 import doumeemes.dao.business.model.CompanyUser;
 import doumeemes.dao.ext.CompanyExtMapper;
@@ -93,9 +90,10 @@
                 throw e;
             }
         }
+
         // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
         Subject subject = SecurityUtils.getSubject();
-        ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
+        ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
         try {
             subject.login(token);
             LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -103,6 +101,7 @@
             loginLog.setCompanyId(loginUser.getCompany()!=null?loginUser.getCompany().getId():null);
             loginLog.setCompanyUserId(loginUser.getCompanyUser()!=null?loginUser.getCompanyUser().getId():null);
             loginLog.setSuccess(Boolean.TRUE);
+            loginLog.setOrgin(Constants.USER_LOGIN_ORIGIN.pc);
             systemLoginLogService.create(loginLog);
             return (String)subject.getSession().getId();
         }catch (AuthenticationException e) {
@@ -149,7 +148,7 @@
         }
         // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
         Subject subject = SecurityUtils.getSubject();
-        ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
+        ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
         try {
             subject.login(token);
             LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -229,7 +228,7 @@
             // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
             Subject subject = SecurityUtils.getSubject();
             // 閽夐拤鐧诲綍
-            ShiroToken token = new ShiroToken(companyId,mobile, null,true);
+            ShiroToken token = new ShiroToken(companyId,mobile, null,true,false);
 
             subject.login(token);
             LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
@@ -295,7 +294,7 @@
             // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
             Subject subject = SecurityUtils.getSubject();
             // 閽夐拤鐧诲綍
-            ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
+            ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
             subject.login(atoken);
             LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
             loginUser.getCompanyUser().setName(user.getName());
@@ -366,7 +365,7 @@
             // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
             Subject subject = SecurityUtils.getSubject();
             // 閽夐拤鐧诲綍
-            ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
+            ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
             subject.login(atoken);
             LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
             loginLog.setUserId(loginUser.getId());
@@ -451,7 +450,7 @@
             // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
             Subject subject = SecurityUtils.getSubject();
             // 閽夐拤鐧诲綍
-            ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
+            ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
             subject.login(atoken);
             LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
             loginUser.getCompanyUser().setName(user.getName());
@@ -522,7 +521,7 @@
             // 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
             Subject subject = SecurityUtils.getSubject();
             // 閽夐拤鐧诲綍
-            ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
+            ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
             subject.login(atoken);
             LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
             loginUser.getCompanyUser().setName(user.getName());
@@ -554,4 +553,7 @@
         }
     }
 
+
+
+
 }

--
Gitblit v1.9.3