Commit 68e6e2d4 authored by 黄奎's avatar 黄奎

页面修改

parent f0f2d8a4
using Edu.CacheManager.Base; using Edu.CacheManager.Base;
using Edu.Common.Enum;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
using Edu.Repository.User; using Edu.Repository.User;
using System; using System;
...@@ -87,8 +88,9 @@ namespace Edu.Cache.User ...@@ -87,8 +88,9 @@ namespace Edu.Cache.User
/// 获取用户登录信息 /// 获取用户登录信息
/// </summary> /// </summary>
/// <param name="Id">账号Id</param> /// <param name="Id">账号Id</param>
/// <param name="apiRequestFromEnum">请求来源</param>
/// <returns></returns> /// <returns></returns>
public static UserInfo GetUserLoginInfo(object Id) public static UserInfo GetUserLoginInfo(object Id, ApiRequestFromEnum apiRequestFromEnum= ApiRequestFromEnum.WebAdmin)
{ {
UserInfo userInfo = null; UserInfo userInfo = null;
...@@ -124,6 +126,7 @@ namespace Edu.Cache.User ...@@ -124,6 +126,7 @@ namespace Edu.Cache.User
GroupName = model.GroupName, GroupName = model.GroupName,
SchoolName = model.SchoolName, SchoolName = model.SchoolName,
Token = token, Token = token,
ApiRequestFromEnum= apiRequestFromEnum
}; };
UserInfoSet(Cache.CacheKey.User_Login_Key + Id.ToString(), userInfo, Common.Config.JwtExpirTime); UserInfoSet(Cache.CacheKey.User_Login_Key + Id.ToString(), userInfo, Common.Config.JwtExpirTime);
} }
......
...@@ -126,8 +126,8 @@ namespace Edu.WebApi.Filter ...@@ -126,8 +126,8 @@ namespace Edu.WebApi.Filter
var tokenUser = Common.Plugin.JsonHelper.DeserializeObject<TokenUserInfo>(jwtJson[Common.GlobalKey.JWT_User_Key].ToString()); var tokenUser = Common.Plugin.JsonHelper.DeserializeObject<TokenUserInfo>(jwtJson[Common.GlobalKey.JWT_User_Key].ToString());
if (tokenUser != null) if (tokenUser != null)
{ {
var cacheUser = UserReidsCache.GetUserLoginInfo(tokenUser.Uid); var cacheUser = UserReidsCache.GetUserLoginInfo(tokenUser.Uid,apiRequestFromEnum: tokenUser.RequestFrom);
if (cacheUser.ApiRequestFromEnum == tokenUser.RequestFrom && cacheUser.Token != token) if (cacheUser.ApiRequestFromEnum == tokenUser.RequestFrom && (cacheUser.Token != token||string.IsNullOrWhiteSpace(cacheUser.Token)))
{ {
actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult( actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
new ApiResult new ApiResult
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment