页面修改

Edu.Common/API/ResultCode.cs

@@ -31,53 +31,14 @@
         /// Token不合法
         /// </summary>
         TokenIllegal = 10001,
-        /// <summary>
-        /// 请求过期
-        /// </summary>
-        RequestOverdue = 10002,
-        /// <summary>
-        /// 签名不合法
-        /// </summary>
-        SignIllegal = 10003,
+
         /// <summary>
         /// 请求参数为空
         /// </summary>
-        ParamIsNull = 10004,
-        /// <summary>
-        /// 没有权限
-        /// </summary>
-        NoPermission = 10005,
-        /// <summary>
-        /// 账号未绑定手机号
-        /// </summary>
-        AccountNotBindMobile = 10006,
-        /// <summary>
-        /// 账号未激活
-        /// </summary>
-        AccountNotActivation = 10007,
-        /// <summary>
-        /// 账号未绑定openid
-        /// </summary>
-        AccountNotBindOpenId = 10008,
+        ParamIsNull = 10002,
         /// <summary>
         /// 表单重复提交
         /// </summary>
-        FormRepeatSubmit = 10009,
-        /// <summary>
-        /// 不在打卡范围
-        /// </summary>
-        NotInCardRange = 20001,
-        /// <summary>
-        /// 未上传工作报告
-        /// </summary>
-        NotSendWorkLog = 20002,
-        /// <summary>
-        /// 第三方酒店订单返回价格错误(第三方返回的错误代码11018)
-        /// </summary>
-        PriceErro = 11018,
-        /// <summary>
-        ///财务未找到下一个审核人
-        /// </summary>
-        NoPeople = 11019
+        FormRepeatSubmit = 10003,
     }
 }

Edu.Common/Enum/ApiRequestFromEnum.cs

@@ -8,15 +8,27 @@ namespace Edu.Common.Enum
     public enum ApiRequestFromEnum
     {
         /// <summary>
-        /// Web端
+        /// Web管理端
         /// </summary>
         [EnumField("Web管理端")]
         WebAdmin = 1,
 
         /// <summary>
-        /// 小程序
+        /// Web管理端
+        /// </summary>
+        [EnumField("App管理端")]
+        AppAdmin =101,
+
+        /// <summary>
+        /// Web教师端
         /// </summary>
         [EnumField("Web教师端")]
         WebTech = 2,
+        /// <summary>
+        /// App教师端
+        /// </summary>
+        [EnumField("App教师端")]
+        AppTech = 102,
+
     }
 }
\ No newline at end of file

Edu.Model/CacheModel/UserInfo.cs

-using Edu.Common.Enum.User;
+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
 using Edu.Model.ViewModel.System;
 using System.Collections.Generic;
 
@@ -29,6 +30,11 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public string AccountName { get; set; }
 
+        /// <summary>
+        /// 请求来源
+        /// </summary>
+        public ApiRequestFromEnum ApiRequestFromEnum { get; set; }
+
         /// <summary>
         /// 账号类型(1-管理端，2,-教师端，3-助教，4-学生)
         /// </summary>

Edu.WebApi/Controllers/User/LoginController.cs

@@ -89,6 +89,7 @@ namespace Edu.WebApi.Controllers.User
                     MenuList = treeList,
                     GroupLogo = model.GroupLogo,
                     UserIcon = model.UserIcon,
+                    ApiRequestFromEnum= Common.Enum.ApiRequestFromEnum.WebAdmin
                 };
                 UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
                 return ApiResult.Success(data: obj);

Edu.WebApi/Filter/ApiFilterAttribute.cs

@@ -123,7 +123,25 @@ namespace Edu.WebApi.Filter
                 try
                 {
                     JObject jwtJson = WebApiTokenHelper.AnalysisToken(token);
-                    actionContext.HttpContext.Items[Common.GlobalKey.TokenUserInfo] = jwtJson[Common.GlobalKey.JWT_User_Key];
+                    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)
+                        {
+                            actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
+                            new ApiResult
+                            {
+                                Code = (int)ResultCode.TokenOverdue,
+                                Message = "用户凭证失效，请重新登录0",
+                                Data = null
+                            });
+                        }
+                        else
+                        {
+                            actionContext.HttpContext.Items[Common.GlobalKey.TokenUserInfo] = jwtJson[Common.GlobalKey.JWT_User_Key];
+                        }
+                    }
                 }
                 catch (SignatureVerificationException sve)
                 {