From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java b/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java
index 861c8ac..5ef5472 100644
--- a/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java
+++ b/applet/src/main/java/com/jilongda/applet/security/SysUserDetailsService.java
@@ -1,18 +1,12 @@
package com.jilongda.applet.security;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jilongda.applet.mapper.SecRoleMapper;
-import com.jilongda.applet.mapper.SecUserMapper;
-import com.jilongda.applet.model.SecRole;
+import com.jilongda.applet.mapper.TAppUserMapper;
import com.jilongda.applet.model.SecUser;
-import com.jilongda.applet.service.SecUserService;
-import com.jilongda.applet.service.TUserService;
-import com.jilongda.applet.vo.SecResourceVO;
+import com.jilongda.applet.model.TAppUser;
import com.jilongda.common.basic.Constant;
-import com.jilongda.common.model.TUser;
import com.jilongda.common.utils.SpringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.ParameterResolutionDelegate;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Component;
@@ -34,21 +28,17 @@
@Component("loadUserDetailsService")
public class SysUserDetailsService implements UserDetailsService {
@Autowired
- private SecUserMapper secUserMapper;
- @Autowired
- private SecRoleMapper secRoleMapper;
-// @Autowired
-// private SecResourcesMapper secResourcesMapper;
- @Autowired
- private SecUserService secUserService;
+ private TAppUserMapper appUserMapper;
@Override
- public SecurityUserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
- SecUser user = secUserMapper.selectOne(Wrappers.lambdaQuery(SecUser.class).eq(SecUser::getPhone, username).last(" LIMIT 1"));
+ public SecurityUserDetails loadUserByUsername(String openId) throws UsernameNotFoundException {
+ TAppUser user = appUserMapper.selectOne(Wrappers.lambdaQuery(TAppUser.class).eq(TAppUser::getOpenId, openId).last(" LIMIT 1"));
+
if (Objects.isNull(user)) {
- throw new UsernameNotFoundException("无效手机号码");
+ throw new UsernameNotFoundException("该用户不存在");
}
+
SecurityUserDetails vo = SpringUtils.beanCopy(user, SecurityUserDetails.class);
// if (user.getAccount().equals(Constant.ADMIN)) {
// getAdminPermission(vo);
@@ -71,19 +61,4 @@
// secUserMapper.updateById(securityUserDetails);
return vo;
}
-
-
- /**
- * 为管理员赋所有权限
- *
- * @param
- * @return
- */
-// private SecurityUserDetails getAdminPermission(SecurityUserDetails details) {
-// List<SecRole> roles = secRoleMapper.selectList(Wrappers.emptyWrapper());
-// List<SecResourceVO> resources = secUserService.selectUserResourcesTag(details.getId());
-// details.setRoles(roles);
-// details.setResources(resources);
-// return details;
-// }
}
--
Gitblit v1.7.1