jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化第三方授权登录

Browse Source
This commit is contained in:
thiszhc
2023-06-15 19:30:17 +08:00
parent 5110961eb9
commit 005e7df1b8
15 changed files with 113 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java
View File

@ -1,105 +0,0 @@
package org.dromara.system.controller.system;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.system.domain.vo.SocialUserVo;
import org.dromara.system.domain.bo.SocialUserBo;
import org.dromara.system.service.ISocialUserService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 社会化关系
*
* @author thiszhc
* @date 2023-06-12
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/socialUser")
public class SocialUserController extends BaseController {
private final ISocialUserService socialUserService;
/**
* 查询社会化关系列表
*/
@SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo<SocialUserVo> list(SocialUserBo bo, PageQuery pageQuery) {
return socialUserService.queryPageList(bo, pageQuery);
}
/**
* 导出社会化关系列表
*/
@SaCheckPermission("system:user:export")
@Log(title = "社会化关系", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SocialUserBo bo, HttpServletResponse response) {
List<SocialUserVo> list = socialUserService.queryList(bo);
ExcelUtil.exportExcel(list, "社会化关系", SocialUserVo.class, response);
}
/**
* 获取社会化关系详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:user:query")
@GetMapping("/{id}")
public R<SocialUserVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(socialUserService.queryById(id));
}
/**
* 新增社会化关系
*/
@SaCheckPermission("system:user:add")
@Log(title = "社会化关系", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SocialUserBo bo) {
return toAjax(socialUserService.insertByBo(bo));
}
/**
* 修改社会化关系
*/
@SaCheckPermission("system:user:edit")
@Log(title = "社会化关系", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SocialUserBo bo) {
return toAjax(socialUserService.updateByBo(bo));
}
/**
* 删除社会化关系
*
* @param ids 主键串
*/
@SaCheckPermission("system:user:remove")
@Log(title = "社会化关系", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(socialUserService.deleteWithValidByIds(List.of(ids), true));
}
}

24
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISocialUserService.java
View File

@ -19,35 +19,11 @@ import java.util.List;
*/
public interface ISocialUserService {
/**
* 查询授权关系
*/
SocialUserVo queryById(Long id);
/**
* 查询授权列表
*/
TableDataInfo<SocialUserVo> queryPageList(SocialUserBo bo, PageQuery pageQuery);
/**
* 查询授权列表
*/
List<SocialUserVo> queryList(SocialUserBo bo);
/**
* 新增授权关系
*/
Boolean insertByBo(SocialUserBo bo);
/**
* 修改授权关系
*/
Boolean updateByBo(SocialUserBo bo);
/**
* 校验并批量删除社会化关系信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 删除社会化关系信息

69
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SocialUserServiceImpl.java
View File

@ -33,56 +33,6 @@ public class SocialUserServiceImpl implements ISocialUserService {
private final SocialUserMapper baseMapper;
/**
* 查询社会化关系
*/
@Override
public SocialUserVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
/**
* 查询社会化关系列表
*/
@Override
public TableDataInfo<SocialUserVo> queryPageList(SocialUserBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SocialUser> lqw = buildQueryWrapper(bo);
Page<SocialUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询社会化关系列表
*/
@Override
public List<SocialUserVo> queryList(SocialUserBo bo) {
LambdaQueryWrapper<SocialUser> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SocialUser> buildQueryWrapper(SocialUserBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SocialUser> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getAuthId()), SocialUser::getAuthId, bo.getAuthId());
lqw.eq(StringUtils.isNotBlank(bo.getSource()), SocialUser::getSource, bo.getSource());
lqw.eq(StringUtils.isNotBlank(bo.getAccessToken()), SocialUser::getAccessToken, bo.getAccessToken());
lqw.eq(bo.getExpireIn() != 0, SocialUser::getExpireIn, bo.getExpireIn());
lqw.eq(StringUtils.isNotBlank(bo.getRefreshToken()), SocialUser::getRefreshToken, bo.getRefreshToken());
lqw.eq(StringUtils.isNotBlank(bo.getOpenId()), SocialUser::getOpenId, bo.getOpenId());
lqw.eq(StringUtils.isNotBlank(bo.getScope()), SocialUser::getScope, bo.getScope());
lqw.eq(StringUtils.isNotBlank(bo.getAccessCode()), SocialUser::getAccessCode, bo.getAccessCode());
lqw.eq(StringUtils.isNotBlank(bo.getUnionId()), SocialUser::getUnionId, bo.getUnionId());
lqw.eq(StringUtils.isNotBlank(bo.getScope()), SocialUser::getScope, bo.getScope());
lqw.eq(StringUtils.isNotBlank(bo.getTokenType()), SocialUser::getTokenType, bo.getTokenType());
lqw.eq(StringUtils.isNotBlank(bo.getIdToken()), SocialUser::getIdToken, bo.getIdToken());
lqw.eq(StringUtils.isNotBlank(bo.getMacAlgorithm()), SocialUser::getMacAlgorithm, bo.getMacAlgorithm());
lqw.eq(StringUtils.isNotBlank(bo.getMacKey()), SocialUser::getMacKey, bo.getMacKey());
lqw.eq(StringUtils.isNotBlank(bo.getCode()), SocialUser::getCode, bo.getCode());
lqw.eq(StringUtils.isNotBlank(bo.getOauthToken()), SocialUser::getOauthToken, bo.getOauthToken());
lqw.eq(StringUtils.isNotBlank(bo.getOauthTokenSecret()), SocialUser::getOauthTokenSecret, bo.getOauthTokenSecret());
return lqw;
}
/**
* 新增社会化关系
*/
@ -97,15 +47,6 @@ public class SocialUserServiceImpl implements ISocialUserService {
return flag;
}
/**
* 修改社会化关系
*/
@Override
public Boolean updateByBo(SocialUserBo bo) {
SocialUser update = MapstructUtils.convert(bo, SocialUser.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
@ -114,16 +55,6 @@ public class SocialUserServiceImpl implements ISocialUserService {
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除社会化关系
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 删除社会化关系

58
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SocialUserMapper.xml
View File

@ -8,61 +8,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<id property="id" column="id"/>
</resultMap>
<sql id="selectSocialUser">
select id,
user_id,
tenant_id,
auth_id,
source,
open_id,
access_token,
expire_in,
refresh_token,
access_code,
union_id,
scope,
token_type,
id_token,
mac_algorithm,
mac_key,
code,
oauth_token,
oauth_token_secret,
create_dept,
create_by,
create_time,
update_by,
update_time
from social_user
</sql>
<!-- 根据userId查询SocialUser表对应userId的SysUser，返回SysUserBo的对象 -->
<select id="selectSocialUserByUserId" parameterType="String" resultMap="SocialUserAuthResult">
select b.*
from social_user a
left join sys_user b on a.user_id = b.user_id
where a.user_id = #{userId}
</select>
<!-- 根据authId查询SocialUser表和SysUser表，返回SocialUserAuthResult映射的对象 -->
<select id="selectSocialUserByAuthId" parameterType="String" resultMap="SocialUserAuthResult">
select b.user_id as userId,
b.tenant_id as tenantId,
b.user_name as userName,
b.password as password,
a.auth_id as authId,
a.source as source
select b.user_id,
b.tenant_id,
b.user_name,
b.password,
a.auth_id,
a.source
from social_user a
left join sys_user b on a.user_id = b.user_id
left join sys_user b on a.user_id = b.user_id
where a.auth_id = #{authId}
</select>
<!-- 根据userId和source查询SocialUser表，返回int类型的结果 -->
<select id="checkSocialUser" parameterType="org.dromara.system.domain.vo.SocialUserVo" resultType="int">
select count(*)
from social_user
where user_id = #{userId} and source = #{source} limit 1
</select>
</mapper>