diff --git a/db/MongoDB/Roles.js b/db/MongoDB/Roles.js index 5544962c..1a8d2ebd 100644 --- a/db/MongoDB/Roles.js +++ b/db/MongoDB/Roles.js @@ -10,6 +10,6 @@ "RoleName": "Default", "Description": "默认用户,可访问前台页面", "Menus": [], - "Apps": [] + "Apps": ["BA", "Demo"] } ]; \ No newline at end of file diff --git a/db/MySQL/initData.sql b/db/MySQL/initData.sql index 7ddedd6b..15089570 100644 --- a/db/MySQL/initData.sql +++ b/db/MySQL/initData.sql @@ -170,9 +170,9 @@ INSERT into Navigations (ParentId, Name, `Order`, Icon, Url, Category, Applicati INSERT into Navigations (ParentId, Name, `Order`, Icon, Url, Category, Application) VALUES (0, '返回码云', 20, 'fa fa-fa', 'https://gitee.com/LongbowEnterprise/BootstrapAdmin', '1', 'Demo'); -- 菜单授权 -INSERT INTO NavigationRole (NavigationId, RoleId) SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Administrators' and Application= 'Demo'; INSERT INTO NavigationRole (NavigationId, RoleId) SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Default' and Application = 'Demo'; -- 角色对应用授权 -DELETE From RoleApp where AppId = 'Demo'; +DELETE From RoleApp where AppId in ('Demo', 'BA'); INSERT INTO RoleApp (AppId, RoleId) SELECT 'Demo', ID From Roles Where RoleName = 'Default'; +INSERT INTO RoleApp (AppId, RoleId) SELECT 'BA', ID From Roles Where RoleName = 'Default'; diff --git a/db/SQLite/InitData.sql b/db/SQLite/InitData.sql index 8fbe1608..bcf15cf1 100644 --- a/db/SQLite/InitData.sql +++ b/db/SQLite/InitData.sql @@ -175,9 +175,9 @@ INSERT into [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category INSERT into [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], [Application]) VALUES (0, '返回码云', 20, 'fa fa-fa', 'https://gitee.com/LongbowEnterprise/BootstrapAdmin', '1', 'Demo'); -- 菜单授权 -INSERT INTO NavigationRole (NavigationId, RoleId) SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Administrators' and [Application] = 'Demo'; INSERT INTO NavigationRole (NavigationId, RoleId) SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Default' and [Application] = 'Demo'; -- 角色对应用授权 -DELETE From RoleApp where AppId = 'Demo'; -INSERT INTO RoleApp (AppId, RoleId) SELECT 'Demo', ID From Roles Where RoleName = 'Default'; \ No newline at end of file +DELETE From RoleApp where AppId in ('Demo', 'BA'); +INSERT INTO RoleApp (AppId, RoleId) SELECT 'Demo', ID From Roles Where RoleName = 'Default'; +INSERT INTO RoleApp (AppId, RoleId) SELECT 'BA', ID From Roles Where RoleName = 'Default'; diff --git a/db/SQLite/Install.sql b/db/SQLite/Install.sql index 335f8cd7..a37a8318 100644 --- a/db/SQLite/Install.sql +++ b/db/SQLite/Install.sql @@ -63,12 +63,12 @@ CREATE TABLE Navigations( ParentId INT DEFAULT (0), Name VARCHAR (50) NOT NULL, [Order] INT NOT NULL DEFAULT (0), - Icon VARCHAR (50) DEFAULT (none), + Icon VARCHAR (50) DEFAULT [fa fa-fa], Url VARCHAR (4000) NULL, Category VARCHAR (50) DEFAULT 0, - Target VARCHAR (10) DEFAULT (_self), + Target VARCHAR (10) DEFAULT [_self], IsResource INT DEFAULT (0), - Application VARCHAR (200) DEFAULT (BA) COLLATE NOCASE + Application VARCHAR (200) DEFAULT [BA] COLLATE NOCASE ); CREATE TABLE NavigationRole( diff --git a/db/SqlServer/InitData.sql b/db/SqlServer/InitData.sql index 6ff1668c..f2d74ab4 100644 --- a/db/SqlServer/InitData.sql +++ b/db/SqlServer/InitData.sql @@ -182,9 +182,9 @@ INSERT [dbo].[Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Categor INSERT into [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], [Application]) VALUES (0, N'返回码云', 20, 'fa fa-fa', 'https://gitee.com/LongbowEnterprise/BootstrapAdmin', '1', @AppId) -- 菜单授权 -INSERT INTO NavigationRole (NavigationId, RoleId) SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Administrators' and [Application] = @AppId; INSERT INTO NavigationRole SELECT n.ID, r.ID FROM Navigations n left join Roles r on 1=1 Where r.RoleName = 'Default' and [Application] = @AppId -- 角色对应用授权 DELETE From RoleApp where AppId = @AppId; INSERT INTO RoleApp (AppId, RoleId) SELECT @AppId, ID From Roles Where RoleName = 'Default' +INSERT INTO RoleApp (AppId, RoleId) SELECT 'BA', ID From Roles Where RoleName = 'Default' diff --git a/src/admin/Bootstrap.Admin/BootstrapAdmin.db b/src/admin/Bootstrap.Admin/BootstrapAdmin.db index f3d77d23..4463f044 100644 Binary files a/src/admin/Bootstrap.Admin/BootstrapAdmin.db and b/src/admin/Bootstrap.Admin/BootstrapAdmin.db differ