ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -69,7 +69,7 @@ * @version 1.0 */ @PostMapping("/user/registerUser") public R registerUser(@RequestBody SysUser sysUser); public R<SysUser> registerUser(@RequestBody SysUser sysUser);
@@ -50,7 +50,7 @@ } @Override public R registerUser(SysUser sysUser) { public R<SysUser> registerUser(SysUser sysUser) { return R.fail("注册用户失败:" + throwable.getMessage()); }
@@ -5,6 +5,7 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.member.domain.dto.MerMemberPageDto; import com.ruoyi.member.domain.vo.AppUserInfoVo; import com.ruoyi.member.domain.vo.MerMemberInfoVo; import com.ruoyi.member.domain.vo.MerMemberPageVo; import com.ruoyi.member.service.member.MemberService; import com.ruoyi.system.api.domain.dto.MerPageDto; @@ -46,9 +47,9 @@ @RequestMapping(value = "/getMerMemberInfo", method = RequestMethod.POST) @ApiOperation(value = "获取会员信息") public R<AppUserInfoVo> getAppUserInfo() { public R<MerMemberInfoVo> getMerMemberInfo() { Long userId = SecurityUtils.getUserId(); AppUserInfoVo appUserInfoVo = memberService.getAppUserInfo(userId); return R.ok(appUserInfoVo); MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(userId); return R.ok(merMemberInfo); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
@@ -1,30 +1,14 @@ package com.ruoyi.member.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author jqs34 * @ClassName MerMemberInfoVo * @version 1.0 * @classname MerMeberInfoVo * @description: TODO * @date 2023年05月04日 * @version: 1.0 * @date 2023 2023/5/4 22:48 */ @Data public class MerMemberInfoVo { @ApiModelProperty(value = "用户id") private Long userId; @ApiModelProperty(value = "用户昵称") private String nickName; @ApiModelProperty(value = "性别") private String gender; @ApiModelProperty(value = "用户电话") private String mobile; } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -12,6 +12,7 @@ import com.ruoyi.member.domain.dto.MerMemberPageDto; import com.ruoyi.member.domain.vo.AppUserAuthorizeVo; import com.ruoyi.member.domain.vo.AppUserInfoVo; import com.ruoyi.member.domain.vo.MerMemberInfoVo; import com.ruoyi.member.domain.vo.MerMemberPageVo; import com.ruoyi.member.mapper.member.MemberMapper; import com.ruoyi.member.service.member.MemberService; @@ -92,19 +93,18 @@ String sessionKey = null; //获取session try { //session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode()); session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode()); } catch (Exception e) { e.printStackTrace(); return null; } //if(session!=null&& StringUtils.isNotBlank(session.getOpenid())){ //unionid = session.getUnionid(); //openid = session.getOpenid(); //sessionKey = session.getSessionKey(); if(session!=null&& StringUtils.isNotBlank(session.getOpenid())){ unionid = session.getUnionid(); openid = session.getOpenid(); sessionKey = session.getSessionKey(); //获取用户 //Member member = memberMapper.getOneByMiniOpenid(openid); Member member = this.getByUserId(1L); SysUser sysUser; Member member = memberMapper.getOneByMiniOpenid(openid); SysUser sysUser; if(member==null){ //创建新用户 String memberId = IdUtils.simpleUUID(); @@ -114,27 +114,26 @@ sysUser.setNickName("微信用户"); String password = "hongruitang"; sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUserService.registerUser(sysUser); sysUser = sysUserService.registerUser(sysUser).getData(); member = new Member(); member.setUserId(sysUser.getUserId()); member.setDelFlag(0); member.setMemberId(memberId); //member.setWxUnionid(unionid); //member.setMiniOpenid(openid); member.setWxUnionid(unionid); member.setMiniOpenid(openid); member.setCreateTime(new Date()); this.save(member); }else{ sysUser = sysUserService.getSysUser(member.getUserId()).getData(); } //appMiniLoginVo.setMiniOpenid(openid); //appMiniLoginVo.setWxUnionid(unionid); appMiniLoginVo.setMiniOpenid(openid); appMiniLoginVo.setWxUnionid(unionid); appMiniLoginVo.setSysUser(sysUser); //appMiniLoginVo.setSessionKey(sessionKey); //sessionKey //stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey); /*}else{ appMiniLoginVo.setSessionKey(sessionKey); stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey); }else{ return null; }*/ } return appMiniLoginVo; } @@ -257,4 +256,18 @@ List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page,merMemberPageDto); return merMemberPageVoList; } /** * @description: TODO * @author jqs34 * @date 2023/5/4 22:50 * @version 1.0 */ @Override public MerMemberInfoVo getMerMemberInfo(Long userId){ MerMemberInfoVo merMemberInfoVo = new MerMemberInfoVo(); return merMemberInfoVo; } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -4,6 +4,7 @@ import com.ruoyi.member.domain.dto.MerMemberPageDto; import com.ruoyi.member.domain.vo.AppUserAuthorizeVo; import com.ruoyi.member.domain.vo.AppUserInfoVo; import com.ruoyi.member.domain.vo.MerMemberInfoVo; import com.ruoyi.member.domain.vo.MerMemberPageVo; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.poji.member.Member; @@ -65,4 +66,12 @@ * @return */ List<MerMemberPageVo> pageMerMember(Page page, MerMemberPageDto merMemberPageDto); /** * @description: TODO * @author jqs34 * @date 2023/5/4 23:55 * @version 1.0 */ MerMemberInfoVo getMerMemberInfo(Long userId); } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -146,7 +146,7 @@ { return R.fail("保存用户'" + username + "'失败，注册账号已存在"); } return R.ok(userService.registerUser(sysUser)); return R.ok(userService.registerUser(sysUser)!=null); } /** @@ -366,9 +366,9 @@ * @version 1.0 */ @PostMapping("/registerUser") public R registerUser(@RequestBody SysUser sysUser){ userService.registerUser(sysUser); return R.ok(); public R<SysUser> registerUser(@RequestBody SysUser sysUser){ sysUser = userService.registerUser(sysUser); return R.ok(sysUser); }
@@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.validation.Validator; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -50,25 +51,25 @@ { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @Autowired @Resource private SysUserMapper userMapper; @Autowired @Resource private SysRoleMapper roleMapper; @Autowired @Resource private SysPostMapper postMapper; @Autowired @Resource private SysUserRoleMapper userRoleMapper; @Autowired @Resource private SysUserPostMapper userPostMapper; @Autowired @Resource private ISysConfigService configService; @Autowired @Resource protected Validator validator; /** @@ -294,9 +295,10 @@ * @return 结果 */ @Override public boolean registerUser(SysUser user) public SysUser registerUser(SysUser user) { return userMapper.insertUser(user) > 0; userMapper.insertUser(user); return user; } /** ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -128,7 +128,7 @@ * @param user 用户信息 * @return 结果 */ public boolean registerUser(SysUser user); public SysUser registerUser(SysUser user); /** * 修改用户信息
