6.15

starlying · starlying · commit bbf5a16859a6 · 2020-05-28T10:23:25.000+08:00
diff --git a/SiteServer.CMS/Model/ContentInfo.cs b/SiteServer.CMS/Model/ContentInfo.cs
@@ -316,8 +316,23 @@ public override Dictionary<string, object> ToDictionary()
 	                    value = PageUtility.ParseNavigationUrl(siteInfo, value, false);
 	                }
 
-	                dict.Remove(styleInfo.AttributeName);
                     dict[styleInfo.AttributeName] = value;
+
+                    var extendAttributeName = ContentAttribute.GetExtendAttributeName(styleInfo.AttributeName);
+                    dict.Remove(extendAttributeName);
+
+                    var extendValues = GetString(extendAttributeName);
+                    dict[$"{styleInfo.AttributeName}Extends"] = 0;
+                    if (!string.IsNullOrEmpty(extendValues))
+                    {
+                        var no = 0;
+                        var extends = TranslateUtils.StringCollectionToStringList(extendValues);
+                        foreach (var extend in extends)
+                        {
+                            dict[$"{styleInfo.AttributeName}Extend{++no}"] = PageUtility.ParseNavigationUrl(siteInfo, extend, false);
+                        }
+                        dict[$"{styleInfo.AttributeName}Extends"] = no;
+                    }
                 }
                 else if (styleInfo.InputType == InputType.TextEditor)
 	            {
@@ -326,12 +341,10 @@ public override Dictionary<string, object> ToDictionary()
 	                {
 	                    value = ContentUtility.TextEditorContentDecode(siteInfo, value, false);
 	                }
-	                dict.Remove(styleInfo.AttributeName);
                     dict[styleInfo.AttributeName] = value;
 	            }
 	            else
 	            {
-	                dict.Remove(styleInfo.AttributeName);
                     dict[styleInfo.AttributeName] = Get(styleInfo.AttributeName);
                 }
 	        }
diff --git a/SiteServer.CMS/StlParser/StlElement/StlPlayer.cs b/SiteServer.CMS/StlParser/StlElement/StlPlayer.cs
@@ -53,7 +53,7 @@ private StlPlayer() { }
         public static string Parse(PageInfo pageInfo, ContextInfo contextInfo)
 		{
             var type = BackgroundContentAttribute.VideoUrl;
-            var playUrl = string.Empty;
+            var playUrl = PlayByFlowPlayer;
             var imageUrl = string.Empty;
             var playBy = string.Empty;
             var width = 450;
diff --git a/SiteServer.Web/Controllers/V1/ContentsController.Dto.cs b/SiteServer.Web/Controllers/V1/ContentsController.Dto.cs
@@ -56,7 +56,7 @@ public class QueryRequest
         public class QueryResult
         {
             public int TotalCount { get; set; }
-            public IEnumerable<ContentInfo> Contents { get; set; }
+            public IEnumerable<Dictionary<string, object>> Contents { get; set; }
         }
 
         public class CheckRequest
@@ -68,7 +68,7 @@ public class CheckRequest
 
         public class CheckResult
         {
-            public List<ContentInfo> Contents { get; set; }
+            public List<Dictionary<string, object>> Contents { get; set; }
         }
     }
 }
diff --git a/SiteServer.Web/Controllers/V1/ContentsController.cs b/SiteServer.Web/Controllers/V1/ContentsController.cs
@@ -117,7 +117,7 @@ public IHttpActionResult Create(int siteId, int channelId)
 
                 return Ok(new
                 {
-                    Value = contentInfo
+                    Value = contentInfo.ToDictionary()
                 });
             }
             catch (Exception ex)
@@ -212,7 +212,7 @@ public IHttpActionResult Update(int siteId, int channelId, int id)
 
                 return Ok(new
                 {
-                    Value = contentInfo
+                    Value = contentInfo.ToDictionary()
                 });
             }
             catch (Exception ex)
@@ -267,7 +267,7 @@ public IHttpActionResult Delete(int siteId, int channelId, int id)
 
                 return Ok(new
                 {
-                    Value = contentInfo
+                    Value = contentInfo.ToDictionary()
                 });
             }
             catch (Exception ex)
@@ -316,7 +316,7 @@ public IHttpActionResult Get(int siteId, int channelId, int id)
 
                 return Ok(new
                 {
-                    Value = contentInfo
+                    Value = contentInfo.ToDictionary()
                 });
             }
             catch (Exception ex)
@@ -366,11 +366,11 @@ public QueryResult GetContents([FromBody] QueryRequest request)
             var totalCount = DataProvider.ContentDao.GetTotalCount(tableName, query);
             var channelContentIds = DataProvider.ContentDao.GetChannelContentIdList(tableName, query);
 
-            var contents = new List<ContentInfo>();
+            var contents = new List<Dictionary<string, object>>();
             foreach (var channelContentId in channelContentIds)
             {
                 var content = ContentManager.GetContentInfo(site, channelContentId.ChannelId, channelContentId.Id);
-                contents.Add(content);
+                contents.Add(content.ToDictionary());
             }
 
             return new QueryResult
@@ -394,7 +394,7 @@ public CheckResult CheckContents([FromBody] CheckRequest request)
             var site = SiteManager.GetSiteInfo(request.SiteId);
             if (site == null) return Request.BadRequest<CheckResult>("无法确定内容对应的站点");
 
-            var contents = new List<ContentInfo>();
+            var contents = new List<Dictionary<string, object>>();
             foreach (var channelContentId in request.Contents)
             {
                 var channel = ChannelManager.GetChannelInfo(request.SiteId, channelContentId.ChannelId);
@@ -410,7 +410,7 @@ public CheckResult CheckContents([FromBody] CheckRequest request)
 
                 DataProvider.ContentDao.Update(site, channel, content);
 
-                contents.Add(content);
+                contents.Add(content.ToDictionary());
 
                 var contentCheck = new ContentCheckInfo
                 {
diff --git a/SiteServer.Web/SiteServer/main.js b/SiteServer.Web/SiteServer/main.js
@@ -88,8 +88,6 @@ var methods = {
     }).then(function (response) {
       var res = response.data;
       
-    }).catch(function (error) {
-      utils.error($this, error);
     }).then(function () {
       $this.create();
     });
diff --git a/SiteServer.Web/Web.config b/SiteServer.Web/Web.config
@@ -14,7 +14,7 @@
     <add key="SecretKey" value="eef9e4b0d48bf7a5" />
 
     <add key="DatabaseType" value="MySql" />
-     <add key="ConnectionString" value="Server=47.95.221.96;Uid=root;Pwd=siteservercms88;Database=web;SslMode=Preferred;CharSet=utf8" /> 
+     <add key="ConnectionString" value="" /> 
     <!--<add key="ConnectionString" value="" />-->
 
 	<add key="Microsoft.VisualStudio.Enterprise.AspNetHelper.VsInstrLocation" value="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Performance Tools\vsinstr.exe" />

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,23 @@ public override Dictionary<string, object> ToDictionary()`
`316`	`316`	`value = PageUtility.ParseNavigationUrl(siteInfo, value, false);`
`317`	`317`	`}`
`318`	`318`
`319`		`- dict.Remove(styleInfo.AttributeName);`
`320`	`319`	`dict[styleInfo.AttributeName] = value;`
	`320`	`+`
	`321`	`+ var extendAttributeName = ContentAttribute.GetExtendAttributeName(styleInfo.AttributeName);`
	`322`	`+ dict.Remove(extendAttributeName);`
	`323`	`+`
	`324`	`+ var extendValues = GetString(extendAttributeName);`
	`325`	`+ dict[$"{styleInfo.AttributeName}Extends"] = 0;`
	`326`	`+ if (!string.IsNullOrEmpty(extendValues))`
	`327`	`+ {`
	`328`	`+ var no = 0;`
	`329`	`+ var extends = TranslateUtils.StringCollectionToStringList(extendValues);`
	`330`	`+ foreach (var extend in extends)`
	`331`	`+ {`
	`332`	`+ dict[$"{styleInfo.AttributeName}Extend{++no}"] = PageUtility.ParseNavigationUrl(siteInfo, extend, false);`
	`333`	`+ }`
	`334`	`+ dict[$"{styleInfo.AttributeName}Extends"] = no;`
	`335`	`+ }`
`321`	`336`	`}`
`322`	`337`	`else if (styleInfo.InputType == InputType.TextEditor)`
`323`	`338`	`{`
`@@ -326,12 +341,10 @@ public override Dictionary<string, object> ToDictionary()`
`326`	`341`	`{`
`327`	`342`	`value = ContentUtility.TextEditorContentDecode(siteInfo, value, false);`
`328`	`343`	`}`
`329`		`- dict.Remove(styleInfo.AttributeName);`
`330`	`344`	`dict[styleInfo.AttributeName] = value;`
`331`	`345`	`}`
`332`	`346`	`else`
`333`	`347`	`{`
`334`		`- dict.Remove(styleInfo.AttributeName);`
`335`	`348`	`dict[styleInfo.AttributeName] = Get(styleInfo.AttributeName);`
`336`	`349`	`}`
`337`	`350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private StlPlayer() { }`
`53`	`53`	`public static string Parse(PageInfo pageInfo, ContextInfo contextInfo)`
`54`	`54`	`{`
`55`	`55`	`var type = BackgroundContentAttribute.VideoUrl;`
`56`		`- var playUrl = string.Empty;`
	`56`	`+ var playUrl = PlayByFlowPlayer;`
`57`	`57`	`var imageUrl = string.Empty;`
`58`	`58`	`var playBy = string.Empty;`
`59`	`59`	`var width = 450;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class QueryRequest`
`56`	`56`	`public class QueryResult`
`57`	`57`	`{`
`58`	`58`	`public int TotalCount { get; set; }`
`59`		`- public IEnumerable<ContentInfo> Contents { get; set; }`
	`59`	`+ public IEnumerable<Dictionary<string, object>> Contents { get; set; }`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public class CheckRequest`
`@@ -68,7 +68,7 @@ public class CheckRequest`
`68`	`68`
`69`	`69`	`public class CheckResult`
`70`	`70`	`{`
`71`		`- public List<ContentInfo> Contents { get; set; }`
	`71`	`+ public List<Dictionary<string, object>> Contents { get; set; }`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public IHttpActionResult Create(int siteId, int channelId)`
`117`	`117`
`118`	`118`	`return Ok(new`
`119`	`119`	`{`
`120`		`- Value = contentInfo`
	`120`	`+ Value = contentInfo.ToDictionary()`
`121`	`121`	`});`
`122`	`122`	`}`
`123`	`123`	`catch (Exception ex)`
`@@ -212,7 +212,7 @@ public IHttpActionResult Update(int siteId, int channelId, int id)`
`212`	`212`
`213`	`213`	`return Ok(new`
`214`	`214`	`{`
`215`		`- Value = contentInfo`
	`215`	`+ Value = contentInfo.ToDictionary()`
`216`	`216`	`});`
`217`	`217`	`}`
`218`	`218`	`catch (Exception ex)`
`@@ -267,7 +267,7 @@ public IHttpActionResult Delete(int siteId, int channelId, int id)`
`267`	`267`
`268`	`268`	`return Ok(new`
`269`	`269`	`{`
`270`		`- Value = contentInfo`
	`270`	`+ Value = contentInfo.ToDictionary()`
`271`	`271`	`});`
`272`	`272`	`}`
`273`	`273`	`catch (Exception ex)`
`@@ -316,7 +316,7 @@ public IHttpActionResult Get(int siteId, int channelId, int id)`
`316`	`316`
`317`	`317`	`return Ok(new`
`318`	`318`	`{`
`319`		`- Value = contentInfo`
	`319`	`+ Value = contentInfo.ToDictionary()`
`320`	`320`	`});`
`321`	`321`	`}`
`322`	`322`	`catch (Exception ex)`
`@@ -366,11 +366,11 @@ public QueryResult GetContents([FromBody] QueryRequest request)`
`366`	`366`	`var totalCount = DataProvider.ContentDao.GetTotalCount(tableName, query);`
`367`	`367`	`var channelContentIds = DataProvider.ContentDao.GetChannelContentIdList(tableName, query);`
`368`	`368`
`369`		`- var contents = new List<ContentInfo>();`
	`369`	`+ var contents = new List<Dictionary<string, object>>();`
`370`	`370`	`foreach (var channelContentId in channelContentIds)`
`371`	`371`	`{`
`372`	`372`	`var content = ContentManager.GetContentInfo(site, channelContentId.ChannelId, channelContentId.Id);`
`373`		`- contents.Add(content);`
	`373`	`+ contents.Add(content.ToDictionary());`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`return new QueryResult`
`@@ -394,7 +394,7 @@ public CheckResult CheckContents([FromBody] CheckRequest request)`
`394`	`394`	`var site = SiteManager.GetSiteInfo(request.SiteId);`
`395`	`395`	`if (site == null) return Request.BadRequest<CheckResult>("无法确定内容对应的站点");`
`396`	`396`
`397`		`- var contents = new List<ContentInfo>();`
	`397`	`+ var contents = new List<Dictionary<string, object>>();`
`398`	`398`	`foreach (var channelContentId in request.Contents)`
`399`	`399`	`{`
`400`	`400`	`var channel = ChannelManager.GetChannelInfo(request.SiteId, channelContentId.ChannelId);`
`@@ -410,7 +410,7 @@ public CheckResult CheckContents([FromBody] CheckRequest request)`
`410`	`410`
`411`	`411`	`DataProvider.ContentDao.Update(site, channel, content);`
`412`	`412`
`413`		`- contents.Add(content);`
	`413`	`+ contents.Add(content.ToDictionary());`
`414`	`414`
`415`	`415`	`var contentCheck = new ContentCheckInfo`
`416`	`416`	`{`