diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Data/YiFrameworkDataModule.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Data/YiFrameworkDataModule.cs index 25647bab..e2072859 100644 --- a/Yi.Framework.Net6/src/framework/Yi.Framework.Data/YiFrameworkDataModule.cs +++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Data/YiFrameworkDataModule.cs @@ -16,7 +16,7 @@ using Yi.Framework.Ddd; namespace Yi.Framework.Data { [DependsOn( - typeof(YiFrameworkDddModule))] + typeof(YiFrameworkDddModule)) ] public class YiFrameworkDataModule : IStartupModule { public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs index d027436e..142999d5 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs @@ -1,9 +1,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using StartupModules; +using Yi.Framework.Core; +using Yi.Framework.Core.Attributes; namespace Yi.Framework.DictionaryManager { + [DependsOn(typeof(YiFrameworkCoreModule))] public class YiFrameworkDictionaryManagerModule : IStartupModule { public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj index aa0b10d6..260aff7a 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationContractsSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -14,9 +14,8 @@ - - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Yi.BBS.Application.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Yi.BBS.Application.csproj index 4406865b..71a2b0ec 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Yi.BBS.Application.csproj +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Yi.BBS.Application.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -18,7 +18,7 @@ - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/YiBBSApplicationModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/YiBBSApplicationModule.cs index ade5109a..0f87fe5f 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/YiBBSApplicationModule.cs +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/YiBBSApplicationModule.cs @@ -17,7 +17,7 @@ using Yi.RBAC.Application; namespace Yi.BBS.Application { [DependsOn( - + typeof(YiBBSApplicationContractsModule), typeof(YiBBSDomainModule), typeof(YiFrameworkAuthJwtBearerModule), diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Yi.BBS.Domain.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Yi.BBS.Domain.csproj index e8d2d743..0bf41efa 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Yi.BBS.Domain.csproj +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Yi.BBS.Domain.csproj @@ -5,7 +5,7 @@ enable enable True - ./DomainSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -15,9 +15,8 @@ - - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs index 1f6f1185..fff2d656 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs @@ -18,10 +18,11 @@ using System.Text.Json.Serialization; namespace Yi.BBS.Web { [DependsOn( + typeof(YiBBSSqlsugarModule), typeof(YiFrameworkAspNetCoreModule), typeof(YiFrameworkCoreAutofacModule), - typeof(YiBBSSqlsugarModule), - typeof(YiBBSApplicationModule) + typeof(YiBBSApplicationModule), + typeof(YiBBSSqlsugarModule) )] public class YiBBSWebModule : IStartupModule { diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json index 3b6286b7..3938b290 100644 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json +++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json @@ -14,16 +14,17 @@ "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], "DbConnOptions": { - "Url": "DataSource=yi-sqlsugar-dev.db", - "DbType": "Sqlite", + //"Url": "DataSource=yi-sqlsugar-dev.db", + "Url": "server=106.52.94.217;port=3306;database=yi-bbs-dev;user id=root;password=Qz52013142020.", + "DbType": "Mysql", "EnabledDbSeed": true, "EnabledReadWrite": false, "EnabledCodeFirst": true, "EntityAssembly": null, "ReadUrl": [ - "DataSource=[xxxx]", //sqlite - "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //mysql - "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //sqlserver + "DataSource=[xxxx]", //Sqlite + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql + "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver ] }, diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db index 329d4b55..c28ae3f8 100644 Binary files a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml deleted file mode 100644 index dfaac78a..00000000 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - Yi.BBS.Application.Contracts - - - - - Banner输入创建对象 - - - - - Banner抽象 - - - - - Article输入创建对象 - - - - - Comment输入创建对象 - - - - - 评论id - - - - - 主题id - - - - - 第一层评论id，第一层为0 - - - - - 被回复的CommentId，第一层为0 - - - - - 评论多反 - - - - - 主题id - - - - - 用户,评论人用户信息 - - - - - 被评论的用户信息 - - - - - 这个不是一个树形，而是存在一个二维数组，该Children只有在顶级时候，只有一层 - - - - - 单返回，返回单条评论即可 - - - - - 用户id联表为用户对象 - - - - - 根节点的评论id - - - - - 被回复的CommentId - - - - - Discuss输入创建对象 - - - - - 默认公开 - - - - - 封面 - - - - - 是否已点赞 - - - - - 封面 - - - - - 封面 - - - - - 封面 - - - - - Label输入创建对象 - - - - - Plate输入创建对象 - - - - - Article服务抽象 - - - - - Comment服务抽象 - - - - - Discuss服务抽象 - - - - - Label服务抽象 - - - - - Plate服务抽象 - - - - - Setting应用抽象 - - - - - 获取配置标题 - - - - - diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Exhibition/Dtos/Argee/AgreeDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Exhibition/Dtos/Argee/AgreeDto.cs new file mode 100644 index 00000000..a2a1465d --- /dev/null +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Exhibition/Dtos/Argee/AgreeDto.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.BBS.Application.Contracts.Exhibition.Dtos.Argee +{ + public class AgreeDto + { + public AgreeDto(bool isAgree) + { + IsAgree = isAgree; + if (isAgree) + { + + Message = "点赞成功，点赞+1"; + } + else + { + + Message = "取消点赞，点赞-1"; + } + + } + + public bool IsAgree { get; set; } + public string Message { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj index aa0b10d6..260aff7a 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationContractsSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -14,9 +14,8 @@ - - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.ContractsSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Yi.BBS.Application.ContractsSwaggerDoc.xml diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/ApplicationSwaggerDoc.xml deleted file mode 100644 index 0b2ebd1d..00000000 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/ApplicationSwaggerDoc.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - Yi.BBS.Application - - - - - 点赞功能 - - - - - 点赞,返回true为点赞+1，返回false为点赞-1 - - - - - - Banner服务实现 - - - - - Article服务实现 - - - - - 获取文章全部平铺信息 - - - - - - - - 查询文章 - - - - - - - - 发表文章 - - - - - - - - 效验创建权限 - - - - - - - 评论 - - - - - 获取改主题下的评论,结构为二维列表，该查询无分页 - - - - - - - - 发表评论 - - - - - - - - Discuss应用服务实现,用于参数效验、领域服务业务组合、日志记录、事务处理、账户信息 - - - - - 单查 - - - - - - - 查询 - - - - - - - 创建主题 - - - - - - - 效验主题查询权限 - - - - - - - - Label服务实现 - - - - - 获取当前用户的主题类型 - - - - - - - 创建 - - - - - - - Plate服务实现 - - - - - Setting服务实现 - - - - - 获取配置标题 - - - - - - - 临时服务，之后用其他模块代替 - - - - - 获取用户信息 - - - - - - diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.Application.csproj b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.Application.csproj index 4406865b..71a2b0ec 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.Application.csproj +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.Application.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -18,7 +18,7 @@ - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.ApplicationSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/ApplicationSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Yi.BBS.ApplicationSwaggerDoc.xml diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/YiBBSApplicationModule.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/YiBBSApplicationModule.cs index ade5109a..0f87fe5f 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/YiBBSApplicationModule.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/YiBBSApplicationModule.cs @@ -17,7 +17,7 @@ using Yi.RBAC.Application; namespace Yi.BBS.Application { [DependsOn( - + typeof(YiBBSApplicationContractsModule), typeof(YiBBSDomainModule), typeof(YiFrameworkAuthJwtBearerModule), diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/EnumClasses/DiscussPermissionTypeEnum.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/EnumClasses/DiscussPermissionTypeEnum.cs new file mode 100644 index 00000000..625a66a2 --- /dev/null +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/EnumClasses/DiscussPermissionTypeEnum.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.BBS.Domain.Shared.Forum.EnumClasses +{ + public enum DiscussPermissionTypeEnum + { + /// + /// 默认：公开 + /// + Public = 0, + + /// + /// 仅自己可见 + /// + Oneself, + + /// + /// 部分用户可见 + /// + User + + } +} diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs new file mode 100644 index 00000000..6c517074 --- /dev/null +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Data.DataSeeds; +using Yi.Framework.Ddd.Repositories; +using Yi.RBAC.Domain.Identity.Entities; +using Yi.RBAC.Domain.Setting.Entities; +using Yi.RBAC.Domain.Shared.Identity.EnumClasses; + +namespace Yi.BBS.Domain.DataSeed +{ + [AppService(typeof(IDataSeed))] + public class BbsConfigDataSeed : AbstractDataSeed + { + public BbsConfigDataSeed(IRepository repository) : base(repository) + { + } + + public override async Task IsInvoker() + { + return !await _repository.IsAnyAsync(x => x.ConfigKey == "ConfigEntity"); + } + public override List GetSeedData() + { + List entities = new List() + { + new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.name", ConfigValue = "Yi意社区", ConfigName = "bbs站点名称" }, + new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.author", ConfigValue = "橙子", ConfigName = "bbs站点作者" }, + new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.icp", ConfigValue = "2023 意社区 | 赣ICP备xxxxxx号-4", ConfigName = "bbs备案号" }, + new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.bottom", ConfigValue = "YiFramework意框架", ConfigName = "bbs底部信息" }, + }; + return entities; + } + } +} diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml deleted file mode 100644 index 1882b0e9..00000000 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - Yi.BBS.Domain - - - - - 主题id - - - - - 创建者 - - - - - 平铺自己 - - - - - - - 评论表 - - - - - 采用二维数组方式，不使用树形方式 - - - - - 被回复的CommentId - - - - - 用户,评论人用户信息 - - - - - 被评论的用户信息 - - - - - 封面 - - - - - 当PermissionType为部分用户时候，以下列表中的用户+创建者 代表拥有权限 - - - - - 论坛模块的领域服务 - - - - diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/ArticleEntity.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/ArticleEntity.cs index a6053be1..d48458e2 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/ArticleEntity.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/ArticleEntity.cs @@ -26,6 +26,8 @@ namespace Yi.BBS.Domain.Forum.Entities public long ParentId { get; set; } + [SugarColumn(IsIgnore =true)] + public List Children { get; set; } } diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.Domain.csproj b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.Domain.csproj index e8d2d743..0bf41efa 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.Domain.csproj +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.Domain.csproj @@ -5,7 +5,7 @@ enable enable True - ./DomainSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -15,9 +15,8 @@ - - + Always diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.DomainSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Yi.BBS.DomainSwaggerDoc.xml diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs index 1f6f1185..fff2d656 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs @@ -18,10 +18,11 @@ using System.Text.Json.Serialization; namespace Yi.BBS.Web { [DependsOn( + typeof(YiBBSSqlsugarModule), typeof(YiFrameworkAspNetCoreModule), typeof(YiFrameworkCoreAutofacModule), - typeof(YiBBSSqlsugarModule), - typeof(YiBBSApplicationModule) + typeof(YiBBSApplicationModule), + typeof(YiBBSSqlsugarModule) )] public class YiBBSWebModule : IStartupModule { diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/appsettings.json b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/appsettings.json index 3b6286b7..3938b290 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/appsettings.json +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/appsettings.json @@ -14,16 +14,17 @@ "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], "DbConnOptions": { - "Url": "DataSource=yi-sqlsugar-dev.db", - "DbType": "Sqlite", + //"Url": "DataSource=yi-sqlsugar-dev.db", + "Url": "server=106.52.94.217;port=3306;database=yi-bbs-dev;user id=root;password=Qz52013142020.", + "DbType": "Mysql", "EnabledDbSeed": true, "EnabledReadWrite": false, "EnabledCodeFirst": true, "EntityAssembly": null, "ReadUrl": [ - "DataSource=[xxxx]", //sqlite - "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //mysql - "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //sqlserver + "DataSource=[xxxx]", //Sqlite + "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql + "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver ] }, diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533110951546880.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533110951546880.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533110951546880.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533566218080256.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533566218080256.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639533566218080256.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639534806087897088.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639534806087897088.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639534806087897088.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535584387141632.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535584387141632.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535584387141632.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535709398372352.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535709398372352.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535709398372352.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535734618722304.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535734618722304.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535734618722304.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535798275674112.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535798275674112.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535798275674112.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535839769923584.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535839769923584.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639535839769923584.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639538862881640448.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639538862881640448.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639538862881640448.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539024949547008.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539024949547008.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539024949547008.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539319817506816.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539319817506816.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539319817506816.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539496531922944.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539496531922944.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639539496531922944.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540931445264384.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540931445264384.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540931445264384.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540982485749760.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540982485749760.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639540982485749760.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639562204019822592.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639562204019822592.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639562204019822592.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639583838608953344.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639583838608953344.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639583838608953344.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639584366197870592.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639584366197870592.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639584366197870592.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639585544113623040.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639585544113623040.jpg new file mode 100644 index 00000000..57c1f446 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Image/1639585544113623040.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533110951546880.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533110951546880.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533110951546880.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533566218080256.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533566218080256.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639533566218080256.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639534806087897088.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639534806087897088.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639534806087897088.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535584387141632.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535584387141632.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535584387141632.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535709398372352.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535709398372352.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535709398372352.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535734618722304.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535734618722304.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535734618722304.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535798275674112.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535798275674112.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535798275674112.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535839769923584.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535839769923584.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639535839769923584.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639538862881640448.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639538862881640448.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639538862881640448.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539024949547008.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539024949547008.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539024949547008.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539319817506816.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539319817506816.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539319817506816.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539496531922944.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539496531922944.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639539496531922944.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540931445264384.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540931445264384.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540931445264384.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540982485749760.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540982485749760.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639540982485749760.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639562204019822592.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639562204019822592.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639562204019822592.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639583838608953344.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639583838608953344.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639583838608953344.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639584366197870592.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639584366197870592.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639584366197870592.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639585544113623040.jpg b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639585544113623040.jpg new file mode 100644 index 00000000..446af2c8 Binary files /dev/null and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/wwwroot/Thumbnail/1639585544113623040.jpg differ diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db index 329d4b55..c28ae3f8 100644 Binary files a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.Contracts.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.Contracts.csproj index 0cd9dc9a..af0ad078 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.Contracts.csproj +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.Contracts.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationContractsSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -13,11 +13,11 @@ - - + Always + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.ContractsSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Yi.RBAC.Application.ContractsSwaggerDoc.xml diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.Application.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.Application.csproj index 65a574e3..73d55ded 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.Application.csproj +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.Application.csproj @@ -5,7 +5,7 @@ enable enable True - ./ApplicationSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -17,7 +17,7 @@ - + Always diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.ApplicationSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Yi.RBAC.ApplicationSwaggerDoc.xml diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj index f1699cca..c71fbc8a 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj @@ -5,7 +5,7 @@ enable enable True - ./DomainSwaggerDoc.xml + ./$(AssemblyName)SwaggerDoc.xml @@ -23,11 +23,11 @@ - - + Always + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.DomainSwaggerDoc.xml similarity index 100% rename from Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml rename to Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.DomainSwaggerDoc.xml