feat: 添加bbs种子数据

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs

@@ -70,18 +70,21 @@ namespace Yi.Framework.SqlSugarCore
         private void CodeFirst(IServiceProvider service)
         {
 
-                var moduleContainer = service.GetRequiredService<IModuleContainer>();
+            var moduleContainer = service.GetRequiredService<IModuleContainer>();
-                var db = service.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient;
+            var db = service.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient;
 
-                List<Type> types = new List<Type>();
+            //尝试创建数据库
-                foreach (var module in moduleContainer.Modules)
+            db.DbMaintenance.CreateDatabase();
-                {
+
-                    types.AddRange(module.Assembly.GetTypes().Where(x => x.GetCustomAttribute<SugarTable>() != null).Where(x => x.GetCustomAttribute<SplitTableAttribute>() is null));
+            List<Type> types = new List<Type>();
-                }
+            foreach (var module in moduleContainer.Modules)
-                if (types.Count > 0)
+            {
-                {
+                types.AddRange(module.Assembly.GetTypes().Where(x => x.GetCustomAttribute<SugarTable>() != null).Where(x => x.GetCustomAttribute<SplitTableAttribute>() is null));
-                    db.CodeFirst.InitTables(types.ToArray());
+            }
-                }
+            if (types.Count > 0)
+            {
+                db.CodeFirst.InitTables(types.ToArray());
+            }
 
         }
 

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/DataSeeds/BbsMenuDataSeed.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar.DistributedSystem.Snowflake;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Guids;
+using Yi.Framework.Rbac.Domain.Entities;
+using Yi.Framework.Rbac.Domain.Shared.Enums;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.Bbs.SqlSugarCore.DataSeeds
+{
+    public class BbsMenuDataSeed : IDataSeedContributor, ITransientDependency
+    {
+        private IGuidGenerator _guidGenerator;
+        private ISqlSugarRepository<MenuEntity, Guid> _repository;
+        public BbsMenuDataSeed(ISqlSugarRepository<MenuEntity,Guid> repository, IGuidGenerator guidGenerator)
+        {
+            _repository=repository;
+            _guidGenerator=guidGenerator;
+        }
+        public async Task SeedAsync(DataSeedContext context)
+        {
+            if (!await _repository.IsAnyAsync(x => x.MenuName == "BBS"))
+            {
+                await _repository.InsertManyAsync(GetSeedData());
+            }
+        }
+
+        public List<MenuEntity> GetSeedData()
+        {
+            List<MenuEntity> entities = new List<MenuEntity>();
+            //BBS
+            MenuEntity bbs = new MenuEntity(_guidGenerator.Create())
+            {
+                MenuName = "BBS",
+                MenuType = MenuTypeEnum.Catalogue,
+                Router = "/bbs",
+                IsShow = true,
+                IsLink = false,
+                MenuIcon = "monitor",
+                OrderNum = 91,
+                IsDeleted = false
+            };
+            entities.Add(bbs);
+
+
+
+            //板块管理
+            MenuEntity plate = new MenuEntity(_guidGenerator.Create())
+            {
+
+                MenuName = "板块管理",
+                PermissionCode = "bbs:plate:list",
+                MenuType = MenuTypeEnum.Menu,
+                Router = "plate",
+                IsShow = true,
+                IsLink = false,
+                IsCache = true,
+                Component = "bbs/plate/index",
+                MenuIcon = "component",
+                OrderNum = 100,
+                ParentId = bbs.Id,
+                IsDeleted = false
+            };
+            entities.Add(plate);
+
+            //文章管理
+            MenuEntity article = new MenuEntity(_guidGenerator.Create())
+            {
+
+                MenuName = "文章管理",
+                PermissionCode = "bbs:article:list",
+                MenuType = MenuTypeEnum.Menu,
+                Router = "article",
+                IsShow = true,
+                IsLink = false,
+                IsCache = true,
+                Component = "bbs/article/index",
+                MenuIcon = "documentation",
+                OrderNum = 99,
+                ParentId = bbs.Id,
+                IsDeleted = false
+            };
+            entities.Add(article);
+
+
+            return entities;
+        }
+    }
+}

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj

@@ -1,5 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\..\common.props" />
+	<ItemGroup>
+	  <Compile Remove="Events\**" />
+	  <EmbeddedResource Remove="Events\**" />
+	  <None Remove="Events\**" />
+	</ItemGroup>
 
 
   <ItemGroup>
@@ -15,8 +20,4 @@
     <ProjectReference Include="..\Yi.Framework.Rbac.Domain\Yi.Framework.Rbac.Domain.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Events\" />
-  </ItemGroup>
-
 </Project>

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs

@@ -652,7 +652,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/role/index",
                 MenuIcon = "peoples",
-                OrderNum = 100,
+                OrderNum = 99,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -720,7 +720,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/menu/index",
                 MenuIcon = "tree-table",
-                OrderNum = 100,
+                OrderNum = 98,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -787,7 +787,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/dept/index",
                 MenuIcon = "tree",
-                OrderNum = 100,
+                OrderNum = 97,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -856,7 +856,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/post/index",
                 MenuIcon = "post",
-                OrderNum = 100,
+                OrderNum = 96,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -923,7 +923,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/dict/index",
                 MenuIcon = "dict",
-                OrderNum = 100,
+                OrderNum = 95,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -991,7 +991,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsCache = true,
                 Component = "system/config/index",
                 MenuIcon = "edit",
-                OrderNum = 100,
+                OrderNum = 94,
                 ParentId = system.Id,
                 IsDeleted = false
             };
@@ -1058,7 +1058,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                 IsShow = true,
                 IsLink = false,
                 MenuIcon = "log",
-                OrderNum = 100,
+                OrderNum = 93,
                 ParentId = system.Id,
                 IsDeleted = false
             };

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/Repositories/UserRepository.cs

@@ -73,7 +73,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.Repositories
 
             user.Roles = new List<RoleEntity>();
             userRoleMenu.User = user.Adapt<UserDto>();
-
+            userRoleMenu.Menus = userRoleMenu.Menus.OrderByDescending(x => x.OrderNum).ToHashSet();
             return userRoleMenu;
         }
     }

Yi.Bbs.Vue3/.env.development

@@ -1,4 +1,5 @@
 # 接口前缀
 VITE_APP_BASEAPI="/api-dev"
-VITE_APP_URL="http://123.207.63.87:19001/api/app"
+# VITE_APP_URL="http://123.207.63.87:19001/api/app"
+VITE_APP_URL="http://localhost:19001/api/app"
 VITE_APP_ENV_NAME = "dev"

Yi.Bbs.Vue3/package-lock.json

@@ -22,7 +22,8 @@
         "vue": "^3.2.47",
         "vue-cropper": "1.0.3",
         "vue-router": "^4.1.6",
-        "yarm": "^0.4.0"
+        "yarm": "^0.4.0",
+        "yarn": "^1.22.21"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^4.0.0",
@@ -3863,6 +3864,19 @@
       "resolved": "https://registry.npmmirror.com/yarm/-/yarm-0.4.0.tgz",
       "integrity": "sha512-yCoX5QCA5Upb+VP7/UBuNGBz7MO5oWyc6degv5AifeGnakpaHeNwE/SNOPMefFKpQBionZyUeRdBo63Dl+awDQ=="
     },
+    "node_modules/yarn": {
+      "version": "1.22.21",
+      "resolved": "https://registry.npmmirror.com/yarn/-/yarn-1.22.21.tgz",
+      "integrity": "sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==",
+      "hasInstallScript": true,
+      "bin": {
+        "yarn": "bin/yarn.js",
+        "yarnpkg": "bin/yarn.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/zrender": {
       "version": "5.4.3",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz",
@@ -6830,6 +6844,11 @@
       "resolved": "https://registry.npmmirror.com/yarm/-/yarm-0.4.0.tgz",
       "integrity": "sha512-yCoX5QCA5Upb+VP7/UBuNGBz7MO5oWyc6degv5AifeGnakpaHeNwE/SNOPMefFKpQBionZyUeRdBo63Dl+awDQ=="
     },
+    "yarn": {
+      "version": "1.22.21",
+      "resolved": "https://registry.npmmirror.com/yarn/-/yarn-1.22.21.tgz",
+      "integrity": "sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg=="
+    },
     "zrender": {
       "version": "5.4.3",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz",

Yi.Bbs.Vue3/package.json

@@ -22,7 +22,8 @@
     "vue": "^3.2.47",
     "vue-cropper": "1.0.3",
     "vue-router": "^4.1.6",
-    "yarm": "^0.4.0"
+    "yarm": "^0.4.0",
+    "yarn": "^1.22.21"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.0.0",

Yi.Bbs.Vue3/vite.config.js

@@ -27,7 +27,7 @@ export default defineConfig(({ command, mode }) => {
       },
     },
     server: {
-      port: 18000,
+      port: 18001,
       open: true,
       proxy: {
         [env.VITE_APP_BASEAPI]: {

Yi.Bbs.Vue3/yarn.lock

@@ -2211,6 +2211,11 @@
   "resolved" "https://registry.npmmirror.com/yarm/-/yarm-0.4.0.tgz"
   "version" "0.4.0"
 
+"yarn@^1.22.21":
+  "integrity" "sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg=="
+  "resolved" "https://registry.npmmirror.com/yarn/-/yarn-1.22.21.tgz"
+  "version" "1.22.21"
+
 "zrender@5.4.3":
   "integrity" "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ=="
   "resolved" "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz"