商户端

jiangqs

2023-05-04 c10c783af0fad280d0a93f38af9c2950cb11f0a7

商户端

 ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -6,6 +6,8 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans;

/**
 * 认证授权中心
@@ -16,6 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api")})
public class RuoYiAuthApplication
{
    public static void main(String[] args)

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -46,7 +46,6 @@
    /**
     * 小程序登录
     */
    @InnerAuth
    @PostMapping("/miniLogin")
    @ApiOperation("小程序登录")
    public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -92,18 +92,19 @@
        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);
            SysUser sysUser;
            //Member member = memberMapper.getOneByMiniOpenid(openid);
                Member member = this.getByUserId(1L);
                SysUser sysUser;
            if(member==null){
                //创建新用户
                String memberId = IdUtils.simpleUUID();
@@ -118,22 +119,22 @@
                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);
            //appMiniLoginVo.setSessionKey(sessionKey);
            //sessionKey
            stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey);
        }else{
            //stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey);
        /*}else{
            return null;
        }
        }*/
        return appMiniLoginVo;
    }


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java

@@ -353,20 +353,19 @@
     * @version 1.0
     */
    @InnerAuth
    @PostMapping("/user/getSysUser")
    @PostMapping("/getSysUser")
    public R<SysUser> getSysUser(@RequestBody Long userId){
        SysUser sysUser = userService.selectUserById(userId);
        return R.ok(sysUser);
    }

    /**
     * @description: 更新用户手机
     * @description: 注册新用户
     * @author jqs34
     * @date 2023/4/30 15:32
     * @version 1.0
     */
    @InnerAuth
    @PostMapping("/user/registerUser")
    @PostMapping("/registerUser")
    public R registerUser(@RequestBody SysUser sysUser){
        userService.registerUser(sysUser);
        return R.ok();
@@ -381,7 +380,7 @@
     * @version 1.0
     */
    @InnerAuth
    @PostMapping("/user/updateUserMobile")
    @PostMapping("/updateUserMobile")
    public R updateUserMobile(@RequestBody SysUser sysUser){
        userService.updateUserMobile(sysUser);
        return R.ok();
@@ -393,7 +392,7 @@
     * @return
     */
    @InnerAuth
    @PostMapping("/user/editUserInfo")
    @PostMapping("/editUserInfo")
    public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
        userService.editUserInfo(appEditUserDto);
        return R.ok();