diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java index d46cd60..8812e95 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java @@ -59,8 +59,8 @@ public interface RemoteUserService { * @param source 请求来源 * @return 结果 */ -// @GetMapping("/user/custInfoPhoto/{phone}") -// public R getCustInfoByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @GetMapping("/user/custInfoPhoto/{phone}") + public R getCustInfoByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java index 2d29e7e..7d51a9c 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java @@ -56,10 +56,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory getCustInfoByPhone(String phone, String source) { -// return R.fail("获取用户失败:" + throwable.getMessage()); -// } + @Override + public R getCustInfoByPhone(String phone, String source) { + return R.fail("获取用户失败:" + throwable.getMessage()); + } /** * 通过用户名查询用户信息 diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java index f355ec8..25f198b 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java +++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java @@ -149,8 +149,13 @@ public class TokenController { LoginUser login = strategy.login(form.getUsername(), form.getPassword()); logService.saveLogin(form.getUsername(), "登录", "登录成功", null, "成功"); - - if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) { + if (LoginType.CUST_PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.CUST_PHONE_OPT.equals(form.getLoginType())) { + Map 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 map = tokenService.createToken(login); login.setToken((String) map.get("access_token")); login.setExpireIn((Long) map.get("expires_in")); diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java index b522593..ee6b9a3 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java @@ -100,32 +100,33 @@ public class TokenService { /** * 创建客户令牌 */ -// public Map createCustToken(LoginUser loginUser) { -// // 检查并删除已有的token -// delExistingToken(loginUser.getCustId()); -// String token = IdUtils.fastUUID(); -// Long custId = loginUser.getCustId(); -// String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber()); -// loginUser.setToken(token); -// loginUser.setCustId(custId); -// loginUser.setIpaddr(IpUtils.getIpAddr()); -// loginUser.getSysUser().setPhonenumber(phoneNumber); -// refreshToken(loginUser); -// // Jwt存储信息 -// Map claimsMap = new HashMap(16); -// claimsMap.put(SecurityConstants.USER_KEY, token); -// claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); -// claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); -// String accessToken = JwtUtils.createToken(claimsMap); -// Map rspMap = new HashMap(16); -// rspMap.put("access_token", accessToken); -// rspMap.put("expires_in", EXPIRETIME); -// rspMap.put("isLogin", isLogin(String.valueOf(custId))); -// long tokenTime = getTokenTime(); -// //对token进行存储 -// redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES); -// return rspMap; -// } + public Map createCustToken(LoginUser loginUser) { + // 检查并删除已有的token + delExistingToken(loginUser.getCustId()); + String token = IdUtils.fastUUID(); + Long custId = loginUser.getSysUser().getCustId(); + String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber()); + loginUser.setToken(token); + loginUser.setCustId(custId); + loginUser.setNickName(loginUser.getSysUser().getNickName()); + loginUser.setIpaddr(IpUtils.getIpAddr()); + loginUser.getSysUser().setPhonenumber(phoneNumber); + refreshToken(loginUser); + // Jwt存储信息 + Map claimsMap = new HashMap(16); + claimsMap.put(SecurityConstants.USER_KEY, token); + claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); + String accessToken = JwtUtils.createToken(claimsMap); + Map rspMap = new HashMap(16); + rspMap.put("access_token", accessToken); + rspMap.put("expires_in", EXPIRETIME); + rspMap.put("isLogin", isLogin(String.valueOf(custId))); + long tokenTime = getTokenTime(); + //对token进行存储 + redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES); + return rspMap; + } public boolean isLogin(String userId) { String existingTokenKey = redisService.getCacheObject(LOGIN_USER_KEY + userId); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 9695c0d..af71f93 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -209,24 +209,24 @@ public class SysUserController extends BaseController { /** * 获取当前用户信息 */ -// @InnerAuth -// @GetMapping("/custInfoPhoto/{photoNumber}") -// public R custInfoPhotoNumber(@PathVariable("photoNumber") String photoNumber) { -// SysUser sysUser = userService.selectCustInfoByPhoneNumber(photoNumber); -// if (StringUtils.isNull(sysUser)) { -// return R.fail("用户名或密码错误"); -// } -// // 角色集合 -// //Set roles = permissionService.getRolePermission(sysUser); -// // 权限集合 -// //Set permissions = permissionService.getMenuPermission(sysUser); -// LoginUser loginUser = new LoginUser(); -// loginUser.setCustId(sysUser.getCustId()); -// loginUser.setSysUser(sysUser); -// //sysUserVo.setRoles(roles); -// //sysUserVo.setPermissions(permissions); -// return R.ok(loginUser); -// } + @InnerAuth + @GetMapping("/custInfoPhoto/{photoNumber}") + public R custInfoPhotoNumber(@PathVariable("photoNumber") String photoNumber) { + SysUser sysUser = userService.selectCustInfoByPhoneNumber(photoNumber); + if (StringUtils.isNull(sysUser)) { + return R.fail("用户名或密码错误"); + } + // 角色集合 + //Set roles = permissionService.getRolePermission(sysUser); + // 权限集合 + //Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser loginUser = new LoginUser(); + loginUser.setCustId(sysUser.getCustId()); + loginUser.setSysUser(sysUser); + //sysUserVo.setRoles(roles); + //sysUserVo.setPermissions(permissions); + return R.ok(loginUser); + } /** * 注册用户信息 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java index 78b9ba7..9a2af41 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java @@ -162,7 +162,7 @@ public interface SysUserMapper { * @param * @return 用户对象信息 */ -// public SysUser selectCustInfoByPhoneNumber(@Param("phoneNumber") String phoneNumber); + public SysUser selectCustInfoByPhoneNumber(@Param("phoneNumber") String phoneNumber); public void transferUserInfo(SysUser sysUser); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java index b7bcaaf..81e22df 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java @@ -237,5 +237,5 @@ public interface ISysUserService { public AjaxResult systemUpdateUser(SysUser user); -// public SysUser selectCustInfoByPhoneNumber(String photoNumber); + public SysUser selectCustInfoByPhoneNumber(String photoNumber); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index 5db23a1..0176147 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -689,9 +689,9 @@ public class SysUserServiceImpl implements ISysUserService { * @param photoNumber 用户名 * @return 用户对象信息 */ -// @Override -// public SysUser selectCustInfoByPhoneNumber(String photoNumber) { -// return userMapper.selectCustInfoByPhoneNumber(Sm4Utils.custEncrypt(photoNumber)); -// } + @Override + public SysUser selectCustInfoByPhoneNumber(String photoNumber) { + return userMapper.selectCustInfoByPhoneNumber(Sm4Utils.custEncrypt(photoNumber)); + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index be9e11d..454bbb3 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -380,18 +380,18 @@ - - - - - - - - - - - - + +