From 22a8057ea4c94f7740d81093ffcabd2014e95f51 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 25 十月 2023 15:29:41 +0800
Subject: [PATCH] update 优化 客户端禁用限制
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index 82779b1..e41b4d0 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -10,6 +10,7 @@
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginBody;
import org.dromara.common.core.domain.model.RegisterBody;
@@ -78,6 +79,8 @@
if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
log.info("瀹㈡埛绔痠d: {} 璁よ瘉绫诲瀷锛歿} 寮傚父!.", clientId, grantType);
return R.fail(MessageUtils.message("auth.grant.type.error"));
+ } else if (!UserConstants.NORMAL.equals(client.getStatus())) {
+ return R.fail(MessageUtils.message("auth.grant.type.stop"));
}
// 鏍￠獙绉熸埛
loginService.checkTenant(loginBody.getTenantId());
@@ -109,7 +112,7 @@
* @return 缁撴灉
*/
@PostMapping("/social/callback")
- public R<LoginVo> socialCallback(@RequestBody LoginBody loginBody) {
+ public R<Void> socialCallback(@RequestBody LoginBody loginBody) {
// 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
AuthUser authUserData = response.getData();
@@ -117,7 +120,8 @@
if (!response.ok()) {
return R.fail(response.getMsg());
}
- return loginService.sociaRegister(authUserData);
+ loginService.socialRegister(authUserData);
+ return R.ok();
}
--
Gitblit v1.9.3