11

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -819,7 +819,7 @@ namespace Mall.Module.TradePavilion
                             }
                             if (!string.IsNullOrWhiteSpace(model.BrandModel.PropertyDemand))
                             {
-                                model.BrandModel.PropertyDemandList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
+                                model.BrandModel.PropertyDemandList =Common.ConvertHelper.ConvertToListString(model.BrandModel.PropertyDemand);
                             }
                             else
                             {
@@ -1202,7 +1202,8 @@ namespace Mall.Module.TradePavilion
                         }
                         if (!string.IsNullOrWhiteSpace(model.BrandModel.PropertyDemand))
                         {
-                            model.BrandModel.PropertyDemandList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
+                            model.BrandModel.PropertyDemandList = 
+                                JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
                         }
                         else
                         {

Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs

@@ -41,10 +41,7 @@ WHERE 1=1 ");
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.MallBaseId), query.MallBaseId);
                 }
-                if (query.BrandEnterpriseType > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType), query.BrandEnterpriseType);
-                }
+              
                 if (query.CategoryId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.CategoryId), query.CategoryId);
@@ -86,10 +83,7 @@ WHERE 1=1 ");
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.MallBaseId), query.MallBaseId);
                 }
-                if (query.BrandEnterpriseType > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType), query.BrandEnterpriseType);
-                }
+          
                 if (query.CategoryId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.CategoryId), query.CategoryId);
@@ -132,10 +126,7 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.MallBaseId), query.MallBaseId);
                 }
-                if (query.BrandEnterpriseType > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.BrandEnterpriseType), query.BrandEnterpriseType);
-                }
+                 
                 if (query.CategoryId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.CategoryId), query.CategoryId);

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -42,8 +42,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
         #region 直播房间信息
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetLiveHouseList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -76,8 +76,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
         [HttpPost]
         [Obsolete]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetLiveListByLiveStatus(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -151,8 +151,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetSupplierAllList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -168,8 +168,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
 
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetOrderProfitLossList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -259,8 +259,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public FileContentResult GetOrderProfitLossExcel(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -387,8 +387,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public FileContentResult GetFXOrderProfitLossExcel(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -636,8 +636,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetGoodsList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -655,8 +655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetDistributorInfoList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -826,8 +826,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetTotalOrderProfitLoss(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -896,8 +896,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetOrderCommissionList(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1429,8 +1429,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetDSMonthStatistics(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1458,7 +1458,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public FileContentResult GetDSMonthStatisticsToExcel(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1532,7 +1533,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetDSMoreMonthStatistics(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1571,7 +1572,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public FileContentResult GetDSMoreMonthStatisticsToExcel(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1653,7 +1655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetDSYearStartistics(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1679,7 +1682,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] 
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public FileContentResult GetDSYearStartisticsToExcel(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());

Mall.WebApi/Controllers/CAP/TestController.cs

@@ -26,7 +26,7 @@ namespace Mall.WebApi.Controllers.CAP
         }
 
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult Get()
         {
             ApiResult apiResult = new ApiResult()
@@ -41,7 +41,7 @@ namespace Mall.WebApi.Controllers.CAP
         }
 
         [NonAction]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         [DotNetCore.CAP.CapSubscribe("show.time")]
         public void CheckReceiveMessage(string result)
         {

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1795,7 +1795,7 @@ namespace Mall.WebApi.Controllers.Education
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetActivityTypeList(object requestMsg)
         {
             var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
@@ -1818,7 +1818,7 @@ namespace Mall.WebApi.Controllers.Education
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetActivityPage()
         {
             var req = RequestParm;
@@ -1946,7 +1946,7 @@ namespace Mall.WebApi.Controllers.Education
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetActivityDetial()
         {
             var req = RequestParm;
@@ -2659,7 +2659,7 @@ namespace Mall.WebApi.Controllers.Education
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetUserActivityListJXH()
         {
             var req = RequestParm;

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -74,7 +74,7 @@ namespace Mall.WebApi.Controllers.MallBase
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetHome()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -496,7 +496,7 @@ namespace Mall.WebApi.Controllers.MallBase
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAppConfig()
         {
             string MiniAppId = "";

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -766,7 +766,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetNewsPage()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -796,7 +796,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCommerceNews()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -970,7 +970,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCommerceActivityTypeList()
         {
             var query = new RB_Commerce_ActivityType_Extend();
@@ -986,7 +986,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCommerceActivityPage()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -1008,7 +1008,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCommerceActivity()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -1217,7 +1217,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetNatureEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.NatureEnum));
@@ -1676,7 +1676,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAuthenticationCategoryEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.AuthenticationCategoryEnum));
@@ -1693,7 +1693,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAuthenticationTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.AuthenticationTypeEnum));
@@ -1710,7 +1710,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.BrandTypeEnum));
@@ -1727,7 +1727,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBusinessTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.BusinessTypeEnum));
@@ -1748,7 +1748,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCarrierPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -1834,7 +1834,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCarrierDetails()
         {
             var userInfo = AppletUserInfo;
@@ -1984,7 +1984,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetCustomerTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.CustomerTypeEnum));
@@ -2001,7 +2001,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetProjectTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ProjectTypeEnum));
@@ -2023,7 +2023,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -2092,7 +2092,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandDetails()
         {
             var req = RequestParm;
@@ -2167,7 +2167,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandClassList()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -2192,7 +2192,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         #region 奖章
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetPrizePageList()
         {
 
@@ -2505,7 +2505,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAppletFirstShopListPageList()
         {
             var req = base.RequestParm;
@@ -2707,7 +2707,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetListTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ListTypeEnum));
@@ -2863,7 +2863,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBuildingCarrierPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -2917,7 +2917,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBuildingCarrierDetails()
         {
             var userInfo = AppletUserInfo;
@@ -2998,7 +2998,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBuildingPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -3038,7 +3038,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBuildingDetails()
         {
             var userInfo = AppletUserInfo;
@@ -3107,7 +3107,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandEnterprisePageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -3159,7 +3159,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetBrandEnterpriseDetails()
         {
             var req = RequestParm;
@@ -3195,7 +3195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetEnterpriseServicesPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -3231,7 +3231,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpGet]
         [HttpPost]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetEnterpriseServicesDetails()
         {
             var req = RequestParm;
@@ -3315,13 +3315,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             if (query.PropertyDemandList != null && query.PropertyDemandList.Any())
             {
-                query.PropertyDemand = JsonConvert.SerializeObject(query.PropertyDemandList);
+                query.PropertyDemand = string.Join(",", query.PropertyDemandList);
             }
             else
             {
                 query.PropertyDemand = "";
             }
-            
+
             query.CreateDate = System.DateTime.Now;
             query.MallBaseId = userInfo.MallBaseId;
             query.TenantId = userInfo.TenantId;
@@ -3581,7 +3581,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             if (query.PropertyDemandList != null && query.PropertyDemandList.Any())
             {
-                query.PropertyDemand = JsonConvert.SerializeObject(query.PropertyDemandList); //string.Join(",", query.PropertyDemandList.Select(x => x));
+                query.PropertyDemand = string.Join(",", query.PropertyDemandList.Select(x => x));
             }
             else
             {
@@ -4179,7 +4179,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAllCarrierPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -4229,7 +4229,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetAllBrandEnterprisePageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -119,7 +119,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetContractPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -209,7 +209,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetContract()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -1750,7 +1750,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetProjectTypeEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ProjectTypeEnum));
@@ -3113,7 +3113,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetFirstShopEnrollZipExport()
         {
             var req = base.RequestParm;
@@ -3140,7 +3140,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetFirstShopEnrollZipExport_V3()
         {
             var req = base.RequestParm;
@@ -3168,7 +3168,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetNewFirstShopEnrollZipExport()
         {
             var req = base.RequestParm;
@@ -3195,7 +3195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetFirstShopEnrollResultUrl()
         {
             var req = base.RequestParm;
@@ -3223,7 +3223,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult DelFirstShopEnrollZipExport()
         {
             var req = base.RequestParm;

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -59,8 +59,8 @@ namespace Mall.WebApi.Controllers.User
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] 
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult Login(object requestMsg)
         {
             var lObj = JObject.Parse(requestMsg.ToString());

Mall.WebApi/Controllers/User/TenantController.cs

@@ -87,7 +87,7 @@ namespace Mall.WebApi.Controllers.User
 
         #region 商户信息
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         /// <summary>
         /// 用户登录
         /// </summary>
@@ -201,7 +201,7 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
-        [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult SetTenantFirst()
         {
             var extModel = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());

Mall.WebApi/Controllers/User/UserController.cs

@@ -3591,7 +3591,7 @@ namespace Mall.WebApi.Controllers.User
 
         #region 获取用户列表
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetMemberUserListExt()
         {
             var re = RequestParm;
@@ -3618,7 +3618,7 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
+        [AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
         public ApiResult GetShippingAddressList()
         {
             var req = RequestParm;