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
353824aa
Commit
353824aa
authored
Jan 12, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
ee74c748
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+10
-9
AppletSchoolController.cs
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
+2
-2
No files found.
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
353824aa
...
...
@@ -1264,7 +1264,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
MyDynamicList
()
public
ApiResult
Get
MyDynamicList
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1292,7 +1292,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
AboutMeDynamicList
()
public
ApiResult
Get
AboutMeDynamicList
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1326,7 +1326,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
PublishDynamic
()
public
ApiResult
Get
PublishDynamic
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1390,7 +1390,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicDetial
()
public
ApiResult
Get
DynamicDetial
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1419,6 +1419,7 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <param name="article">动态内容</param>
/// <returns></returns>
public
object
DecoratorDynameicResult
(
Rb_Education_Dynamic_Extend
article
)
{
List
<
string
>
fileList
=
new
List
<
string
>();
...
...
@@ -1436,7 +1437,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DeleteDynamic
()
public
ApiResult
Get
DeleteDynamic
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1461,7 +1462,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicLike
()
public
ApiResult
Get
DynamicLike
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1492,7 +1493,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicCancelLike
()
public
ApiResult
Get
DynamicCancelLike
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1516,7 +1517,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicComment
()
public
ApiResult
Get
DynamicComment
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
@@ -1549,7 +1550,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicDeleteComment
()
public
ApiResult
Get
DynamicDeleteComment
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
...
...
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @
353824aa
...
...
@@ -568,7 +568,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DynamicList
(
object
requestMsg
)
public
ApiResult
Get
DynamicList
(
object
requestMsg
)
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
...
...
@@ -597,7 +597,7 @@ namespace Mall.WebApi.Controllers.Education
List
<
string
>
fileList
=
new
List
<
string
>();
if
(!
string
.
IsNullOrEmpty
(
article
.
Files
))
{
fileList
=
CommonHelper
.
GetOssFileFullPath
(
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
article
.
Files
)
);
fileList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
article
.
Files
);
}
//StringHelper.UrlEncode(StringHelper.FromUnicodeString(article.Content))
var
resultData
=
new
{
id
=
article
.
Id
,
createEmpId
=
article
.
CreateBy
,
createEmName
=
article
.
CreateByName
,
crearteEmPhoto
=
article
.
CrearteByPhoto
,
createTime
=
article
.
CreateTime
.
HasValue
?
StringHelper
.
DateFormatToString
(
article
.
CreateTime
.
Value
)
:
""
,
content
=
StringHelper
.
FromUnicodeString
(
article
.
Content
),
coverPhoto
=
article
.
CoverPhoto
,
fileType
=
article
.
FileType
,
latAndLong
=
article
.
LatAndLong
,
address
=
article
.
Address
,
files
=
fileList
,
hasLike
=
article
.
HasLike
,
likeList
=
article
.
LikeList
.
Select
(
t
=>
new
{
empId
=
t
.
UserId
,
empName
=
t
.
EmName
,
t
.
Id
}),
commentList
=
article
.
CommentList
.
Select
(
t
=>
new
{
commentId
=
t
.
Id
,
empId
=
t
.
UserId
,
empName
=
t
.
UserName
,
byReplayEmpId
=
t
.
ByReplyEmpId
,
byReplayEmpName
=
t
.
ByReplyEmName
,
content
=
StringHelper
.
FromUnicodeString
(
t
.
Content
)
})
};
...
...
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