Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
24c964e4
Commit
24c964e4
authored
Dec 13, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
3c407a8f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
92 additions
and
96 deletions
+92
-96
BuildingCarrierModule_V2.cs
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
+3
-2
RB_Brand_EnterpriseRepository.cs
...Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs
+3
-12
LiveHouseController.cs
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
+31
-27
TestController.cs
Mall.WebApi/Controllers/CAP/TestController.cs
+2
-2
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+4
-4
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+2
-2
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+33
-33
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+8
-8
AppletLoginController.cs
Mall.WebApi/Controllers/User/AppletLoginController.cs
+2
-2
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+2
-2
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+2
-2
No files found.
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @
24c964e4
...
@@ -819,7 +819,7 @@ namespace Mall.Module.TradePavilion
...
@@ -819,7 +819,7 @@ namespace Mall.Module.TradePavilion
}
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BrandModel
.
PropertyDemand
))
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
else
{
{
...
@@ -1202,7 +1202,8 @@ namespace Mall.Module.TradePavilion
...
@@ -1202,7 +1202,8 @@ namespace Mall.Module.TradePavilion
}
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BrandModel
.
PropertyDemand
))
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
else
{
{
...
...
Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs
View file @
24c964e4
...
@@ -41,10 +41,7 @@ WHERE 1=1 ");
...
@@ -41,10 +41,7 @@ WHERE 1=1 ");
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
MallBaseId
),
query
.
MallBaseId
);
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
)
if
(
query
.
CategoryId
>
0
)
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
CategoryId
),
query
.
CategoryId
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
CategoryId
),
query
.
CategoryId
);
...
@@ -86,10 +83,7 @@ WHERE 1=1 ");
...
@@ -86,10 +83,7 @@ WHERE 1=1 ");
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
MallBaseId
),
query
.
MallBaseId
);
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
)
if
(
query
.
CategoryId
>
0
)
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
CategoryId
),
query
.
CategoryId
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
CategoryId
),
query
.
CategoryId
);
...
@@ -132,10 +126,7 @@ WHERE 1=1
...
@@ -132,10 +126,7 @@ WHERE 1=1
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
MallBaseId
),
query
.
MallBaseId
);
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
)
if
(
query
.
CategoryId
>
0
)
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Brand_Enterprise_Extend
.
CategoryId
),
query
.
CategoryId
);
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
...
@@ -42,8 +42,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
#
region
直播房间信息
#
region
直播房间信息
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetLiveHouseList
(
object
requestMsg
)
public
ApiResult
GetLiveHouseList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -76,8 +76,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -76,8 +76,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
[
HttpPost
]
[
HttpPost
]
[
Obsolete
]
[
Obsolete
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetLiveListByLiveStatus
(
object
requestMsg
)
public
ApiResult
GetLiveListByLiveStatus
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -151,8 +151,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -151,8 +151,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetSupplierAllList
(
object
requestMsg
)
public
ApiResult
GetSupplierAllList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -168,8 +168,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -168,8 +168,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetOrderProfitLossList
(
object
requestMsg
)
public
ApiResult
GetOrderProfitLossList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -259,8 +259,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -259,8 +259,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
FileContentResult
GetOrderProfitLossExcel
(
object
requestMsg
)
public
FileContentResult
GetOrderProfitLossExcel
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -387,8 +387,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -387,8 +387,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
FileContentResult
GetFXOrderProfitLossExcel
(
object
requestMsg
)
public
FileContentResult
GetFXOrderProfitLossExcel
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -636,8 +636,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -636,8 +636,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetGoodsList
(
object
requestMsg
)
public
ApiResult
GetGoodsList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -655,8 +655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -655,8 +655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetDistributorInfoList
(
object
requestMsg
)
public
ApiResult
GetDistributorInfoList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -826,8 +826,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -826,8 +826,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetTotalOrderProfitLoss
(
object
requestMsg
)
public
ApiResult
GetTotalOrderProfitLoss
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -896,8 +896,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -896,8 +896,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetOrderCommissionList
(
object
requestMsg
)
public
ApiResult
GetOrderCommissionList
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1429,8 +1429,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1429,8 +1429,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetDSMonthStatistics
(
object
requestMsg
)
public
ApiResult
GetDSMonthStatistics
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1458,7 +1458,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1458,7 +1458,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
20
,
Duration
=
60
)]
public
FileContentResult
GetDSMonthStatisticsToExcel
(
object
requestMsg
)
public
FileContentResult
GetDSMonthStatisticsToExcel
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1532,7 +1533,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1532,7 +1533,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetDSMoreMonthStatistics
(
object
requestMsg
)
public
ApiResult
GetDSMoreMonthStatistics
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1571,7 +1572,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1571,7 +1572,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
20
,
Duration
=
60
)]
public
FileContentResult
GetDSMoreMonthStatisticsToExcel
(
object
requestMsg
)
public
FileContentResult
GetDSMoreMonthStatisticsToExcel
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1653,7 +1655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1653,7 +1655,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
20
,
Duration
=
60
)]
public
ApiResult
GetDSYearStartistics
(
object
requestMsg
)
public
ApiResult
GetDSYearStartistics
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1679,7 +1682,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
...
@@ -1679,7 +1682,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
20
,
Duration
=
60
)]
public
FileContentResult
GetDSYearStartisticsToExcel
(
object
requestMsg
)
public
FileContentResult
GetDSYearStartisticsToExcel
(
object
requestMsg
)
{
{
var
requestParm
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
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
...
@@ -26,7 +26,7 @@ namespace Mall.WebApi.Controllers.CAP
}
}
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
Get
()
public
ApiResult
Get
()
{
{
ApiResult
apiResult
=
new
ApiResult
()
ApiResult
apiResult
=
new
ApiResult
()
...
@@ -41,7 +41,7 @@ namespace Mall.WebApi.Controllers.CAP
...
@@ -41,7 +41,7 @@ namespace Mall.WebApi.Controllers.CAP
}
}
[
NonAction
]
[
NonAction
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
[
DotNetCore
.
CAP
.
CapSubscribe
(
"show.time"
)]
[
DotNetCore
.
CAP
.
CapSubscribe
(
"show.time"
)]
public
void
CheckReceiveMessage
(
string
result
)
public
void
CheckReceiveMessage
(
string
result
)
{
{
...
...
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
24c964e4
...
@@ -1795,7 +1795,7 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -1795,7 +1795,7 @@ namespace Mall.WebApi.Controllers.Education
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetActivityTypeList
(
object
requestMsg
)
public
ApiResult
GetActivityTypeList
(
object
requestMsg
)
{
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
@@ -1818,7 +1818,7 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -1818,7 +1818,7 @@ namespace Mall.WebApi.Controllers.Education
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetActivityPage
()
public
ApiResult
GetActivityPage
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
@@ -1946,7 +1946,7 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -1946,7 +1946,7 @@ namespace Mall.WebApi.Controllers.Education
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetActivityDetial
()
public
ApiResult
GetActivityDetial
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
@@ -2659,7 +2659,7 @@ namespace Mall.WebApi.Controllers.Education
...
@@ -2659,7 +2659,7 @@ namespace Mall.WebApi.Controllers.Education
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetUserActivityListJXH
()
public
ApiResult
GetUserActivityListJXH
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
24c964e4
...
@@ -74,7 +74,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -74,7 +74,7 @@ namespace Mall.WebApi.Controllers.MallBase
[
HttpGet
]
[
HttpGet
]
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetHome
()
public
ApiResult
GetHome
()
{
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
...
@@ -496,7 +496,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -496,7 +496,7 @@ namespace Mall.WebApi.Controllers.MallBase
[
HttpGet
]
[
HttpGet
]
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetAppConfig
()
public
ApiResult
GetAppConfig
()
{
{
string
MiniAppId
=
""
;
string
MiniAppId
=
""
;
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
24c964e4
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
24c964e4
...
@@ -119,7 +119,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -119,7 +119,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
[
HttpGet
]
[
HttpGet
]
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetContractPageList
()
public
ApiResult
GetContractPageList
()
{
{
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
...
@@ -209,7 +209,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -209,7 +209,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
[
HttpGet
]
[
HttpGet
]
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetContract
()
public
ApiResult
GetContract
()
{
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
...
@@ -1750,7 +1750,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -1750,7 +1750,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetProjectTypeEnumList
()
public
ApiResult
GetProjectTypeEnumList
()
{
{
var
list
=
EnumHelper
.
GetEnumList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
ProjectTypeEnum
));
var
list
=
EnumHelper
.
GetEnumList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
ProjectTypeEnum
));
...
@@ -3113,7 +3113,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3113,7 +3113,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetFirstShopEnrollZipExport
()
public
ApiResult
GetFirstShopEnrollZipExport
()
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
...
@@ -3140,7 +3140,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3140,7 +3140,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetFirstShopEnrollZipExport_V3
()
public
ApiResult
GetFirstShopEnrollZipExport_V3
()
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
...
@@ -3168,7 +3168,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3168,7 +3168,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetNewFirstShopEnrollZipExport
()
public
ApiResult
GetNewFirstShopEnrollZipExport
()
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
...
@@ -3195,7 +3195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3195,7 +3195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetFirstShopEnrollResultUrl
()
public
ApiResult
GetFirstShopEnrollResultUrl
()
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
...
@@ -3223,7 +3223,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3223,7 +3223,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
DelFirstShopEnrollZipExport
()
public
ApiResult
DelFirstShopEnrollZipExport
()
{
{
var
req
=
base
.
RequestParm
;
var
req
=
base
.
RequestParm
;
...
...
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @
24c964e4
...
@@ -59,8 +59,8 @@ namespace Mall.WebApi.Controllers.User
...
@@ -59,8 +59,8 @@ namespace Mall.WebApi.Controllers.User
/// <param name="requestMsg"></param>
/// <param name="requestMsg"></param>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
Login
(
object
requestMsg
)
public
ApiResult
Login
(
object
requestMsg
)
{
{
var
lObj
=
JObject
.
Parse
(
requestMsg
.
ToString
());
var
lObj
=
JObject
.
Parse
(
requestMsg
.
ToString
());
...
...
Mall.WebApi/Controllers/User/TenantController.cs
View file @
24c964e4
...
@@ -87,7 +87,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -87,7 +87,7 @@ namespace Mall.WebApi.Controllers.User
#
region
商户信息
#
region
商户信息
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
/// <summary>
/// <summary>
/// 用户登录
/// 用户登录
/// </summary>
/// </summary>
...
@@ -201,7 +201,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -201,7 +201,7 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
AllowAnonymous
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
SetTenantFirst
()
public
ApiResult
SetTenantFirst
()
{
{
var
extModel
=
JsonConvert
.
DeserializeObject
<
RB_Tenant_Extend
>(
RequestParm
.
msg
.
ToString
());
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
...
@@ -3591,7 +3591,7 @@ namespace Mall.WebApi.Controllers.User
#
region
获取用户列表
#
region
获取用户列表
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetMemberUserListExt
()
public
ApiResult
GetMemberUserListExt
()
{
{
var
re
=
RequestParm
;
var
re
=
RequestParm
;
...
@@ -3618,7 +3618,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -3618,7 +3618,7 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
1
0
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
2
0
,
Duration
=
60
)]
public
ApiResult
GetShippingAddressList
()
public
ApiResult
GetShippingAddressList
()
{
{
var
req
=
RequestParm
;
var
req
=
RequestParm
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment