From 452ae35c93f616112a9a5585fbe5229e93be5b7c Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Mon, 27 Apr 2020 19:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/service/impl/LoginServiceImpl.java  | 53 ++++++-------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
index 9098296..3d1f336 100644
--- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
@@ -190,11 +190,8 @@ public class LoginServiceImpl implements LoginService {
         accountQw.eq("login",mobile);
         accountQw.eq("type",AccountEnum.ACCOUNT_TYPE_MOBILE.getType());
         List<PrivilageAccountDO> mobileAccounts = privilageAccountDOMapper.selectList(accountQw);
-        Subject subject = SecurityUtils.getSubject();
-        UsernamePasswordToken token = null;
         Long userId = null;
         if (CollectionUtils.isNotEmpty(mobileAccounts)){
-            token = new UsernamePasswordToken(mobileAccounts.get(0).getLogin(), mobileAccounts.get(0).getPassword(), true);
             userId = mobileAccounts.get(0).getUserId();
         }else{
             QueryWrapper<PrivilageUserDO> userQw = new QueryWrapper<>();
@@ -209,9 +206,7 @@ public class LoginServiceImpl implements LoginService {
                 privilageAccountDO.setUserId(userId);
                 privilageAccountDO.setType(AccountEnum.ACCOUNT_TYPE_MOBILE.getType());
                 int insert = privilageAccountDOMapper.insert(privilageAccountDO);
-                if (insert > 1){
-                    token = new UsernamePasswordToken(mobile, "", true);
-                }else{
+                if (insert == 0){
                     return new LoginBean(Constants.ERROR_SYSTEM);
                 }
             }else{
@@ -219,39 +214,25 @@ public class LoginServiceImpl implements LoginService {
             }
         }
 
-        try {
-            subject.login(token);
-        } catch (UnknownAccountException e) {//账号不存在
-            return new LoginBean(Constants.ERROR_ACCOUNT_NOT_EXIST);
-        } catch (IncorrectCredentialsException e) {//密码错误
-            return new LoginBean(Constants.ERROR_PASSWORD);
-        }catch (AuthenticationException e) {
-            log.info("login exception", e);
-            return new LoginBean(Constants.ERROR_SYSTEM);
-        }
 
         LoginBean loginBean = new LoginBean();
-        if (subject.isAuthenticated()) {
-            Map<String, Object> selectAccountMap = new HashMap<>();
-            PrivilageUserDO privilageUserDO = privilageUserDOMapper.selectById(userId);
-            PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId);
-            Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId);
-            Map<String, Object> loginInfoMap = new HashMap<>();
-            //成功设置信息
-            loginBean.setUserName(privilageUserDO.getName());
-            loginBean.setUserId(privilageUserDO.getId());
-            loginBean.setRoleId(privilageUserDO.getId());
-            loginBean.setRoleCode(roleDO.getCode());
-            loginBean.setStoreId(storeId);
-            if (StringUtils.isNotBlank(roleDO.getCode()) && !MINI_ROLE_CODE.contains(roleDO.getCode())){
-                return new LoginBean(Constants.ERROR_ROLE_NO_PERMISSION);
-            }
-            loginBean.setLogin(mobile);
-            loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode());
-            loginBean.setLoginInfo(loginInfoMap);
-        }else {
-            return new LoginBean(Constants.LOGIN_NO_PERMISSIONS);
+        Map<String, Object> selectAccountMap = new HashMap<>();
+        PrivilageUserDO privilageUserDO = privilageUserDOMapper.selectById(userId);
+        PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId);
+        Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId);
+        Map<String, Object> loginInfoMap = new HashMap<>();
+        //成功设置信息
+        loginBean.setUserName(privilageUserDO.getName());
+        loginBean.setUserId(privilageUserDO.getId());
+        loginBean.setRoleId(privilageUserDO.getId());
+        loginBean.setRoleCode(roleDO.getCode());
+        loginBean.setStoreId(storeId);
+        if (StringUtils.isNotBlank(roleDO.getCode()) && !MINI_ROLE_CODE.contains(roleDO.getCode())){
+            return new LoginBean(Constants.ERROR_ROLE_NO_PERMISSION);
         }
+        loginBean.setLogin(mobile);
+        loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode());
+        loginBean.setLoginInfo(loginInfoMap);
         return loginBean;
     }