From 0b007e7fe9ef41fbaa13507d2520a5e8e4faeb3c Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 21 六月 2024 20:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 0351a6b..19d9c4e 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -100,6 +100,38 @@
rspMap.put("mini_openid", appMiniLoginVo.getMiniOpenid());
rspMap.put("zfb_userid", appMiniLoginVo.getZfbuserid());
rspMap.put("phone",appMiniLoginVo.getPhone());
+ rspMap.put("memberid",appMiniLoginVo.getMemberid().toString());
+ return rspMap;
+ }
+
+ public Map<String, Object> createMiniToken1(AppMiniLoginVO appMiniLoginVo)
+ {
+ LoginUser loginUser = new LoginUser();
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>();
+ // 接口返回信息
+ Map<String, Object> rspMap = new HashMap<String, Object>();
+ //用户为空只返回openid
+ rspMap.put("mobile","");
+ rspMap.put("access_token", "");
+ 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", EXPIRE_TIME);
+ }
+ rspMap.put("phone",appMiniLoginVo.getPhone());
return rspMap;
}
--
Gitblit v1.7.1