|
@@ -12,7 +12,6 @@ import com.ydtech.constants.SysConstants;
|
|
|
import com.ydtech.constants.sys.SysPasswordEnum;
|
|
import com.ydtech.constants.sys.SysPasswordEnum;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
import com.ydtech.exception.SystemException;
|
|
|
-import com.ydtech.modules.admin.model.SysDept;
|
|
|
|
|
import com.ydtech.modules.admin.model.SysPassword;
|
|
import com.ydtech.modules.admin.model.SysPassword;
|
|
|
import com.ydtech.modules.admin.model.SysRole;
|
|
import com.ydtech.modules.admin.model.SysRole;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
@@ -23,19 +22,18 @@ import com.ydtech.modules.admin.model.vo.PhoneLoginVo;
|
|
|
import com.ydtech.modules.admin.model.vo.QrCodeStatusEnum;
|
|
import com.ydtech.modules.admin.model.vo.QrCodeStatusEnum;
|
|
|
import com.ydtech.modules.admin.service.SysPasswordService;
|
|
import com.ydtech.modules.admin.service.SysPasswordService;
|
|
|
import com.ydtech.modules.admin.service.SysUserLinkSysService;
|
|
import com.ydtech.modules.admin.service.SysUserLinkSysService;
|
|
|
-import com.ydtech.modules.base.controller.BaseController;
|
|
|
|
|
-import com.ydtech.utils.RedisUtils;
|
|
|
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
import com.ydtech.modules.admin.service.SysUserRoleService;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
|
|
+import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
|
import com.ydtech.utils.IPUtil;
|
|
import com.ydtech.utils.IPUtil;
|
|
|
|
|
+import com.ydtech.utils.RedisUtils;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.tomcat.util.http.fileupload.IOUtils;
|
|
import org.apache.tomcat.util.http.fileupload.IOUtils;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
@@ -205,9 +203,13 @@ public class SysLoginController {
|
|
|
// 用户信息
|
|
// 用户信息
|
|
|
SysUser user = sysUserService.getById(username);
|
|
SysUser user = sysUserService.getById(username);
|
|
|
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- * 多个系统登录
|
|
|
|
|
|
|
+ * 多个系统登录 添加默认参数解决手机端登陆问题
|
|
|
* */
|
|
* */
|
|
|
|
|
+ if(StringUtils.isBlank(loginBean.getSysId())){
|
|
|
|
|
+ loginBean.setSysId("1");
|
|
|
|
|
+ }
|
|
|
if(!SysConstants.ADMIN.equalsIgnoreCase(username) && !"1".equals(loginBean.getSysId())){
|
|
if(!SysConstants.ADMIN.equalsIgnoreCase(username) && !"1".equals(loginBean.getSysId())){
|
|
|
LambdaQueryWrapper<SysUserLinkSys> sysLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysUserLinkSys> sysLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
sysLambdaQueryWrapper.eq(SysUserLinkSys::getUserId, user.getId());
|
|
sysLambdaQueryWrapper.eq(SysUserLinkSys::getUserId, user.getId());
|