新增用户缓存

Mall.CacheManager/User/UserReidsCache.cs

 using Mall.CacheManager.DataStatistic;
+using Mall.Common;
 using Mall.Common.Plugin.Redis;
 using System;
 using System.Collections.Generic;
@@ -13,6 +14,22 @@ namespace Mall.CacheManager.User
     {
         static RedisHelper redis = new RedisHelper(DataConstant.REDIS_DB2);
 
+        /// <summary>
+        /// 设置缓存
+        /// </summary>
+        /// <param name="model"></param>
+        public static void UserInfoSet(string cacheKey, UserInfo model, int JwtExpirTime)
+        {
+            try
+            {
+                TimeSpan ts = GetExpirTime(JwtExpirTime);
+                redis.StringSet<UserInfo>(cacheKey, model, ts);
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "UserInfoSet缓存设置失败");
+            }
+        }
 
         /// <summary>
         /// 获取缓存时长

Mall.Common/API/UserInfo.cs

@@ -12,112 +12,100 @@ namespace Mall.Common
     public class UserInfo
     {
         /// <summary>
-        /// 集团名称
+        /// 商户号
         /// </summary>        
-        public string GroupName { get; set; }
+        public int TenantId
+        {
+            get;
+            set;
+        }
 
         /// <summary>
-        /// 集团图片
+        /// 账号
         /// </summary>        
-        public string GroupPic { get; set; }
+        public string Account
+        {
+            get;
+            set;
+        }
 
-        /// <summary>
-        /// 集团域名
-        /// </summary>
-        public string Domain { get; set; }
         
         /// <summary>
-        /// B2B域名
+        /// 姓名/企业名称
         /// </summary>        
-        public string B2BDomain { get; set; }
+        public string Name
+        {
+            get;
+            set;
+        }
 
         /// <summary>
-        /// 版本名称
+        /// 手机号码
         /// </summary>        
-        public string VersionsName { get; set; }
-        /// <summary>
-        /// 公司名称
-        /// </summary>
-        public string BranchName { get; set; }
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string DepartName { get; set; }
-        /// <summary>
-        /// 岗位名称
-        /// </summary>
-        public string PostName { get; set; }
-        /// <summary>
-        /// 姓名
-        /// </summary>
-        public string EmName { get; set; }
-        /// <summary>
-        /// 用户id
-        /// </summary>
-        public int EmployeeId { get; set; }
-        /// <summary>
-        /// 集团id
-        /// </summary>
-        public int RB_Group_id { get; set; }
-        /// <summary>
-        /// 版本id
-        /// </summary>
-        public int Versions_Id { get; set; }
-        /// <summary>
-        /// 公司id
-        /// </summary>
-        public int RB_Branch_id { get; set; }
-        /// <summary>
-        /// 岗位id
-        /// </summary>
-        public int RB_Post_Id { get; set; }
-        /// <summary>
-        /// 部门id
-        /// </summary>
-        public int RB_Department_Id { get; set; }
-        /// <summary>
-        /// token
-        /// </summary>
-        public string token { get; set; }
-        /// <summary>
-        /// SecretKey
-        /// </summary>
-        public string SecretKey { get; set; }
-        /// <summary>
-        /// 文件域名
-        /// </summary>
-        public string FileDomain { get; set; }
+        public string MobilePhone
+        {
+            get;
+            set;
+        }
+
         /// <summary>
-        /// 用户菜单
+        /// 微信号
         /// </summary>        
-        public object UserMenu { get; set; }
+        public string WeChatNum
+        {
+            get;
+            set;
+        }
+
+
         /// <summary>
-        /// 功能菜单
+        /// 是否永久有效(0-默认，1-永久有效)
         /// </summary>        
-        public object ActionMenu { get; set; }
+        public int? IsEffective
+        {
+            get;
+            set;
+        }
+
         /// <summary>
-        /// Im账号
+        /// 账号有效期
         /// </summary>        
-        public string ImAccount { get; set; }
+        public DateTime? AccountValidate
+        {
+            get;
+            set;
+        }
+
         /// <summary>
-        /// ImToken
+        /// 可创建小程序数量
         /// </summary>        
-        public string ImToken { get; set; }
+        public int? CreateMiniPrograme
+        {
+            get;
+            set;
+        }
 
         /// <summary>
-        /// 用户头像
+        /// 商城名称
         /// </summary>        
-        public string Icon { get; set; }
+        public string MallName
+        {
+            get;
+            set;
+        }
 
         /// <summary>
-        /// 所在公司是否为总公司   1：是，2：否
+        /// 账号状态(0-默认，1-提交申请，2-审核通过，3-审核拒绝）
         /// </summary>        
-        public int IsParentCompany { get; set; }
+        public int? AccountStatus
+        {
+            get;
+            set;
+        }
+
         /// <summary>
-        /// 权限节点
+        /// token
         /// </summary>
-        public string ActionMenuCode { get; set; }
-
-        public string EmMobile { set; get; }
+        public string Token { get; set; }  
     }
 }

Mall.Common/Plugin/CommonHelper.cs

@@ -129,23 +129,6 @@ namespace Mall.Common.Plugin
             }
         }
 
-        /// <summary>
-        /// 根据功能编码获取用户是否拥有该权限
-        /// </summary>
-        /// <param name="ActionCode"></param>
-        /// <param name="userInfo"></param>
-        /// <returns></returns>
-        public static bool GetUserActionPermission(string ActionCode, UserInfo userInfo)
-        {
-            if (!string.IsNullOrEmpty(userInfo.ActionMenuCode) && ("," + userInfo.ActionMenuCode + ",").Contains("," + ActionCode + ","))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
 
         /// <summary>
         /// 根据URL地址获取文件路径

Mall.WebApi/Controllers/User/TenantController.cs

@@ -14,6 +14,8 @@ using Mall.Common;
 using JWT.Algorithms;
 using JWT.Serializers;
 using Mall.Common.Enum;
+using Mall.CacheManager.User;
+using Mall.CacheKey;
 
 namespace Mall.WebApi.Controllers.User
 {
@@ -26,6 +28,11 @@ namespace Mall.WebApi.Controllers.User
         private Module.User.TenantModule TenantModule = new Module.User.TenantModule();
         // JObject parm = JObject.Parse(RequestParm.msg.ToString());
         //UserInfo userInfo = UserReidsCache.GetUserLoginInfo(base.RequestParm.uid);
+
+        /// <summary>
+        /// 用户登录
+        /// </summary>
+        /// <returns></returns>
         public ApiResult Login()
         {
             var query = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
@@ -60,9 +67,22 @@ namespace Mall.WebApi.Controllers.User
                 string secret = Config.JwtSecretKey;
                 token = encoder.Encode(payload, secret);
                 #endregion
-
-
-                return ApiResult.Success("", model);
+                UserInfo obj = new UserInfo
+                {
+                    TenantId=model.TenantId,
+                    Account = model.Account,
+                    Name = model.Name,
+                    MobilePhone = model.MobilePhone,
+                    WeChatNum = model.WeChatNum,
+                    IsEffective = model.IsEffective,
+                    AccountValidate = model.AccountValidate,
+                    CreateMiniPrograme = model.CreateMiniPrograme,
+                    MallName = model.MallName,
+                    AccountStatus = model.AccountStatus,
+                    Token = token,
+                };
+                UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + model.TenantId, obj, Config.JwtExpirTime);
+                return ApiResult.Success("", obj);
             }
         }
     }