页面修改

Edu.Cache/User/UserReidsCache.cs

 using Edu.CacheManager.Base;
+using Edu.Common.Enum;
 using Edu.Model.CacheModel;
 using Edu.Repository.User;
 using System;
@@ -87,8 +88,9 @@ namespace Edu.Cache.User
         /// 获取用户登录信息
         /// </summary>
         /// <param name="Id">账号Id</param>
+        /// <param name="apiRequestFromEnum">请求来源</param>
         /// <returns></returns>
-        public static UserInfo GetUserLoginInfo(object Id)
+        public static UserInfo GetUserLoginInfo(object Id, ApiRequestFromEnum apiRequestFromEnum= ApiRequestFromEnum.WebAdmin)
         {
 
             UserInfo userInfo = null;
@@ -124,6 +126,7 @@ namespace Edu.Cache.User
                                 GroupName = model.GroupName,
                                 SchoolName = model.SchoolName,
                                 Token = token,
+                                ApiRequestFromEnum= apiRequestFromEnum
                             };
                             UserInfoSet(Cache.CacheKey.User_Login_Key + Id.ToString(), userInfo, Common.Config.JwtExpirTime);
                         }

Edu.WebApi/Filter/ApiFilterAttribute.cs

@@ -126,8 +126,8 @@ namespace Edu.WebApi.Filter
                     var tokenUser = Common.Plugin.JsonHelper.DeserializeObject<TokenUserInfo>(jwtJson[Common.GlobalKey.JWT_User_Key].ToString());
                     if (tokenUser != null)
                     {
-                        var cacheUser = UserReidsCache.GetUserLoginInfo(tokenUser.Uid);
-                        if (cacheUser.ApiRequestFromEnum == tokenUser.RequestFrom && cacheUser.Token != token)
+                        var cacheUser = UserReidsCache.GetUserLoginInfo(tokenUser.Uid,apiRequestFromEnum: tokenUser.RequestFrom);
+                        if (cacheUser.ApiRequestFromEnum == tokenUser.RequestFrom && (cacheUser.Token != token||string.IsNullOrWhiteSpace(cacheUser.Token)))
                         {
                             actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
                             new ApiResult