Skip to content

Commit 610e0db

Browse files
author
starlying
committed
plugins
2 parents 349e0c1 + 73d887b commit 610e0db

File tree

23 files changed

+201
-30
lines changed

23 files changed

+201
-30
lines changed

‎source/Plugins/SiteServer.Plugin.GovInteract/SiteServer.Plugin.GovInteract.dll‎

0 Bytes
Binary file not shown.

‎source/Plugins/SiteServer.Plugin.GovPublic/SiteServer.Plugin.GovPublic.dll‎

0 Bytes
Binary file not shown.

‎source/Plugins/SiteServer.Plugin.Oss/SiteServer.Plugin.Oss.dll‎

0 Bytes
Binary file not shown.

‎source/Plugins/SiteServer.Plugin.Poll/SiteServer.Plugin.Poll.dll‎

0 Bytes
Binary file not shown.

‎source/Plugins/SiteServer.Plugin.WeiXin/SiteServer.Plugin.WeiXin.dll‎

0 Bytes
Binary file not shown.

‎source/SiteServer.BackgroundPages/Cms/PageConfigurationCreate.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public class PageConfigurationCreate : BasePageCms
2929
public PlaceHolder phIsCreateStaticContentByAddDate;
3030
public DateTimeTextBox tbCreateStaticContentAddDate;
3131

32+
public RadioButtonList IsCreateMultiThread; // 是否启用多线程生成页面
33+
3234
public void Page_Load(object sender, EventArgs e)
3335
{
3436
if (IsForbidden) return;
@@ -78,8 +80,12 @@ public void Page_Load(object sender, EventArgs e)
7880
{
7981
tbCreateStaticContentAddDate.DateTime = PublishmentSystemInfo.Additional.CreateStaticContentAddDate;
8082
}
83+
84+
EBooleanUtils.AddListItems(IsCreateMultiThread, "启用", "不启用");
85+
ControlUtils.SelectListItemsIgnoreCase(IsCreateMultiThread, PublishmentSystemInfo.Additional.IsCreateMultiThread.ToString());
86+
8187
}
82-
}
88+
}
8389

8490
public void IsCreateStaticContentByAddDate_SelectedIndexChanged(object sender, EventArgs e)
8591
{
@@ -108,7 +114,9 @@ public override void Submit_OnClick(object sender, EventArgs e)
108114
if (PublishmentSystemInfo.Additional.IsCreateStaticContentByAddDate)
109115
{
110116
PublishmentSystemInfo.Additional.CreateStaticContentAddDate = tbCreateStaticContentAddDate.DateTime;
111-
}
117+
}
118+
119+
PublishmentSystemInfo.Additional.IsCreateMultiThread = TranslateUtils.ToBool(IsCreateMultiThread.SelectedValue);
112120

113121
try
114122
{

‎source/SiteServer.BackgroundPages/WeiXin/ModalContentSelect.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static string GetRedirectUrlByKeywordAddList(int publishmentSystemId, boo
6363
public static string GetOpenWindowString(int publishmentSystemId, bool isMultiple, string jsMethod)
6464
{
6565
return PageUtils.GetOpenWindowString("选择微官网内容",
66-
PageUtils.GetWeiXinUrl(nameof(ModalCardSnSetting), new NameValueCollection
66+
PageUtils.GetWeiXinUrl(nameof(ModalContentSelect), new NameValueCollection
6767
{
6868
{"publishmentSystemId", publishmentSystemId.ToString()},
6969
{"isMultiple", isMultiple.ToString()},

‎source/SiteServer.BackgroundPages/WeiXin/ModalKeywordSelect.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void rptContents_ItemDataBound(object sender, RepeaterItemEventArgs e)
8484
var ltlKeyword = e.Item.FindControl("ltlKeyword") as Literal;
8585

8686
ltlKeyword.Text =
87-
$@"<div class=""alert alert-success pull-left"" style=""margin:5px;padding-right:14px; cursor:pointer;"" onclick=""window.parent.{_jsMethod}('{keyword}');{PageUtils.HidePopWin}""><strong style=""color: #468847"">{keyword}</strong>&nbsp;({EKeywordTypeUtils.GetText(keywordType)})</div>";
87+
$@"<div class=""alert alert-success pull-left"" style=""margin:5px;padding-right:14px; cursor:pointer;"" onclick=""window.parent.{_jsMethod}('{keyword}');;window.parent.closeWindow();""><strong style=""color: #468847"">{keyword}</strong>&nbsp;({EKeywordTypeUtils.GetText(keywordType)})</div>";
8888
}
8989
}
9090

‎source/SiteServer.CMS/Core/Create/CreateTaskManager.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public interface ICreateTaskManager
1313

1414
CreateTaskInfo GetLastPendingTask();
1515

16+
List<CreateTaskInfo> GetLastPendingTasks(int topNum);
17+
1618
void RemovePendingAndAddSuccessLog(CreateTaskInfo taskInfo, string timeSpan);
1719

1820
void RemovePendingAndAddFailureLog(CreateTaskInfo taskInfo, Exception ex);
@@ -121,6 +123,38 @@ public CreateTaskInfo GetLastPendingTask()
121123
return null;
122124
}
123125

126+
public List<CreateTaskInfo> GetLastPendingTasks(int topNum)
127+
{
128+
List<CreateTaskInfo> list = null;
129+
130+
foreach (var entry in PendingTaskDict)
131+
{
132+
var pendingTasks = entry.Value;
133+
if (pendingTasks.Count > 0)
134+
{
135+
list = new List<CreateTaskInfo>();
136+
if (pendingTasks.Count >= topNum)
137+
{
138+
while (topNum > 0)
139+
{
140+
list.Add(pendingTasks[pendingTasks.Count - topNum]);
141+
topNum--;
142+
}
143+
}
144+
else
145+
{
146+
foreach (var taskInfo in pendingTasks)
147+
{
148+
list.Add(taskInfo);
149+
}
150+
}
151+
152+
return list;
153+
}
154+
}
155+
return list;
156+
}
157+
124158
public void RemovePendingAndAddSuccessLog(CreateTaskInfo taskInfo, string timeSpan)
125159
{
126160
var pendingTasks = GetPendingTasks(taskInfo.PublishmentSystemID);
@@ -240,6 +274,11 @@ public CreateTaskInfo GetLastPendingTask()
240274
return DataProvider.CreateTaskDao.GetLastPendingTask();
241275
}
242276

277+
public List<CreateTaskInfo> GetLastPendingTasks(int topNum)
278+
{
279+
return DataProvider.CreateTaskDao.GetLastPendingTasks(topNum);
280+
}
281+
243282
public void RemovePendingAndAddSuccessLog(CreateTaskInfo taskInfo, string timeSpan)
244283
{
245284
DataProvider.CreateTaskDao.Delete(taskInfo.ID);

‎source/SiteServer.CMS/Model/PublishmentSystemInfoExtend.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,12 @@ public DateTime CreateStaticContentAddDate
348348
set { SetExtendedAttribute("CreateStaticContentAddDate", DateUtils.GetDateString(value)); }
349349
}
350350

351+
public bool IsCreateMultiThread
352+
{
353+
get { return GetBool("IsCreateMultiThread", false); }
354+
set { SetExtendedAttribute("IsCreateMultiThread", value.ToString()); }
355+
}
356+
351357
/****************站点地图设置********************/
352358

353359
public string SiteMapGooglePath

0 commit comments

Comments
 (0)