|
|
@@ -134,11 +134,16 @@ public class LoginServiceImpl implements LoginService {
|
|
|
|
|
|
@Override
|
|
|
public ModelMap loginByToken(TokenLogin loginParam) {
|
|
|
+ return loginByToken(loginParam, false);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public ModelMap loginByToken(TokenLogin loginParam, boolean skip) {
|
|
|
Token tk = tokenService.findOne(loginParam.getToken());
|
|
|
// token不存在则不登录返回
|
|
|
if (tk == null) {
|
|
|
LOGGER.warn("token({})已过期", loginParam.getToken());
|
|
|
- new ModelMap("returnUrl", HttpUtil.decodeURL(loginParam.getReturnUrl()));
|
|
|
+ return new ModelMap("returnUrl", HttpUtil.decodeURL(loginParam.getReturnUrl()));
|
|
|
}
|
|
|
|
|
|
// 取出token数据
|
|
|
@@ -163,6 +168,12 @@ public class LoginServiceImpl implements LoginService {
|
|
|
}
|
|
|
return null;
|
|
|
}).orElse(null);
|
|
|
+
|
|
|
+ // 是否忽略用户不在企业的情况
|
|
|
+ if (!skip && spaceUU == null) {
|
|
|
+ LOGGER.warn("当前用户在优软云未绑定企业,参数:{}", JSON.toJSONString(loginParam));
|
|
|
+ throw new VisibleError("当前用户在优软云未绑定企业");
|
|
|
+ }
|
|
|
return login(userUU, spaceUU, loginParam);
|
|
|
}
|
|
|
|