Commit 353824aa authored by 吴春's avatar 吴春

提交代码

parent ee74c748
...@@ -1264,7 +1264,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1264,7 +1264,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult MyDynamicList() public ApiResult GetMyDynamicList()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1292,7 +1292,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1292,7 +1292,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult AboutMeDynamicList() public ApiResult GetAboutMeDynamicList()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1326,7 +1326,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1326,7 +1326,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult PublishDynamic() public ApiResult GetPublishDynamic()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1390,7 +1390,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1390,7 +1390,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicDetial() public ApiResult GetDynamicDetial()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1419,6 +1419,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1419,6 +1419,7 @@ namespace Mall.WebApi.Controllers.Education
/// </summary> /// </summary>
/// <param name="article">动态内容</param> /// <param name="article">动态内容</param>
/// <returns></returns> /// <returns></returns>
public object DecoratorDynameicResult(Rb_Education_Dynamic_Extend article) public object DecoratorDynameicResult(Rb_Education_Dynamic_Extend article)
{ {
List<string> fileList = new List<string>(); List<string> fileList = new List<string>();
...@@ -1436,7 +1437,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1436,7 +1437,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DeleteDynamic() public ApiResult GetDeleteDynamic()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1461,7 +1462,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1461,7 +1462,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicLike() public ApiResult GetDynamicLike()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1492,7 +1493,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1492,7 +1493,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicCancelLike() public ApiResult GetDynamicCancelLike()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1516,7 +1517,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1516,7 +1517,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicComment() public ApiResult GetDynamicComment()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
...@@ -1549,7 +1550,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1549,7 +1550,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicDeleteComment() public ApiResult GetDynamicDeleteComment()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
......
...@@ -568,7 +568,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -568,7 +568,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DynamicList(object requestMsg) public ApiResult GetDynamicList(object requestMsg)
{ {
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString()); var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
...@@ -597,7 +597,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -597,7 +597,7 @@ namespace Mall.WebApi.Controllers.Education
List<string> fileList = new List<string>(); List<string> fileList = new List<string>();
if (!string.IsNullOrEmpty(article.Files)) 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)) //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) }) }; 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) }) };
......
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