From 6b147786912eeaa62350610b7ee9235ff156e3ba Mon Sep 17 00:00:00 2001
From: 三个三 <2029364173@qq.com>
Date: 星期日, 02 七月 2023 15:24:14 +0800
Subject: [PATCH] !382 统一登录，授权
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java | 2
ruoyi-admin/src/main/java/org/dromara/web/service/impl/socialAuthStrategy.java | 109 ++++++++++++++++++
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 36 ++---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java | 22 +++
script/sql/ry_vue_5.X.sql | 4
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 77 +++---------
ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java | 30 ++++
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java | 4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java | 21 +++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java | 4
10 files changed, 216 insertions(+), 93 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 9032d27..2ed4ed4 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
@@ -6,7 +6,6 @@
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
@@ -87,7 +86,7 @@
}
/**
- * 璁よ瘉鎺堟潈
+ * 绗笁鏂圭櫥褰曡姹�
*
* @param source 鐧诲綍鏉ユ簮
* @return 缁撴灉
@@ -98,36 +97,31 @@
if (ObjectUtil.isNull(obj)) {
return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔");
}
- AuthRequest authRequest = SocialUtils.getAuthRequest(source,
- obj.getClientId(),
- obj.getClientSecret(),
- obj.getRedirectUri());
+ AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
return R.ok(authorizeUrl);
}
/**
* 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞�
- *
- * @param source 鐧诲綍鏉ユ簮
- * @param callback 鎺堟潈鍝嶅簲瀹炰綋
+ * 缁戝畾鎺堟潈
+ * @param loginBody
* @return 缁撴灉
*/
@SuppressWarnings("unchecked")
- @GetMapping("/social-login")
- public R<String> socialLogin(String source, AuthCallback callback) {
- SocialLoginConfigProperties obj = socialProperties.getType().get(source);
- if (ObjectUtil.isNull(obj)) {
- return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔");
- }
- AuthRequest authRequest = SocialUtils.getAuthRequest(source,
- obj.getClientId(),
- obj.getClientSecret(),
- obj.getRedirectUri());
- AuthResponse<AuthUser> response = authRequest.login(callback);
- return loginService.socialLogin(source, response);
+ @PostMapping("/social/callback")
+ public R<LoginVo> socialLogin(@RequestBody LoginBody loginBody) {
+ // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
+ AuthUser authUserData = response.getData();
+ // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
+ if (!response.ok()) {
+ return R.fail(response.getMsg());
+ }
+ return loginService.sociaRegister(authUserData);
}
+
/**
* 鍙栨秷鎺堟潈
*
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 88500b2..4da2bb0 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -1,14 +1,12 @@
package org.dromara.web.service;
import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
@@ -16,12 +14,14 @@
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.enums.DeviceType;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.enums.TenantStatus;
import org.dromara.common.core.enums.UserStatus;
import org.dromara.common.core.exception.user.UserException;
-import org.dromara.common.core.utils.*;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
@@ -29,13 +29,13 @@
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysSocialBo;
-import org.dromara.system.domain.vo.SysSocialVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysPermissionService;
import org.dromara.system.service.ISysSocialService;
import org.dromara.system.service.ISysTenantService;
+import org.dromara.web.domain.vo.LoginVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -66,67 +66,26 @@
private final ISysSocialService sysSocialService;
private final SysUserMapper userMapper;
- /**
- * 绀句氦鐧诲綍
- *
- * @param source 鐧诲綍鏉ユ簮
- * @param authUser 鎺堟潈鍝嶅簲瀹炰綋
- * @return 缁熶竴鍝嶅簲瀹炰綋
- */
- public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser) {
- // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
- if (!authUser.ok()) {
- return R.fail("瀵逛笉璧凤紝鎺堟潈淇℃伅楠岃瘉涓嶉�氳繃锛岃閫�鍑洪噸璇曪紒");
- }
- AuthUser authUserData = authUser.getData();
- SysSocialVo social = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
- if (ObjectUtil.isNotNull(social)) {
- SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getUserId, social.getUserId()));
- // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- return loginAndRecord(user.getTenantId(), user.getUserName(), authUserData);
- } else {
- // 鍒ゆ柇鏄惁宸茬櫥褰�
- if (!StpUtil.isLogin()) {
- return R.fail("鎺堟潈澶辫触锛岃鍏堢櫥褰曟墠鑳界粦瀹�");
- }
- SysSocialBo bo = new SysSocialBo();
- bo.setUserId(LoginHelper.getUserId());
- bo.setAuthId(authUserData.getSource() + authUserData.getUuid());
- bo.setSource(authUserData.getSource());
- bo.setUserName(authUserData.getUsername());
- bo.setNickName(authUserData.getNickname());
- bo.setAvatar(authUserData.getAvatar());
- bo.setOpenId(authUserData.getUuid());
- BeanUtils.copyProperties(authUserData.getToken(), bo);
- sysSocialService.insertByBo(bo);
- SysUserVo sysUser = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
- // 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- return loginAndRecord(sysUser.getTenantId(), sysUser.getUserName(), authUserData);
- }
- }
/**
- * 鎵ц鐧诲綍鍜岃褰曠櫥褰曚俊鎭搷浣�
- *
- * @param tenantId 绉熸埛ID
- * @param userName 鐢ㄦ埛鍚�
- * @param authUser 鎺堟潈鐢ㄦ埛淇℃伅
+ * 缁戝畾绗笁鏂圭敤鎴�
+ * @param authUserData 鎺堟潈鍝嶅簲瀹炰綋
* @return 缁熶竴鍝嶅簲瀹炰綋
*/
- private R<String> loginAndRecord(String tenantId, String userName, AuthUser authUser) {
- checkTenant(tenantId);
- SysUserVo user = loadUserByUsername(tenantId, userName);
- SaLoginModel model = new SaLoginModel();
- model.setDevice(DeviceType.PC.getDevice());
- // 鐢熸垚token
- LoginHelper.login(buildLoginUser(user), model);
- recordLogininfor(user.getTenantId(), userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
- recordLoginInfo(user.getUserId());
- return R.ok(StpUtil.getTokenValue());
+ public R<LoginVo> sociaRegister(AuthUser authUserData ){
+ SysSocialBo bo = new SysSocialBo();
+ bo.setUserId(LoginHelper.getUserId());
+ bo.setAuthId(authUserData.getSource() + authUserData.getUuid());
+ bo.setOpenId(authUserData.getUuid());
+ bo.setUserName(authUserData.getUsername());
+ BeanUtils.copyProperties(authUserData, bo);
+ BeanUtils.copyProperties(authUserData.getToken(), bo);
+ sysSocialService.insertByBo(bo);
+ return R.ok();
}
+
/**
* 閫�鍑虹櫥褰�
*/
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/socialAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/socialAuthStrategy.java
new file mode 100644
index 0000000..c7599eb
--- /dev/null
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/socialAuthStrategy.java
@@ -0,0 +1,109 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.SaLoginModel;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.SocialLogin;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.core.validate.auth.SocialGroup;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysSocialVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysSocialService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绗笁鏂规巿鏉冪瓥鐣�
+ *
+ * @author thiszhc is 涓変笁
+ */
+@Slf4j
+@Service("social" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class socialAuthStrategy implements IAuthStrategy {
+
+ private final SocialProperties socialProperties;
+ private final ISysSocialService sysSocialService;
+ private final SysUserMapper userMapper;
+ private final SysLoginService loginService;
+
+
+ @Override
+ public void validate(LoginBody loginBody) {
+ ValidatorUtils.validate(loginBody, SocialGroup.class);
+ }
+
+ /**
+ * 鐧诲綍-绗笁鏂规巿鏉冪櫥褰�
+ * @param clientId 瀹㈡埛绔痠d
+ * @param loginBody 鐧诲綍淇℃伅
+ * @param client 瀹㈡埛绔俊鎭�
+ */
+ @Override
+ public LoginVo login(String clientId, LoginBody loginBody, SysClient client) {
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody,socialProperties);
+ if (!response.ok()) {
+ throw new ServiceException(response.getMsg());
+ }
+ AuthUser authUserData = response.getData();
+ SysSocialVo social = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
+ if (!ObjectUtil.isNotNull(social)) {
+ throw new ServiceException("浣犺繕娌℃湁缁戝畾绗笁鏂硅处鍙凤紝缁戝畾鍚庢墠鍙互鐧诲綍锛�");
+ }//楠岃瘉鎺堟潈琛ㄩ噷闈㈢殑绉熸埛id鏄惁鍖呭惈褰撳墠绉熸埛id
+ if (ObjectUtil.isNotNull(social) && StrUtil.isNotBlank(social.getTenantId())
+ && !social.getTenantId().contains(loginBody.getTenantId())) {
+ throw new ServiceException("瀵逛笉璧凤紝浣犳病鏈夋潈闄愮櫥褰曞綋鍓嶇鎴凤紒");
+ }
+ return loadinUser(social, client);
+ }
+
+ /**
+ * 鐧诲綍鐢ㄦ埛淇℃伅
+ *
+ * @param social
+ * @param client
+ * @return
+ */
+ private LoginVo loadinUser(SysSocialVo social, SysClient client) {
+ SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getUserId, social.getUserId()));
+ SocialLogin loginUser = new SocialLogin();
+ loginUser.setUserId(user.getUserId());
+ loginUser.setTenantId(user.getTenantId());
+ loginUser.setUsername(user.getUserName());
+ loginUser.setUserType(user.getUserType());
+ // 鎵ц鐧诲綍
+ SaLoginModel model = new SaLoginModel();
+ model.setDevice(client.getDeviceType());
+ // 鑷畾涔夊垎閰� 涓嶅悓鐢ㄦ埛浣撶郴 涓嶅悓 token 鎺堟潈鏃堕棿 涓嶈缃粯璁よ蛋鍏ㄥ眬 yml 閰嶇疆
+ // 渚嬪: 鍚庡彴鐢ㄦ埛30鍒嗛挓杩囨湡 app鐢ㄦ埛1澶╄繃鏈�
+ model.setTimeout(client.getTimeout());
+ model.setActiveTimeout(client.getActiveTimeout());
+ // 鐢熸垚token
+ LoginHelper.login(loginUser, model);
+
+ loginService.recordLogininfor(loginUser.getTenantId(), user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+ loginService.recordLoginInfo(user.getUserId());
+ LoginVo loginVo = new LoginVo();
+ loginVo.setAccessToken(StpUtil.getTokenValue());
+ return loginVo;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
index 09842a9..cdff773 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -3,10 +3,7 @@
import jakarta.validation.constraints.Email;
import org.dromara.common.core.constant.UserConstants;
import lombok.Data;
-import org.dromara.common.core.validate.auth.EmailGroup;
-import org.dromara.common.core.validate.auth.PasswordGroup;
-import org.dromara.common.core.validate.auth.SmsGroup;
-import org.dromara.common.core.validate.auth.WechatGroup;
+import org.dromara.common.core.validate.auth.*;
import org.hibernate.validator.constraints.Length;
import jakarta.validation.constraints.NotBlank;
@@ -103,4 +100,21 @@
@NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
private String xcxCode;
+ /**
+ * 绗笁鏂圭櫥褰曞钩鍙�
+ */
+ @NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
+ private String source;
+
+ /**
+ * 绗笁鏂圭櫥褰昪ode
+ */
+ @NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
+ private String socialCode;
+
+ /**
+ * 绗笁鏂圭櫥褰晄ocialState
+ */
+ @NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
+ private String socialState;
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java
new file mode 100644
index 0000000..5666bce
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLogin.java
@@ -0,0 +1,21 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 绗笁鏂圭櫥褰曠敤鎴疯韩浠芥潈闄�
+ *
+ * @author thiszhc is 涓変笁
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class SocialLogin extends LoginUser{
+
+ /**
+ * openid
+ */
+ private String openid;
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java
new file mode 100644
index 0000000..2b19ffe
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/auth/SocialGroup.java
@@ -0,0 +1,4 @@
+package org.dromara.common.core.validate.auth;
+
+public interface SocialGroup {
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
index a11520b..f24ea04 100644
--- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
@@ -1,18 +1,38 @@
package org.dromara.common.social.utils;
+import cn.hutool.core.util.ObjectUtil;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.*;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
/**
* 璁よ瘉鎺堟潈宸ュ叿绫�
*
* @author thiszhc
*/
-public class SocialUtils {
+public class SocialUtils {
+ public static AuthResponse<AuthUser> loginAuth(LoginBody loginBody, SocialProperties socialProperties) throws AuthException {
+ AuthRequest authRequest = getAuthRequest(loginBody.getSource(), socialProperties);
+ AuthCallback callback = new AuthCallback();
+ callback.setCode(loginBody.getSocialCode());
+ callback.setState(loginBody.getSocialState());
+ return authRequest.login(callback);
+ }
- public static AuthRequest getAuthRequest(String source, String clientId,
- String clientSecret, String redirectUri) throws AuthException {
+ public static AuthRequest getAuthRequest(String source,SocialProperties socialProperties) throws AuthException {
+ SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+ if (ObjectUtil.isNull(obj)) {
+ throw new AuthException("涓嶆敮鎸佺殑绗笁鏂圭櫥褰曠被鍨�");
+ }
+ String clientId = obj.getClientId();
+ String clientSecret = obj.getClientSecret();
+ String redirectUri = obj.getRedirectUri();
AuthRequest authRequest = null;
switch (source.toLowerCase()) {
case "dingtalk" ->
@@ -45,13 +65,15 @@
case "alipay" ->
// 鏀粯瀹濆湪鍒涘缓鍥炶皟鍦板潃鏃讹紝涓嶅厑璁镐娇鐢╨ocalhost鎴栬��127.0.0.1锛屾墍浠ヨ繖鍎跨殑鍥炶皟鍦板潃浣跨敤鐨勫眬鍩熺綉鍐呯殑ip
authRequest = new AuthAlipayRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
- .alipayPublicKey("").redirectUri(redirectUri).build());
+ .redirectUri(redirectUri).build());
case "qq" ->
authRequest = new AuthQqRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
.redirectUri(redirectUri).build());
case "wechat_open" -> authRequest = new AuthWeChatOpenRequest(AuthConfig.builder().clientId(clientId)
.clientSecret(clientSecret).redirectUri(redirectUri).build());
case "csdn" ->
+ //娉ㄦ剰,缁忓挩璇SDN瀹樻柟瀹㈡湇寰楃煡锛孋SDN鐨勬巿鏉冨紑鏀惧钩鍙板凡缁忎笅绾裤�傚鏋滀互鍓嶇敵璇疯繃鐨勫簲鐢紝鍙互缁х画浣跨敤锛屼絾鏄笉鍐嶆敮鎸佺敵璇锋柊鐨勫簲鐢ㄣ��
+ // so, 鏈」鐩腑鐨凜SDN鐧诲綍鍙兘閽堝灏戦儴鍒嗙敤鎴蜂娇鐢ㄤ簡
authRequest = new AuthCsdnRequest(AuthConfig.builder().clientId(clientId).clientSecret(clientSecret)
.redirectUri(redirectUri).build());
case "taobao" ->
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java
index d3b32e0..7784271 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java
@@ -57,9 +57,8 @@
private String refreshToken;
/**
- * 鐢ㄦ埛鐨� open id
+ * 骞冲彴鍞竴id
*/
- @NotBlank(message = "鐢ㄦ埛鐨� open id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String openId;
/**
@@ -139,4 +138,5 @@
private String oauthTokenSecret;
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
index 2a72efe..8a00cc3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
@@ -73,7 +73,7 @@
/**
* 鐢ㄦ埛鐨� open id
*/
- @ExcelProperty(value = "鐢ㄦ埛鐨� open id")
+ @ExcelProperty(value = "骞冲彴鐨勫敮涓�id")
private String openId;
/**
diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql
index b369b4e..1aad1d5 100644
--- a/script/sql/ry_vue_5.X.sql
+++ b/script/sql/ry_vue_5.X.sql
@@ -7,9 +7,9 @@
id bigint not null comment '涓婚敭',
user_id bigint not null comment '鐢ㄦ埛ID',
tenant_id varchar(20) default null comment '绉熸埛id',
- auth_id varchar(255) not null comment '鎺堟潈+鎺堟潈openid',
+ auth_id varchar(255) not null comment '骞冲彴+骞冲彴鍞竴id',
source varchar(255) not null comment '鐢ㄦ埛鏉ユ簮',
- open_id varchar(255) default null comment '鍘熺敓open id',
+ open_id varchar(255) default null comment '骞冲彴缂栧彿鍞竴id',
user_name varchar(30) not null comment '鐧诲綍璐﹀彿',
nick_name varchar(30) default '' comment '鐢ㄦ埛鏄电О',
email varchar(255) default '' comment '鐢ㄦ埛閭',
--
Gitblit v1.9.3