From 9658e5ca43e617c68c54d7dd7797f873e55311c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 21:26:39 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 3 +++
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 ++++-
3 files changed, 9 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-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 2d31c11..582ee8f 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/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, "登录成功");
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