From 18e919bde3d925ee76fe29c7a6621c2716b1e4e4 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期五, 21 三月 2025 09:43:31 +0800 Subject: [PATCH] feat(social): 添加 Keycloak社交登录支持 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java index 3fda703..7fe35b9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java @@ -1,8 +1,10 @@ package org.dromara.system.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; import org.dromara.system.domain.SysSocial; import org.dromara.system.domain.bo.SysSocialBo; import org.dromara.system.domain.vo.SysSocialVo; @@ -37,8 +39,12 @@ * 鎺堟潈鍒楄〃 */ @Override - public List<SysSocialVo> queryList() { - return baseMapper.selectVoList(); + public List<SysSocialVo> queryList(SysSocialBo bo) { + LambdaQueryWrapper<SysSocial> lqw = new LambdaQueryWrapper<SysSocial>() + .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId()) + .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId()) + .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource()); + return baseMapper.selectVoList(lqw); } @Override @@ -65,6 +71,15 @@ return flag; } + /** + * 鏇存柊绀句細鍖栧叧绯� + */ + @Override + public Boolean updateByBo(SysSocialBo bo) { + SysSocial update = MapstructUtils.convert(bo, SysSocial.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } /** * 淇濆瓨鍓嶇殑鏁版嵁鏍¢獙 @@ -86,12 +101,19 @@ /** * 鏍规嵁 authId 鏌ヨ鐢ㄦ埛淇℃伅 * - * @param authId 鐢ㄦ埛id - * @return 鐢ㄦ埛淇℃伅 + * @param authId 璁よ瘉id + * @return 鎺堟潈淇℃伅 */ @Override - public SysSocialVo selectByAuthId(String authId) { - return baseMapper.selectByAuthId(authId); + public List<SysSocialVo> selectByAuthId(String authId) { + return baseMapper.selectVoList(new LambdaQueryWrapper<SysSocial>().eq(SysSocial::getAuthId, authId)); + } + + + @Override + public SysSocialVo selectByUserId(Long userId) { + SysSocialVo socialVo = baseMapper.selectVoOne(new LambdaQueryWrapper<SysSocial>().eq(SysSocial::getUserId, userId)); + return socialVo; } } -- Gitblit v1.9.3