From b48a7ef2700bc97644c61009b3d1b5714c7ef275 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 21:26:15 +0800
Subject: [PATCH] 提交登录获取shopId
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 3 ++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java
index 7e26e9d..6189511 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/OauthUserVo.java
+++ b/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;
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 8214742..a8b50bb 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
@@ -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());
--
Gitblit v1.7.1