10000 6.8 · githubsunyf/cms@d902506 · GitHub
[go: up one dir, main page]
Skip to content

Commit d902506

Browse files
starlyingstarlying
committed
6.8
1 parent 475605e commit d902506

File tree

2 files changed

+59
-28
lines changed

2 files changed

+59
-28
lines changed

‎SiteServer.CMS/Plugin/PluginMenuManager.cs

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ public static string GetHomeDefaultPageUrl()
5454
return pageUrl;
5555
}
5656

57+
private static string GetMenuId(string serviceId, int i)
58+
{
59+
return $"{serviceId}_{i}";
60+
}
61+
5762
public static Dictionary<string, Menu> GetTopMenus()
5863
{
5964
var menus = new Dictionary<string, Menu>();
@@ -62,9 +67,10 @@ public static Dictionary<string, Menu> GetTopMenus()
6267
{
6368
if (service.SystemMenuFuncs == null) continue;
6469

65-
var metadataMenus = new List<Menu>();
6670
try
6771
{
72+
var metadataMenus = new List<Menu>();
73+
6874
foreach (var menuFunc in service.SystemMenuFuncs)
6975
{
7076
var metadataMenu = menuFunc.Invoke();
@@ -73,19 +79,20 @@ public static Dictionary<string, Menu> GetTopMenus()
7379
metadataMenus.Add(metadataMenu);
7480
}
7581
}
82+
83+
if (metadataMenus.Count == 0) continue;
84+
85+
var i = 0;
86+
foreach (var metadataMenu in metadataMenus)
87+
{
88+
var pluginMenu = GetMenu(service.PluginId, 0, 0, 0, metadataMenu, 0);
89+
menus[GetMenuId(service.PluginId, ++i)] = pluginMenu;
90+
}
7691
}
7792
catch (Exception ex)
7893
{
7994
LogUtils.AddErrorLog(service.PluginId, ex);
8095
}
81-
82-
if (metadataMenus.Count == 0) continue;
83-
84-
foreach (var metadataMenu in metadataMenus)
85-
{
86-
var pluginMenu = GetMenu(service.PluginId, 0, 0, 0, metadataMenu, 0);
87-
menus.Add(service.PluginId, pluginMenu);
88-
}
8996
}
9097

9198
return menus;
@@ -99,9 +106,10 @@ public static Dictionary<string, Menu> GetSiteMenus(int siteId)
99106
{
100107
if (service.SiteMenuFuncs == null) continue;
101108

102-
var metadataMenus = new List<Menu>();
103109
try
104110
{
111+
var metadataMenus = new List<Menu>();
112+
105113
foreach (var menuFunc in service.SiteMenuFuncs)
106114
{
107115
var metadataMenu = menuFunc.Invoke(siteId);
@@ -110,19 +118,20 @@ public static Dictionary<string, Menu> GetSiteMenus(int siteId)
110118
metadataMenus.Add(metadataMenu);
111119
}
112120
}
121+
122+
if (metadataMenus.Count == 0) continue;
123+
124+
var i = 0;
125+
foreach (var metadataMenu in metadataMenus)
126+
{
127+
var pluginMenu = GetMenu(service.PluginId, siteId, 0, 0, metadataMenu, 0);
128+
menus[GetMenuId(service.PluginId, ++i)] = pluginMenu;
129+
}
113130
}
114131
catch (Exception ex)
115132
{
116133
LogUtils.AddErrorLog(service.PluginId, ex);
117134
}
118-
119-
if (metadataMenus.Count == 0) continue;
120-
121-
foreach (var metadataMenu in metadataMenus)
122-
{
123-
var pluginMenu = GetMenu(service.PluginId, siteId, 0, 0, metadataMenu, 0);
124-
menus.Add(service.PluginId, pluginMenu);
125-
}
126135
}
127136

128137
return menus;
@@ -139,9 +148,10 @@ public static List<Menu> GetContentMenus(List<string> pluginIds, ContentInfo con
139148

140149
if (service.ContentMenuFuncs == null) continue;
141150

142-
var metadataMenus = new List<Menu>();
143151
try
144152
{
153+
var metadataMenus = new List<Menu>();
154+
145155
foreach (var menuFunc in service.ContentMenuFuncs)
146156
{
147157
var metadataMenu = menuFunc.Invoke(contentInfo);
@@ -150,19 +160,19 @@ public static List<Menu> GetContentMenus(List<string> pluginIds, ContentInfo con
150160
metadataMenus.Add(metadataMenu);
151161
}
152162
}
163+
164+
if (metadataMenus.Count == 0) continue;
165+
166+
foreach (var metadataMenu in metadataMenus)
167+
{
168+
var pluginMenu = GetMenu(service.PluginId, contentInfo.SiteId, contentInfo.ChannelId, contentInfo.Id, metadataMenu, 0);
169+
menus.Add(pluginMenu);
170+
}
153171
}
154172
catch (Exception ex)
155173
{
156174
LogUtils.AddErrorLog(service.PluginId, ex);
157175
}
158-
159-
if (metadataMenus.Count == 0) continue;
160-
161-
foreach (var metadataMenu in metadataMenus)
162-
{
163-
var pluginMenu = GetMenu(service.PluginId, contentInfo.SiteId, contentInfo.ChannelId, contentInfo.Id, metadataMenu, 0);
164-
menus.Add(pluginMenu);
165-
}
166176
}
167177

168178
return menus;

‎SiteServer.Web/Controllers/Pages/PagesMainController.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,28 @@ public IHttpActionResult GetConfig()
3232
try
3333
{
3434
var request = new RequestImpl();
35-
if (!request.IsAdminLoggin)
35+
36+
if (string.IsNullOrEmpty(WebConfigUtils.ConnectionString))
37+
{
38+
return Ok(new
39+
{
40+
Value = false,
41+
RedirectUrl = "Installer/"
42+
});
43+
}
44+
45+
#if !DEBUG
46+
if (ConfigManager.Instance.IsInitialized && ConfigManager.Instance.DatabaseVersion != SystemManager.Version)
47+
{
48+
return Ok(new
49+
{
50+
Value = false,
51+
RedirectUrl = PageSyncDatabase.GetRedirectUrl()
52+
});
53+
}
54+
#endif
55+
56+
if (!request.IsAdminLoggin || request.AdminInfo == null || request.AdminInfo.IsLockedOut)
3657
{
3758
return Ok(new
3859
{

0 commit comments

Comments
 (0)
0