Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 9658e5ca43e617c68c54d7dd7797f873e55311c3

Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java

@@ -6,6 +6,9 @@
@Data
public class OauthUserVo {

    @ApiModelProperty("商户id")
    private Long shopId;

    @ApiModelProperty("成员UserID")
    private String userid;

@@ -13,7 +16,7 @@
    private String mobile;

    @ApiModelProperty("token凭证")
    private String accessToken;
    private String token;

    @ApiModelProperty("过期时间")
    private Long expiresIn;

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -183,6 +183,9 @@
            throw new ServiceException(userResult.getMsg());
        }
        ShopRelUserVo shopInfo = shopResult.getData();
        if(null == shopInfo){
            throw new ServiceException("未查询到商户信息");
        }
        userInfo.setShopId(shopInfo.getShopId());

        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -123,7 +123,8 @@

        // 接口返回信息
        OauthUserVo oauthUserVo = new OauthUserVo();
        oauthUserVo.setAccessToken(JwtUtils.createToken(claimsMap));
        oauthUserVo.setShopId(qwH5LoginVo.getShopId());
        oauthUserVo.setToken(JwtUtils.createToken(claimsMap));
        oauthUserVo.setExpiresIn(expireTime);
        oauthUserVo.setUserid(qwH5LoginVo.getUserid());
        oauthUserVo.setMobile(qwH5LoginVo.getMobile());