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 8812e95..d46cd60 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/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 4579fb5..b4d190d 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -163,15 +163,11 @@ public class SysUser extends BaseEntity { private String isBuiltIn = "1"; - @ApiModelProperty("人员id") + @ApiModelProperty("客户端人员id") @JsonFormat(shape = JsonFormat.Shape.STRING) private Long custId; - @ApiModelProperty("人员姓名") - private String custName; - @ApiModelProperty("人员编号") + @ApiModelProperty("客户端人员编号") private String custNum; - @ApiModelProperty("人脸照片地址") - private String custPhotoUrl; public SysUser() { @@ -391,14 +387,6 @@ public class SysUser extends BaseEntity { this.custId = custId; } - public String getCustName() { - return custName; - } - - public void setCustName(String custName) { - this.custName = custName; - } - public String getCustNum() { return custNum; } @@ -407,13 +395,6 @@ public class SysUser extends BaseEntity { this.custNum = custNum; } - public String getCustPhotoUrl() { - return custPhotoUrl; - } - - public void setCustPhotoUrl(String custPhotoUrl) { - this.custPhotoUrl = custPhotoUrl; - } @Override public String toString() { 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 7d51a9c..2d29e7e 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/service/CustPhoneOtpLoginStrategy.java b/bonus-auth/src/main/java/com/bonus/auth/service/CustPhoneOtpLoginStrategy.java index 4f0e34d..8af309c 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/CustPhoneOtpLoginStrategy.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/CustPhoneOtpLoginStrategy.java @@ -32,7 +32,7 @@ public class CustPhoneOtpLoginStrategy implements LoginStrategy { throw new ServiceException("用户不存在/验证码错误"); } passwordValidatorService.checkPhoneCaptcha(phone, otp); - R userResult = remoteUserService.getCustInfoByPhone(phone, SecurityConstants.INNER); + R userResult = remoteUserService.getUserInfoByPhone(phone, SecurityConstants.INNER); //验证用户是否存在 passwordValidatorService.validateUserResult(phone, userResult); LoginUser userInfo = userResult.getData(); diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/CustPhonePasswordLoginStrategy.java b/bonus-auth/src/main/java/com/bonus/auth/service/CustPhonePasswordLoginStrategy.java index fabf13a..59f98a3 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/CustPhonePasswordLoginStrategy.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/CustPhonePasswordLoginStrategy.java @@ -39,7 +39,7 @@ public class CustPhonePasswordLoginStrategy implements LoginStrategy { throw new ServiceException("用户不存在/密码错误"); } //通过手机号获取用户信息 - R userResult = remoteUserService.getCustInfoByPhone(phone, SecurityConstants.INNER); + R userResult = remoteUserService.getUserInfoByPhone(phone, SecurityConstants.INNER); //验证用户是否存在 passwordValidatorService.validateUserResult(phone, userResult); //获取用户信息 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 1586571..9695c0d 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,28 +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("用户名或密码错误"); - } -// SysDept sysDept = deptService.selectActiveDeptById(sysUser.getCompanyId()); -// if (StringUtils.isNull(sysDept)) { -// return R.fail("用户所在公司停用或注销"); +// @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); - } +// // 角色集合 +// //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 576cd58..78b9ba7 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 @@ -159,10 +159,10 @@ public interface SysUserMapper { /** * 通过手机号查询用户 * - * @param phoneNumber 手机号 + * @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 81e22df..b7bcaaf 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 fe6ed3a..37d03e5 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 @@ -688,9 +688,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 75e8de3..0948636 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 @@ -28,6 +28,8 @@ + + @@ -91,12 +93,13 @@ r.data_scope, r.status as role_status, u.login_type, - u.is_built_in + u.is_built_in, + u.cust_id, + u.cust_num from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - left join sys_dept sd on r.company_id = sd.dept_id - select cust_id as custId, cust_name as custName, cust_num as custNum, cust_photo_url as custPhotoUrl, - mobile as phonenumber, pwd as password - from cust_info - - cust_state = 1 and (psn_type != 999 or psn_type is null) - - and mobile = #{phoneNumber} - - - + + + + + + + + + + + +