bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

登录

This commit is contained in:
sxu 2025-02-20 10:03:21 +08:00
parent 5707a599fc
commit 30e6a135e4
9 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java
View File

@ -59,8 +59,8 @@ public interface RemoteUserService {
* @param source 请求来源 * @param source 请求来源
* @return 结果 * @return 结果
*/ */
// @GetMapping("/user/custInfoPhoto/{phone}") @GetMapping("/user/custInfoPhoto/{phone}")
// public R<LoginUser> getCustInfoByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); public R<LoginUser> getCustInfoByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** /**
* 通过用户名查询用户信息 * 通过用户名查询用户信息

8
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -56,10 +56,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
return R.fail("获取用户失败:" + throwable.getMessage()); return R.fail("获取用户失败:" + throwable.getMessage());
} }
// @Override @Override
// public R<LoginUser> getCustInfoByPhone(String phone, String source) { public R<LoginUser> getCustInfoByPhone(String phone, String source) {
// return R.fail("获取用户失败:" + throwable.getMessage()); return R.fail("获取用户失败:" + throwable.getMessage());
// } }
/** /**
* 通过用户名查询用户信息 * 通过用户名查询用户信息

9
bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
View File

@ -149,8 +149,13 @@ public class TokenController {
LoginUser login = strategy.login(form.getUsername(), form.getPassword()); LoginUser login = strategy.login(form.getUsername(), form.getPassword());
logService.saveLogin(form.getUsername(), "登录", "登录成功", null, "成功"); logService.saveLogin(form.getUsername(), "登录", "登录成功", null, "成功");
if (LoginType.CUST_PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.CUST_PHONE_OPT.equals(form.getLoginType())) {
if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) { Map<String, Object> map = tokenService.createCustToken(login);
login.setToken((String) map.get("access_token"));
login.setExpireIn((Long) map.get("expires_in"));
login.setLogin((boolean) map.get("isLogin"));
return R.ok(login);
} else if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) {
Map<String, Object> map = tokenService.createToken(login); Map<String, Object> map = tokenService.createToken(login);
login.setToken((String) map.get("access_token")); login.setToken((String) map.get("access_token"));
login.setExpireIn((Long) map.get("expires_in")); login.setExpireIn((Long) map.get("expires_in"));

53
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
View File

@ -100,32 +100,33 @@ public class TokenService {
/** /**
* 创建客户令牌 * 创建客户令牌
*/ */
// public Map<String, Object> createCustToken(LoginUser loginUser) { public Map<String, Object> createCustToken(LoginUser loginUser) {
// // 检查并删除已有的token // 检查并删除已有的token
// delExistingToken(loginUser.getCustId()); delExistingToken(loginUser.getCustId());
// String token = IdUtils.fastUUID(); String token = IdUtils.fastUUID();
// Long custId = loginUser.getCustId(); Long custId = loginUser.getSysUser().getCustId();
// String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber()); String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber());
// loginUser.setToken(token); loginUser.setToken(token);
// loginUser.setCustId(custId); loginUser.setCustId(custId);
// loginUser.setIpaddr(IpUtils.getIpAddr()); loginUser.setNickName(loginUser.getSysUser().getNickName());
// loginUser.getSysUser().setPhonenumber(phoneNumber); loginUser.setIpaddr(IpUtils.getIpAddr());
// refreshToken(loginUser); loginUser.getSysUser().setPhonenumber(phoneNumber);
// // Jwt存储信息 refreshToken(loginUser);
// Map<String, Object> claimsMap = new HashMap<String, Object>(16); // Jwt存储信息
// claimsMap.put(SecurityConstants.USER_KEY, token); Map<String, Object> claimsMap = new HashMap<String, Object>(16);
// claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); claimsMap.put(SecurityConstants.USER_KEY, token);
// claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId);
// String accessToken = JwtUtils.createToken(claimsMap); claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber);
// Map<String, Object> rspMap = new HashMap<String, Object>(16); String accessToken = JwtUtils.createToken(claimsMap);
// rspMap.put("access_token", accessToken); Map<String, Object> rspMap = new HashMap<String, Object>(16);
// rspMap.put("expires_in", EXPIRETIME); rspMap.put("access_token", accessToken);
// rspMap.put("isLogin", isLogin(String.valueOf(custId))); rspMap.put("expires_in", EXPIRETIME);
// long tokenTime = getTokenTime(); rspMap.put("isLogin", isLogin(String.valueOf(custId)));
// //对token进行存储 long tokenTime = getTokenTime();
// redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES); //对token进行存储
// return rspMap; redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES);
// } return rspMap;
}
public boolean isLogin(String userId) { public boolean isLogin(String userId) {
String existingTokenKey = redisService.getCacheObject(LOGIN_USER_KEY + userId); String existingTokenKey = redisService.getCacheObject(LOGIN_USER_KEY + userId);

36
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -209,24 +209,24 @@ public class SysUserController extends BaseController {
/** /**
* 获取当前用户信息 * 获取当前用户信息
*/ */
// @InnerAuth @InnerAuth
// @GetMapping("/custInfoPhoto/{photoNumber}") @GetMapping("/custInfoPhoto/{photoNumber}")
// public R<LoginUser> custInfoPhotoNumber(@PathVariable("photoNumber") String photoNumber) { public R<LoginUser> custInfoPhotoNumber(@PathVariable("photoNumber") String photoNumber) {
// SysUser sysUser = userService.selectCustInfoByPhoneNumber(photoNumber); SysUser sysUser = userService.selectCustInfoByPhoneNumber(photoNumber);
// if (StringUtils.isNull(sysUser)) { if (StringUtils.isNull(sysUser)) {
// return R.fail("用户名或密码错误"); return R.fail("用户名或密码错误");
// } }
// // 角色集合 // 角色集合
// //Set<String> roles = permissionService.getRolePermission(sysUser); //Set<String> roles = permissionService.getRolePermission(sysUser);
// // 权限集合 // 权限集合
// //Set<String> permissions = permissionService.getMenuPermission(sysUser); //Set<String> permissions = permissionService.getMenuPermission(sysUser);
// LoginUser loginUser = new LoginUser(); LoginUser loginUser = new LoginUser();
// loginUser.setCustId(sysUser.getCustId()); loginUser.setCustId(sysUser.getCustId());
// loginUser.setSysUser(sysUser); loginUser.setSysUser(sysUser);
// //sysUserVo.setRoles(roles); //sysUserVo.setRoles(roles);
// //sysUserVo.setPermissions(permissions); //sysUserVo.setPermissions(permissions);
// return R.ok(loginUser); return R.ok(loginUser);
// } }
/** /**
* 注册用户信息 * 注册用户信息

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
View File

@ -162,7 +162,7 @@ public interface SysUserMapper {
* @param * @param
* @return 用户对象信息 * @return 用户对象信息
*/ */
// public SysUser selectCustInfoByPhoneNumber(@Param("phoneNumber") String phoneNumber); public SysUser selectCustInfoByPhoneNumber(@Param("phoneNumber") String phoneNumber);
public void transferUserInfo(SysUser sysUser); public void transferUserInfo(SysUser sysUser);
} }

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
View File

@ -237,5 +237,5 @@ public interface ISysUserService {
public AjaxResult systemUpdateUser(SysUser user); public AjaxResult systemUpdateUser(SysUser user);
// public SysUser selectCustInfoByPhoneNumber(String photoNumber); public SysUser selectCustInfoByPhoneNumber(String photoNumber);
} }

8
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
View File

@ -689,9 +689,9 @@ public class SysUserServiceImpl implements ISysUserService {
* @param photoNumber 用户名 * @param photoNumber 用户名
* @return 用户对象信息 * @return 用户对象信息
*/ */
// @Override @Override
// public SysUser selectCustInfoByPhoneNumber(String photoNumber) { public SysUser selectCustInfoByPhoneNumber(String photoNumber) {
// return userMapper.selectCustInfoByPhoneNumber(Sm4Utils.custEncrypt(photoNumber)); return userMapper.selectCustInfoByPhoneNumber(Sm4Utils.custEncrypt(photoNumber));
// } }
} }

24
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -380,18 +380,18 @@
</foreach> </foreach>
</delete> </delete>
<!-- &lt;!&ndash;根据人员id集合获取人员信息&ndash;&gt;--> <!--根据人员id集合获取人员信息-->
<!-- <select id="selectCustInfoByPhoneNumber" resultType="com.bonus.system.api.domain.SysUser">--> <select id="selectCustInfoByPhoneNumber" resultType="com.bonus.system.api.domain.SysUser">
<!-- select cust_id as custId, cust_name as custName, cust_num as custNum, cust_photo_url as custPhotoUrl,--> select cust_id as custId, cust_name as custName, cust_num as custNum, cust_photo_url as custPhotoUrl,
<!-- mobile as phonenumber, pwd as password--> mobile as phonenumber, pwd as password
<!-- from cust_info--> from cust_info
<!-- <where>--> <where>
<!-- cust_state = 1 and (psn_type != 999 or psn_type is null)--> cust_state = 1 and (psn_type != 999 or psn_type is null)
<!-- <if test="phoneNumber != null and phoneNumber != ''">--> <if test="phoneNumber != null and phoneNumber != ''">
<!-- and mobile = #{phoneNumber}--> and mobile = #{phoneNumber}
<!-- </if>--> </if>
<!-- </where>--> </where>
<!-- </select>--> </select>
<!-- 安徽送变电绿智食堂用户数据转换工具 --> <!-- 安徽送变电绿智食堂用户数据转换工具 -->
<delete id="transferUserInfo" parameterType="com.bonus.system.api.domain.SysUser"> <delete id="transferUserInfo" parameterType="com.bonus.system.api.domain.SysUser">