Skip to content

M
mall.oytour.com
Commit 24c964e4 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 3c407a8f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 96 deletions
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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/TradeController.cs
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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
View file @ 24c964e4
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment