Merge branch 'dev' of https://github.com/siteserver/cms into dev

starlying · starlying · commit bfeda5aa8ab7 · 2017-06-15T13:38:18.000+08:00
diff --git a/source/SiteServer.BackgroundPages/Cms/PageCreateIndex.cs b/source/SiteServer.BackgroundPages/Cms/PageCreateIndex.cs
@@ -11,12 +11,12 @@ public void Page_Load(object sender, EventArgs e)
         {
             if (IsForbidden) return;
 
-            PageUtils.CheckRequestParameter("PublishmentSystemID");
+            PageUtils.CheckRequestParameter("PublishmentSystemID"); // 检测参数PublishmentSystemID是否合法(不能为空)
 
             if (!IsPostBack)
             {
-                CreateManager.CreateIndex(PublishmentSystemId);
-                PageCreateStatus.Redirect(PublishmentSystemId);
+                CreateManager.CreateIndex(PublishmentSystemId); // 创建任务
+                PageCreateStatus.Redirect(PublishmentSystemId); // 转到查询任务进度页面
             }
         }
     }
diff --git a/source/SiteServer.CMS/Core/Create/CreateManager.cs b/source/SiteServer.CMS/Core/Create/CreateManager.cs
@@ -6,10 +6,14 @@ namespace SiteServer.CMS.Core.Create
 {
     public class CreateManager
     {
+        /// <summary>
+        /// 创建生成首页任务
+        /// </summary>
+        /// <param name="publishmentSystemId"></param>
         public static void CreateIndex(int publishmentSystemId)
         {
             var taskInfo = new CreateTaskInfo(0, ECreateType.Index, publishmentSystemId, 0, 0, 0);
-            CreateTaskManager.Instance.AddPendingTask(taskInfo);
+            CreateTaskManager.Instance.AddPendingTask(taskInfo); // 添加任务到队列
         }
 
         public static void CreateChannel(int publishmentSystemId, int channelId)
diff --git a/source/SiteServer.CMS/Core/Create/CreateTaskManager.cs b/source/SiteServer.CMS/Core/Create/CreateTaskManager.cs
@@ -68,6 +68,11 @@ internal class CreateTaskManagerForMomery : ICreateTaskManager
         private static readonly Dictionary<int, List<CreateTaskInfo>> PendingTaskDict = new Dictionary<int, List<CreateTaskInfo>>();
         private static readonly Dictionary<int, List<CreateTaskLogInfo>> TaskLogDict = new Dictionary<int, List<CreateTaskLogInfo>>();
 
+        /// <summary>
+        /// 获取某个站点的所有任务
+        /// </summary>
+        /// <param name="publishmentSystemId"></param>
+        /// <returns></returns>
         private List<CreateTaskInfo> GetPendingTasks(int publishmentSystemId)
         {
             if (!PendingTaskDict.ContainsKey(publishmentSystemId))
@@ -86,9 +91,13 @@ private List<CreateTaskLogInfo> GetTaskLogs(int publishmentSystemId)
             return TaskLogDict[publishmentSystemId];
         }
 
+        /// <summary>
+        /// 添加一个任务
+        /// </summary>
+        /// <param name="task"></param>
         public void AddPendingTask(CreateTaskInfo task)
         {
-            var pendingTasks = GetPendingTasks(task.PublishmentSystemID);
+            var pendingTasks = GetPendingTasks(task.PublishmentSystemID); // 查找某站点所有任务
             foreach (var taskInfo in pendingTasks)
             {
                 if (task.Equals(taskInfo))
diff --git a/source/SiteServer.CMS/Core/ServiceManager.cs b/source/SiteServer.CMS/Core/ServiceManager.cs
@@ -87,6 +87,10 @@ public static void ClearIsPendingCreateCache()
             CacheManager.UpdateTemporaryCacheFile(CacheFileNameIsPendingCreate);
         }
 
+        /// <summary>
+        /// ��������Ƿ�����
+        /// </summary>
+        /// <returns></returns>
         public static bool IsServiceOnline()
         {
             var cacheValue = CacheManager.GetCache(CacheKeyStatus) as string;
diff --git a/source/SiteServer.Web/CreateHub.cs b/source/SiteServer.Web/CreateHub.cs
@@ -14,6 +14,7 @@ public void Execute()
             var lockThis = new object();
             lock (lockThis)
             {
+                // 如果服务组件启用了的话，则通过服务组件生成
                 if (ServiceManager.IsServiceOnline())
                 {
                     return;

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ public void Page_Load(object sender, EventArgs e)`
`11`	`11`	`{`
`12`	`12`	`if (IsForbidden) return;`
`13`	`13`
`14`		`- PageUtils.CheckRequestParameter("PublishmentSystemID");`
	`14`	`+ PageUtils.CheckRequestParameter("PublishmentSystemID"); // 检测参数PublishmentSystemID是否合法(不能为空)`
`15`	`15`
`16`	`16`	`if (!IsPostBack)`
`17`	`17`	`{`
`18`		`- CreateManager.CreateIndex(PublishmentSystemId);`
`19`		`- PageCreateStatus.Redirect(PublishmentSystemId);`
	`18`	`+ CreateManager.CreateIndex(PublishmentSystemId); // 创建任务`
	`19`	`+ PageCreateStatus.Redirect(PublishmentSystemId); // 转到查询任务进度页面`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,14 @@ namespace SiteServer.CMS.Core.Create`
`6`	`6`	`{`
`7`	`7`	`public class CreateManager`
`8`	`8`	`{`
	`9`	`+ /// <summary>`
	`10`	`+ /// 创建生成首页任务`
	`11`	`+ /// </summary>`
	`12`	`+ /// <param name="publishmentSystemId"></param>`
`9`	`13`	`public static void CreateIndex(int publishmentSystemId)`
`10`	`14`	`{`
`11`	`15`	`var taskInfo = new CreateTaskInfo(0, ECreateType.Index, publishmentSystemId, 0, 0, 0);`
`12`		`- CreateTaskManager.Instance.AddPendingTask(taskInfo);`
	`16`	`+ CreateTaskManager.Instance.AddPendingTask(taskInfo); // 添加任务到队列`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`public static void CreateChannel(int publishmentSystemId, int channelId)`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,11 @@ internal class CreateTaskManagerForMomery : ICreateTaskManager`
`68`	`68`	`private static readonly Dictionary<int, List<CreateTaskInfo>> PendingTaskDict = new Dictionary<int, List<CreateTaskInfo>>();`
`69`	`69`	`private static readonly Dictionary<int, List<CreateTaskLogInfo>> TaskLogDict = new Dictionary<int, List<CreateTaskLogInfo>>();`
`70`	`70`
	`71`	`+ /// <summary>`
	`72`	`+ /// 获取某个站点的所有任务`
	`73`	`+ /// </summary>`
	`74`	`+ /// <param name="publishmentSystemId"></param>`
	`75`	`+ /// <returns></returns>`
`71`	`76`	`private List<CreateTaskInfo> GetPendingTasks(int publishmentSystemId)`
`72`	`77`	`{`
`73`	`78`	`if (!PendingTaskDict.ContainsKey(publishmentSystemId))`
`@@ -86,9 +91,13 @@ private List<CreateTaskLogInfo> GetTaskLogs(int publishmentSystemId)`
`86`	`91`	`return TaskLogDict[publishmentSystemId];`
`87`	`92`	`}`
`88`	`93`
	`94`	`+ /// <summary>`
	`95`	`+ /// 添加一个任务`
	`96`	`+ /// </summary>`
	`97`	`+ /// <param name="task"></param>`
`89`	`98`	`public void AddPendingTask(CreateTaskInfo task)`
`90`	`99`	`{`
`91`		`- var pendingTasks = GetPendingTasks(task.PublishmentSystemID);`
	`100`	`+ var pendingTasks = GetPendingTasks(task.PublishmentSystemID); // 查找某站点所有任务`
`92`	`101`	`foreach (var taskInfo in pendingTasks)`
`93`	`102`	`{`
`94`	`103`	`if (task.Equals(taskInfo))`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,10 @@ public static void ClearIsPendingCreateCache()`
`87`	`87`	`CacheManager.UpdateTemporaryCacheFile(CacheFileNameIsPendingCreate);`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ /// <summary>`
	`91`	`+ /// ·þÎñ×é¼þÊÇ·ñÆôÓÃ`
	`92`	`+ /// </summary>`
	`93`	`+ /// <returns></returns>`
`90`	`94`	`public static bool IsServiceOnline()`
`91`	`95`	`{`
`92`	`96`	`var cacheValue = CacheManager.GetCache(CacheKeyStatus) as string;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public void Execute()`
`14`	`14`	`var lockThis = new object();`
`15`	`15`	`lock (lockThis)`
`16`	`16`	`{`
	`17`	`+ // 如果服务组件启用了的话，则通过服务组件生成`
`17`	`18`	`if (ServiceManager.IsServiceOnline())`
`18`	`19`	`{`
`19`	`20`	`return;`