|
|
|
@ -14,19 +14,20 @@ import org.dromara.auth.domain.vo.LoginTenantVo;
|
|
|
|
import org.dromara.auth.domain.vo.LoginVo;
|
|
|
|
import org.dromara.auth.domain.vo.LoginVo;
|
|
|
|
import org.dromara.auth.domain.vo.TenantListVo;
|
|
|
|
import org.dromara.auth.domain.vo.TenantListVo;
|
|
|
|
import org.dromara.auth.form.RegisterBody;
|
|
|
|
import org.dromara.auth.form.RegisterBody;
|
|
|
|
|
|
|
|
import org.dromara.auth.form.SocialLoginBody;
|
|
|
|
import org.dromara.auth.service.IAuthStrategy;
|
|
|
|
import org.dromara.auth.service.IAuthStrategy;
|
|
|
|
import org.dromara.auth.service.SysLoginService;
|
|
|
|
import org.dromara.auth.service.SysLoginService;
|
|
|
|
import org.dromara.common.core.constant.UserConstants;
|
|
|
|
import org.dromara.common.core.constant.UserConstants;
|
|
|
|
import org.dromara.common.core.domain.R;
|
|
|
|
import org.dromara.common.core.domain.R;
|
|
|
|
import org.dromara.common.core.domain.model.LoginBody;
|
|
|
|
import org.dromara.common.core.domain.model.LoginBody;
|
|
|
|
import org.dromara.common.core.utils.MapstructUtils;
|
|
|
|
import org.dromara.common.core.utils.*;
|
|
|
|
import org.dromara.common.core.utils.MessageUtils;
|
|
|
|
import org.dromara.common.json.utils.JsonUtils;
|
|
|
|
import org.dromara.common.core.utils.StreamUtils;
|
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
|
|
|
|
|
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
|
|
|
|
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
|
|
|
|
import org.dromara.common.social.config.properties.SocialProperties;
|
|
|
|
import org.dromara.common.social.config.properties.SocialProperties;
|
|
|
|
import org.dromara.common.social.utils.SocialUtils;
|
|
|
|
import org.dromara.common.social.utils.SocialUtils;
|
|
|
|
import org.dromara.common.tenant.helper.TenantHelper;
|
|
|
|
import org.dromara.common.tenant.helper.TenantHelper;
|
|
|
|
|
|
|
|
import org.dromara.resource.api.RemoteMessageService;
|
|
|
|
import org.dromara.system.api.RemoteClientService;
|
|
|
|
import org.dromara.system.api.RemoteClientService;
|
|
|
|
import org.dromara.system.api.RemoteConfigService;
|
|
|
|
import org.dromara.system.api.RemoteConfigService;
|
|
|
|
import org.dromara.system.api.RemoteSocialService;
|
|
|
|
import org.dromara.system.api.RemoteSocialService;
|
|
|
|
@ -38,6 +39,8 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
|
import java.net.URL;
|
|
|
|
import java.net.URL;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.concurrent.ScheduledExecutorService;
|
|
|
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* token 控制
|
|
|
|
* token 控制
|
|
|
|
@ -52,6 +55,7 @@ public class TokenController {
|
|
|
|
|
|
|
|
|
|
|
|
private final SocialProperties socialProperties;
|
|
|
|
private final SocialProperties socialProperties;
|
|
|
|
private final SysLoginService sysLoginService;
|
|
|
|
private final SysLoginService sysLoginService;
|
|
|
|
|
|
|
|
private final ScheduledExecutorService scheduledExecutorService;
|
|
|
|
|
|
|
|
|
|
|
|
@DubboReference
|
|
|
|
@DubboReference
|
|
|
|
private final RemoteConfigService remoteConfigService;
|
|
|
|
private final RemoteConfigService remoteConfigService;
|
|
|
|
@ -61,12 +65,19 @@ public class TokenController {
|
|
|
|
private final RemoteClientService remoteClientService;
|
|
|
|
private final RemoteClientService remoteClientService;
|
|
|
|
@DubboReference
|
|
|
|
@DubboReference
|
|
|
|
private final RemoteSocialService remoteSocialService;
|
|
|
|
private final RemoteSocialService remoteSocialService;
|
|
|
|
|
|
|
|
@DubboReference
|
|
|
|
|
|
|
|
private final RemoteMessageService remoteMessageService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 登录方法
|
|
|
|
* 登录方法
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param body 登录信息
|
|
|
|
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PostMapping("login")
|
|
|
|
@PostMapping("/login")
|
|
|
|
public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
|
|
|
|
public R<LoginVo> login(@Validated @RequestBody String body) {
|
|
|
|
|
|
|
|
LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
|
|
|
|
|
|
|
|
ValidatorUtils.validate(loginBody);
|
|
|
|
// 授权类型和客户端id
|
|
|
|
// 授权类型和客户端id
|
|
|
|
String clientId = loginBody.getClientId();
|
|
|
|
String clientId = loginBody.getClientId();
|
|
|
|
String grantType = loginBody.getGrantType();
|
|
|
|
String grantType = loginBody.getGrantType();
|
|
|
|
@ -82,7 +93,13 @@ public class TokenController {
|
|
|
|
// 校验租户
|
|
|
|
// 校验租户
|
|
|
|
sysLoginService.checkTenant(loginBody.getTenantId());
|
|
|
|
sysLoginService.checkTenant(loginBody.getTenantId());
|
|
|
|
// 登录
|
|
|
|
// 登录
|
|
|
|
return R.ok(IAuthStrategy.login(loginBody, clientVo));
|
|
|
|
LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Long userId = LoginHelper.getUserId();
|
|
|
|
|
|
|
|
scheduledExecutorService.schedule(() -> {
|
|
|
|
|
|
|
|
remoteMessageService.sendMessage(userId, "欢迎登录RuoYi-Cloud-Plus微服务管理系统");
|
|
|
|
|
|
|
|
}, 3, TimeUnit.SECONDS);
|
|
|
|
|
|
|
|
return R.ok(loginVo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -109,9 +126,11 @@ public class TokenController {
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PostMapping("/social/callback")
|
|
|
|
@PostMapping("/social/callback")
|
|
|
|
public R<Void> socialCallback(@RequestBody LoginBody loginBody) {
|
|
|
|
public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
|
|
|
|
// 获取第三方登录信息
|
|
|
|
// 获取第三方登录信息
|
|
|
|
AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
|
|
|
|
AuthResponse<AuthUser> response = SocialUtils.loginAuth(
|
|
|
|
|
|
|
|
loginBody.getSource(), loginBody.getSocialCode(),
|
|
|
|
|
|
|
|
loginBody.getSocialState(), socialProperties);
|
|
|
|
AuthUser authUserData = response.getData();
|
|
|
|
AuthUser authUserData = response.getData();
|
|
|
|
// 判断授权响应是否成功
|
|
|
|
// 判断授权响应是否成功
|
|
|
|
if (!response.ok()) {
|
|
|
|
if (!response.ok()) {
|
|
|
|
|
疯狂的狮子Li
2 years ago
committed by
Gitee