From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 26 八月 2024 18:11:07 +0800 Subject: [PATCH] 最新版本 --- server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java index e54e578..452cc27 100644 --- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java +++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java @@ -1,15 +1,19 @@ package com.doumee.service.system.impl; +import com.doumee.config.jwt.JwtTokenUtil; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.dao.CompanyMapper; import com.doumee.dao.business.model.Company; +import com.doumee.dao.system.dto.LoginByOpenidDTO; import com.doumee.dao.system.dto.LoginDTO; import com.doumee.dao.system.model.*; import com.doumee.service.common.CaptchaService; import com.doumee.service.system.*; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -22,6 +26,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; @@ -58,6 +63,11 @@ @Autowired private CompanyMapper companyMapper; + + @Resource + private JwtTokenUtil jwtTokenUtil; + + @Override public String loginByPassword(LoginDTO dto, HttpServletRequest request) { @@ -127,7 +137,6 @@ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝g‘锛�"); } } - // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞� SystemUser queryDto = new SystemUser(); queryDto.setUsername(dto.getUsername()); @@ -135,6 +144,9 @@ SystemUser user = systemUserService.findOne(queryDto); if (user == null) { throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT); + } + if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN); } String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt()); // 姣旇緝瀵嗙爜 @@ -158,4 +170,41 @@ return userInfo; } + + /** + * 鍐呴儴浜哄憳 涓� 鍙告満 鏍规嵁code鏌ヨopenId鍚庤繘琛岀櫥褰曟帴鍙� + * @return + */ + @Override + public String loginByUserId(Integer userId) { + SystemLoginLog loginLog = new SystemLoginLog(); + loginLog.setLoginTime(new Date()); + loginLog.setSystemVersion(systemVersion); + loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp())); + loginLog.setServerIp(Utils.Server.getIP()); + + // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞� + SystemUser user = systemUserService.findById(userId); + if (user == null) { + throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT); + } + Company company = new Company(); + if(Objects.nonNull(user.getCompanyId())){ + company = companyMapper.selectById(user.getCompanyId()); + } + // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅 + List<SystemRole> roles = systemRoleService.findByUserId(user.getId()); + List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId()); + + SystemRole rt = new SystemRole(); + rt.setDeleted(Boolean.FALSE); + //鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎 + user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user)); + + LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null); + String token = jwtTokenUtil.generateToken(userInfo); + + return token; + } + } -- Gitblit v1.9.3