页面修改

Mall.CacheManager/User/UserReidsCache.cs

@@ -205,7 +205,7 @@ namespace Mall.CacheManager.User
                     {
                         string token = "";
                         var umodel = member_UserRepository.GetEntity<RB_Member_User_Extend>(NewUserId);
-                        if (umodel != null)
+                        if (umodel != null && (umodel.Blacklist??0) == 0)
                         {
                             userInfo = new AppletUserInfo
                             {

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1632,7 +1632,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetCarrierPageList()
         {
             var userInfo = AppletUserInfo;
@@ -1718,7 +1718,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetCarrierDetails()
         {
             var userInfo = AppletUserInfo;
@@ -1904,10 +1904,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetBrandPageList()
         {
+            var userInfo = AppletUserInfo;
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Brand_Extend()
@@ -1925,8 +1925,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 DianLiang = parms.GetStringValue("DianLiang"),
                 PrizeId = parms.GetInt("PrizeId", 0),
             };
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            query.MallBaseId = userInfo.MallBaseId;
+            query.TenantId = userInfo.TenantId;
             var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             List<RB_FirstShop_ListEnroll_Extend> listEnroll = new List<RB_FirstShop_ListEnroll_Extend>();
             if (list != null && list.Any())
@@ -1965,7 +1965,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
         public ApiResult GetBrandDetails()
         {
             var req = RequestParm;

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -93,10 +93,10 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull("请传递来源平台");
             }
-            if (string.IsNullOrEmpty(demodel.OpenId))
-            {
-                return ApiResult.ParamIsNull("请传递唯一码");
-            }
+            //if (string.IsNullOrEmpty(demodel.OpenId))
+            //{
+            //    return ApiResult.ParamIsNull("请传递唯一码");
+            //}
 
             Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend couponResult = new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend();
 

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -189,7 +189,11 @@ namespace Mall.WebApi.Controllers.User
         {
             var parms = RequestParm;
             var query = JsonConvert.DeserializeObject<RB_Supplier_Extend>(RequestParm.msg.ToString());
+            if (UserInfo != null)
+            {
                 query.TenantId = UserInfo.TenantId;
+            }
+        
             query.MallBaseId = parms.MallBaseId;
             var oldLogisticsList = supplierModule.GetList(query);
             return ApiResult.Success("", oldLogisticsList);

Mall.WebApi/Filter/ApiFilterAttribute.cs

@@ -50,7 +50,6 @@ namespace Mall.WebApi.Filter
                 isCheckToken = false;
             }
             #region Token校验
-
             if (isCheckToken)
             {
                 JWTValidat(actionContext, token);
@@ -58,6 +57,44 @@ namespace Mall.WebApi.Filter
 
             #endregion
 
+            //token
+            var userToken = actionContext.HttpContext.Items[GlobalKey.TokenUserInfo];
+            if (userToken != null && !string.IsNullOrEmpty(userToken.ToString()))
+            {
+                JObject parms = JObject.Parse(userToken.ToString());
+                var requestFrom = parms.GetInt("requestFrom");
+                var uid = parms.GetStringValue("uid");
+                //后台用户
+                if (requestFrom == 1)
+                {
+                    var cacheUser = UserReidsCache.GetUserLoginInfo(uid);
+                    if (cacheUser == null || (cacheUser != null && (cacheUser.TenantId <= 0)))
+                    {
+                        actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(new ApiResult
+                        {
+                            resultCode = (int)ResultCode.FormRepeatSubmit,
+                            message = "Token验证失败!",
+                            data = null
+                        });
+                    }
+                }
+                else
+                {
+                    var cacheMiniAppUser = UserReidsCache.GetAppletUserLoginInfo(uid);
+                    if (cacheMiniAppUser == null || (cacheMiniAppUser != null && (cacheMiniAppUser.UserId <= 0)))
+                    {
+                        actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(new ApiResult
+                        {
+                            resultCode = (int)ResultCode.FormRepeatSubmit,
+                            message = "Token验证失败!",
+                            data = null
+                        });
+                    }
+                }
+               
+            }
+
+
             #region 签名校验权限校验
             if (actionContext.HttpContext.Items[GlobalKey.TokenUserInfo] != null)
                 {