Skip to content

Commit 3de2dad

Browse files
author
starlying
committed
plugins
1 parent 6c23668 commit 3de2dad

File tree

110 files changed

+815
-644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+815
-644
lines changed

source/BaiRong.Core/Permissions/AdminManager.cs renamed to source/BaiRong.Core/AdminManager.cs

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using BaiRong.Core.Model;
44
using BaiRong.Core.Model.Enumerations;
55

6-
namespace BaiRong.Core.Permissions
6+
namespace BaiRong.Core
77
{
88
public class AdminManager
99
{
@@ -129,43 +129,7 @@ public static bool CreateAdministrator(AdministratorInfo administratorInfo, out
129129

130130
public const string AnonymousUserName = "Anonymous";
131131

132-
public static void VerifyAdministratorPermissions(string administratorName, params string[] permissionArray)
133-
{
134-
if (HasAdministratorPermissions(administratorName, permissionArray))
135-
{
136-
return;
137-
}
138-
PageUtils.Redirect(PageUtils.GetAdminDirectoryUrl(string.Empty));
139-
}
140-
141-
private static bool HasAdministratorPermissions(string administratorName, params string[] permissionArray)
142-
{
143-
var permissions = PermissionsManager.GetPermissions(administratorName);
144-
if (permissions.IsSystemAdministrator)
145-
{
146-
return true;
147-
}
148-
var permissionList = permissions.PermissionList;
149-
foreach (var permission in permissionArray)
150-
{
151-
if (permissionList.Contains(permission))
152-
{
153-
return true;
154-
}
155-
}
156-
157-
return false;
158-
}
159-
160-
public static void ClearUserCache(string userName)
161-
{
162-
var cacheKeyStartStrings = PermissionsManager.GetCackeKeyStartStringList(userName);
163-
foreach (string cacheKeyStartString in cacheKeyStartStrings)
164-
{
165-
CacheUtils.RemoveByStartString(cacheKeyStartString);
166-
//CacheUtils.Remove(cacheKey);
167-
}
168-
}
132+
169133

170134
public static string GetRolesHtml(string userName)
171135
{

‎source/BaiRong.Core/BaiRong.Core.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
<Prefer32Bit>false</Prefer32Bit>
127127
</PropertyGroup>
128128
<ItemGroup>
129+
<Compile Include="AdminManager.cs" />
129130
<Compile Include="Auth\Base64Utils.cs" />
130131
<Compile Include="Auth\JWT\DefaultJsonSerializer.cs" />
131132
<Compile Include="Auth\JWT\IJsonSerializer.cs" />
@@ -140,6 +141,7 @@
140141
<Compile Include="AuxiliaryTable\TableUtils.cs" />
141142
<Compile Include="AuxiliaryTable\TableStyleManager.cs" />
142143
<Compile Include="Collection\Pair.cs" />
144+
<Compile Include="RoleManager.cs" />
143145
<Compile Include="SiteFilesAssets.cs" />
144146
<Compile Include="SiteServerAssets.cs" />
145147
<Compile Include="ThirdParty\Atom\Atom.AdditionalElements\DublinCore\DcElement.cs" />
@@ -267,8 +269,6 @@
267269
<Compile Include="Provider\UserDao.cs" />
268270
<Compile Include="Provider\UserGroupDao.cs" />
269271
<Compile Include="Provider\UserLogDao.cs" />
270-
<Compile Include="PermissionConfigManager.cs" />
271-
<Compile Include="PermissionConfig.cs" />
272272
<Compile Include="Cryptography\DESEncryptor.cs" />
273273
<Compile Include="Cryptography\EncryptUtils.cs" />
274274
<Compile Include="Data\ADOHelper.cs" />
@@ -565,12 +565,8 @@
565565
<Compile Include="ThirdParty\AliDaYu\Util\TopUtils.cs" />
566566
<Compile Include="ThirdParty\AliDaYu\Util\WebUtils.cs" />
567567
<Compile Include="ThirdParty\AliDaYu\Util\XmlWriter.cs" />
568-
<Compile Include="Permissions\AdministratorWithPermissions.cs" />
569-
<Compile Include="Permissions\AdminManager.cs" />
570-
<Compile Include="Permissions\PermissionManager.cs" />
571568
<Compile Include="DirectoryTreeItem.cs" />
572569
<Compile Include="UserGroupManager.cs" />
573-
<Compile Include="Permissions\RoleManager.cs" />
574570
<Compile Include="UEditorUploaderForUser.cs" />
575571
<Compile Include="Model\AdministratorInfo.cs" />
576572
<Compile Include="Model\Enumerations\EPredefinedRole.cs" />

‎source/BaiRong.Core/PermissionConfig.cs‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎source/BaiRong.Core/PermissionConfigManager.cs‎

Lines changed: 0 additions & 176 deletions
This file was deleted.

‎source/BaiRong.Core/Provider/AdministratorDao.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using BaiRong.Core.Data;
99
using BaiRong.Core.Model;
1010
using BaiRong.Core.Model.Enumerations;
11-
using BaiRong.Core.Permissions;
1211

1312
namespace BaiRong.Core.Provider
1413
{

‎source/BaiRong.Core/Provider/ConfigDao.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using BaiRong.Core.Data;
55
using BaiRong.Core.Model;
66
using BaiRong.Core.Model.Enumerations;
7-
using BaiRong.Core.Permissions;
87

98
namespace BaiRong.Core.Provider
109
{

source/BaiRong.Core/Permissions/RoleManager.cs renamed to source/BaiRong.Core/RoleManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Web;
33
using BaiRong.Core.Model.Enumerations;
44

5-
namespace BaiRong.Core.Permissions
5+
namespace BaiRong.Core
66
{
77
public class RoleManager
88
{

source/Plugins/SiteServer.Plugin.GovInteract/SiteServer.Plugin.GovInteract.csproj renamed to source/Plugins/GovInteract/GovInteract.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{62C5F20F-54F2-42F5-BDD3-44C7BC4CC07D}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>SiteServer.Plugin.GovInteract</RootNamespace>
11-
<AssemblyName>SiteServer.Plugin.GovInteract</AssemblyName>
10+
<RootNamespace>GovInteract</RootNamespace>
11+
<AssemblyName>GovInteract</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>

‎source/Plugins/GovInteract/GovInteract.dll‎

3.5 KB
Binary file not shown.

source/Plugins/SiteServer.Plugin.GovInteract/Main.cs renamed to source/Plugins/GovInteract/Main.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace SiteServer.Plugin.GovInteract
1+
using SiteServer.Plugin;
2+
3+
namespace GovInteract
24
{
35
public class Main : IPlugin
46
{

0 commit comments

Comments
 (0)