用户重构

jiangqs

2023-05-24 d4f6d9632d5405a0153b124c5047b82efbd26649

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

@@ -5,7 +5,10 @@
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;

import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.OauthUserVo;
import com.ruoyi.system.api.model.QwH5LoginVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
@@ -21,7 +24,7 @@

/**
 * token验证处理
 * 
 *
 * @author jqs
 */
@Component
@@ -55,11 +58,11 @@
        refreshToken(loginUser);

        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        Map<String, Object> claimsMap = new HashMap<>();
        claimsMap.put(SecurityConstants.USER_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);

        claimsMap.put(SecurityConstants.LOGIN_FROM, Constants.FROM_STAFF);
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
@@ -73,7 +76,43 @@
    public Map<String, Object> createMiniToken(AppMiniLoginVo appMiniLoginVo)
    {
        LoginUser loginUser = new LoginUser();
        loginUser.setSysUser(appMiniLoginVo.getSysUser());
        // Jwt存储信息
        Map<String, Object> claimsMap = new HashMap<String, Object>();
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        //用户为空只返回openid
        if(appMiniLoginVo.getSysUser()!=null){
            loginUser.setSysUser(appMiniLoginVo.getSysUser());
            String token = IdUtils.fastUUID();
            Long userId = loginUser.getSysUser().getUserId();
            String userName = loginUser.getSysUser().getUserName();
            loginUser.setToken(token);
            loginUser.setUserid(userId);
            loginUser.setUsername(userName);
            loginUser.setIpaddr(IpUtils.getIpAddr());
            refreshToken(loginUser);
            claimsMap.put(SecurityConstants.USER_KEY, token);
            claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
            claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
            claimsMap.put(SecurityConstants.LOGIN_FROM, Constants.FROM_MINI_APP);
            rspMap.put("access_token", JwtUtils.createToken(claimsMap));
            rspMap.put("expires_in", expireTime);
        }
        if(StringUtils.isNotBlank(appMiniLoginVo.getMobile())){
            rspMap.put("mobile",appMiniLoginVo.getMobile() );
        }
        rspMap.put("wx_unionid", appMiniLoginVo.getWxUnionid());
        rspMap.put("mini_openid", appMiniLoginVo.getMiniOpenid());
        return rspMap;
    }

    /**
     * 创建企业微信令牌
     */
    public OauthUserVo createQwH5Token(QwH5LoginVo qwH5LoginVo)
    {
        LoginUser loginUser = new LoginUser();
        loginUser.setSysUser(qwH5LoginVo.getSysUser());
        String token = IdUtils.fastUUID();
        Long userId = loginUser.getSysUser().getUserId();
        String userName = loginUser.getSysUser().getUserName();
@@ -88,13 +127,15 @@
        claimsMap.put(SecurityConstants.USER_KEY, token);
        claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
        claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);

        claimsMap.put(SecurityConstants.LOGIN_FROM, Constants.FROM_SHOP);
        // 接口返回信息
        Map<String, Object> rspMap = new HashMap<String, Object>();
        rspMap.put("access_token", JwtUtils.createToken(claimsMap));
        rspMap.put("expires_in", expireTime);
        rspMap.put("mini_openid", appMiniLoginVo.getMiniOpenid());
        return rspMap;
        OauthUserVo oauthUserVo = new OauthUserVo();
        oauthUserVo.setShopId(qwH5LoginVo.getShopId());
        oauthUserVo.setToken(JwtUtils.createToken(claimsMap));
        oauthUserVo.setExpiresIn(expireTime);
        oauthUserVo.setUserid(qwH5LoginVo.getUserid());
        oauthUserVo.setMobile(qwH5LoginVo.getMobile());
        return oauthUserVo;
    }

    /**
@@ -198,4 +239,4 @@
    {
        return ACCESS_TOKEN + token;
    }
}
}