diff --git a/Yi.Framework.Net6/src/project/BBS/GlobalUsings.cs b/Yi.Framework.Net6/src/project/BBS/GlobalUsings.cs deleted file mode 100644 index d6ecb816..00000000 --- a/Yi.Framework.Net6/src/project/BBS/GlobalUsings.cs +++ /dev/null @@ -1,4 +0,0 @@ -global using Yi.Framework.Core.Attributes; -global using Yi.Framework.Core.Helper; -global using Yi.Framework.Core.Model; -global using Yi.Framework.Core.Exceptions; \ No newline at end of file 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 deleted file mode 100644 index a2a1465d..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Exhibition/Dtos/Argee/AgreeDto.cs +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 260aff7a..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/Yi.BBS.Application.Contracts.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net6.0 - enable - enable - True - ./$(AssemblyName)SwaggerDoc.xml - - - - - - - - - - - Always - - - - diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/YiBBSApplicationContractsModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/YiBBSApplicationContractsModule.cs deleted file mode 100644 index d968104f..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/YiBBSApplicationContractsModule.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Core.Attributes; -using Yi.BBS.Domain.Shared; - -namespace Yi.BBS.Application.Contracts -{ - [DependsOn( - typeof(YiBBSDomainSharedModule) - )] - public class YiBBSApplicationContractsModule : IStartupModule - { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - } - - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Exhibition/AgreeService.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Exhibition/AgreeService.cs deleted file mode 100644 index fb41f751..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Exhibition/AgreeService.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Cike.AutoWebApi.Setting; -using Yi.BBS.Application.Contracts.Exhibition.Dtos.Argee; -using Yi.BBS.Domain.Exhibition.Entities; -using Yi.BBS.Domain.Forum.Entities; -using Yi.Framework.Core.CurrentUsers; -using Yi.Framework.Ddd.Repositories; -using Yi.Framework.Ddd.Services; -using Yi.Framework.Ddd.Services.Abstract; -using Yi.Framework.Uow; - -namespace Yi.BBS.Application.Exhibition -{ - /// - /// 点赞功能 - /// - [AppService] - public class AgreeService : ApplicationService, IApplicationService, IAutoApiService - { - - [Autowired] - private IRepository _repository { get; set; } - - [Autowired] - private IRepository _discssRepository { get; set; } - [Autowired] - private ICurrentUser _currentUser { get; set; } - - [Autowired] - private IUnitOfWorkManager _unitOfWorkManager { get; set; } - - /// - /// 点赞,返回true为点赞+1，返回false为点赞-1 - /// - /// - public async Task PostOperateAsync(long discussId) - { - var entity = await _repository.GetFirstAsync(x => x.DiscussId == discussId && x.CreatorId == _currentUser.Id); - //判断是否已经点赞过 - if (entity is null) - { - using (var uow = _unitOfWorkManager.CreateContext()) - { - //没点赞过，添加记录即可，,修改总点赞数量 - await _repository.InsertAsync(new AgreeEntity(discussId)); - var discussEntity = await _discssRepository.GetByIdAsync(discussId); - if (discussEntity is null) - { - throw new UserFriendlyException("主题为空"); - } - discussEntity.AgreeNum += 1; - await _discssRepository.UpdateAsync(discussEntity); - uow.Commit(); - } - return new AgreeDto(true); - - } - else - { - using (var uow = _unitOfWorkManager.CreateContext()) - { - //点赞过，删除即可,修改总点赞数量 - await _repository.DeleteByIdAsync(entity.Id); - var discussEntity = await _discssRepository.GetByIdAsync(discussId); - if (discussEntity is null) - { - throw new UserFriendlyException("主题为空"); - } - discussEntity.AgreeNum -= 1; - await _discssRepository.UpdateAsync(discussEntity); - uow.Commit(); - } - - return new AgreeDto(false); - } - } - } -} 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 deleted file mode 100644 index 71a2b0ec..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/Yi.BBS.Application.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - net6.0 - enable - enable - True - ./$(AssemblyName)SwaggerDoc.xml - - - - - - - - - - - - - - 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 deleted file mode 100644 index 0f87fe5f..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/YiBBSApplicationModule.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.BBS.Application.Contracts; -using Yi.Framework.Auth.JwtBearer; -using Yi.Framework.Core.Attributes; -using Yi.Framework.Data; -using Yi.Framework.Ddd; -using Yi.BBS.Domain; -using Yi.RBAC.Application; - -namespace Yi.BBS.Application -{ - [DependsOn( - - typeof(YiBBSApplicationContractsModule), - typeof(YiBBSDomainModule), - typeof(YiFrameworkAuthJwtBearerModule), - typeof(YiRBACApplicationModule) - )] - public class YiBBSApplicationModule : IStartupModule - { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - } - - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - } - } -} 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 deleted file mode 100644 index 625a66a2..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/EnumClasses/DiscussPermissionTypeEnum.cs +++ /dev/null @@ -1,27 +0,0 @@ -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.Shared/Forum/EnumClasses/QueryDiscussTypeEnum.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/EnumClasses/QueryDiscussTypeEnum.cs deleted file mode 100644 index 08d9063a..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/EnumClasses/QueryDiscussTypeEnum.cs +++ /dev/null @@ -1,16 +0,0 @@ -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 QueryDiscussTypeEnum - { - New, - Suggest, - Host - - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/Etos/SeeDiscussEventArgs.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/Etos/SeeDiscussEventArgs.cs deleted file mode 100644 index 3381d4e0..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/Etos/SeeDiscussEventArgs.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.BBS.Domain.Shared.Forum.Etos -{ - public class SeeDiscussEventArgs - { - public long DiscussId { get; set; } - public int OldSeeNum { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Yi.BBS.Domain.Shared.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Yi.BBS.Domain.Shared.csproj deleted file mode 100644 index 692994fe..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Yi.BBS.Domain.Shared.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/YiBBSDomainSharedModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/YiBBSDomainSharedModule.cs deleted file mode 100644 index 5f37e09e..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/YiBBSDomainSharedModule.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Core.Attributes; -using Yi.Framework.Ddd; - -namespace Yi.BBS.Domain.Shared -{ - [DependsOn( - typeof(YiFrameworkDddModule) - )] - public class YiBBSDomainSharedModule : IStartupModule - { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - } - - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - } - } -} 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 deleted file mode 100644 index 1e4aac53..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs +++ /dev/null @@ -1,37 +0,0 @@ -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 == "bbs.site.name"); - } - 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/DataSeeds/BbsMenuDataSeed.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsMenuDataSeed.cs deleted file mode 100644 index 381192ca..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsMenuDataSeed.cs +++ /dev/null @@ -1,326 +0,0 @@ -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.Shared.Identity.EnumClasses; - -namespace Yi.BBS.Domain.DataSeed -{ - [AppService(typeof(IDataSeed))] - public class BbsMenuDataSeed : AbstractDataSeed - { - public BbsMenuDataSeed(IRepository repository) : base(repository) - { - } - - public override async Task IsInvoker() - { - return !await _repository.IsAnyAsync(x => x.MenuName == "BBS"); - } - public override List GetSeedData() - { - List entities = new List(); - - //BBS - MenuEntity bbs = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "BBS", - MenuType = MenuTypeEnum.Catalogue, - Router = "/bbs", - IsShow = true, - IsLink = false, - MenuIcon = "international", - OrderNum = 97, - ParentId = 0, - IsDeleted = false - }; - entities.Add(bbs); - - - //评论管理 - MenuEntity comment = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "评论管理", - PermissionCode = "bbs:comment:list", - MenuType = MenuTypeEnum.Menu, - Router = "comment", - IsShow = true, - IsLink = false, - IsCache = true, - Component = "bbs/comment/index", - MenuIcon = "education", - OrderNum = 100, - ParentId = bbs.Id, - IsDeleted = false - }; - entities.Add(comment); - - MenuEntity commentQuery = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "评论查询", - PermissionCode = "bbs:comment:query", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = comment.Id, - IsDeleted = false - }; - entities.Add(commentQuery); - - MenuEntity commentAdd = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "评论新增", - PermissionCode = "bbs:comment:add", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = comment.Id, - IsDeleted = false - }; - entities.Add(commentAdd); - - MenuEntity commentEdit = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "评论修改", - PermissionCode = "bbs:comment:edit", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = comment.Id, - IsDeleted = false - }; - entities.Add(commentEdit); - - MenuEntity commentRemove = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "评论删除", - PermissionCode = "bbs:comment:remove", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = comment.Id, - IsDeleted = false - }; - entities.Add(commentRemove); - - - //文章管理 - MenuEntity article = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "文章管理", - PermissionCode = "bbs:article:list", - MenuType = MenuTypeEnum.Menu, - Router = "article", - IsShow = true, - IsLink = false, - IsCache = true, - Component = "bbs/article/index", - MenuIcon = "education", - OrderNum = 100, - ParentId = bbs.Id, - IsDeleted = false - }; - entities.Add(article); - - MenuEntity articleQuery = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "文章查询", - PermissionCode = "bbs:article:query", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = article.Id, - IsDeleted = false - }; - entities.Add(articleQuery); - - MenuEntity articleAdd = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "文章新增", - PermissionCode = "bbs:article:add", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = article.Id, - IsDeleted = false - }; - entities.Add(articleAdd); - - MenuEntity articleEdit = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "文章修改", - PermissionCode = "bbs:article:edit", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = article.Id, - IsDeleted = false - }; - entities.Add(articleEdit); - - MenuEntity articleRemove = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "文章删除", - PermissionCode = "bbs:article:remove", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = article.Id, - IsDeleted = false - }; - entities.Add(articleRemove); - - - //主题管理 - MenuEntity discuss = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "主题管理", - PermissionCode = "bbs:discuss:list", - MenuType = MenuTypeEnum.Menu, - Router = "discuss", - IsShow = true, - IsLink = false, - IsCache = true, - Component = "bbs/discuss/index", - MenuIcon = "education", - OrderNum = 100, - ParentId = bbs.Id, - IsDeleted = false - }; - entities.Add(discuss); - - MenuEntity discussQuery = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "主题查询", - PermissionCode = "bbs:discuss:query", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = discuss.Id, - IsDeleted = false - }; - entities.Add(discussQuery); - - MenuEntity discussAdd = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "主题新增", - PermissionCode = "bbs:discuss:add", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = discuss.Id, - IsDeleted = false - }; - entities.Add(discussAdd); - - MenuEntity discussEdit = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "主题修改", - PermissionCode = "bbs:discuss:edit", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = discuss.Id, - IsDeleted = false - }; - entities.Add(discussEdit); - - MenuEntity discussRemove = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "主题删除", - PermissionCode = "bbs:discuss:remove", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = discuss.Id, - IsDeleted = false - }; - entities.Add(discussRemove); - - - - //板块管理 - MenuEntity plate = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "板块管理", - PermissionCode = "bbs:plate:list", - MenuType = MenuTypeEnum.Menu, - Router = "plate", - IsShow = true, - IsLink = false, - IsCache = true, - Component = "bbs/plate/index", - MenuIcon = "education", - OrderNum = 100, - ParentId = bbs.Id, - IsDeleted = false - }; - entities.Add(plate); - - MenuEntity plateQuery = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "板块查询", - PermissionCode = "bbs:plate:query", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = plate.Id, - IsDeleted = false - }; - entities.Add(plateQuery); - - MenuEntity plateAdd = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "板块新增", - PermissionCode = "bbs:plate:add", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = plate.Id, - IsDeleted = false - }; - entities.Add(plateAdd); - - MenuEntity plateEdit = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "板块修改", - PermissionCode = "bbs:plate:edit", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = plate.Id, - IsDeleted = false - }; - entities.Add(plateEdit); - - MenuEntity plateRemove = new MenuEntity() - { - Id = SnowflakeHelper.NextId, - MenuName = "板块删除", - PermissionCode = "bbs:plate:remove", - MenuType = MenuTypeEnum.Component, - OrderNum = 100, - ParentId = plate.Id, - IsDeleted = false - }; - entities.Add(plateRemove); - - //默认值 - entities.ForEach(m => - { - m.IsDeleted = false; - m.State = true; - }); - return entities; - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Exhibition/Entities/AgreeEntity .cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Exhibition/Entities/AgreeEntity .cs deleted file mode 100644 index 37ab217f..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Exhibition/Entities/AgreeEntity .cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SqlSugar; -using Yi.Framework.Data.Auditing; -using Yi.Framework.Data.Entities; -using Yi.Framework.Ddd.Entities; - -namespace Yi.BBS.Domain.Exhibition.Entities -{ - [SugarTable("Agree")] - public class AgreeEntity : IEntity, ICreationAuditedObject - { - public AgreeEntity() - { - } - - public AgreeEntity(long discussId) - { - DiscussId = discussId; - } - - [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } = SnowflakeHelper.NextId; - public DateTime CreationTime { get; set; } - - /// - /// 主题id - /// - public long DiscussId { get; set; } - - /// - /// 创建者 - /// - public long? CreatorId { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Forum/Event/SeeDiscussEventHandler.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Forum/Event/SeeDiscussEventHandler.cs deleted file mode 100644 index e1e18b47..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Forum/Event/SeeDiscussEventHandler.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Cike.EventBus.EventHandlerAbstracts; -using Yi.BBS.Domain.Forum.Entities; -using Yi.BBS.Domain.Shared.Forum.Etos; -using Yi.Framework.Ddd.Repositories; -using Yi.RBAC.Domain.Shared.Identity.Etos; - -namespace Yi.BBS.Domain.Forum.Event -{ - public class SeeDiscussEventHandler : IDistributedEventHandler - { - private IRepository _repository; - public SeeDiscussEventHandler(IRepository repository) - { - _repository = repository; - } - public async Task HandlerAsync(SeeDiscussEventArgs eventData) - { - var entity= await _repository.GetByIdAsync(eventData.DiscussId); - if (entity is not null) { - entity.SeeNum += 1; - await _repository.UpdateAsync(entity); - } - - } - } -} 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 deleted file mode 100644 index 0bf41efa..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/Yi.BBS.Domain.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net6.0 - enable - enable - True - ./$(AssemblyName)SwaggerDoc.xml - - - - - - - - - - - - Always - - - - diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/YiBBSDomainModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/YiBBSDomainModule.cs deleted file mode 100644 index c9520e98..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/YiBBSDomainModule.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Core.Attributes; -using Yi.Framework.Data; -using Yi.BBS.Domain.Shared; - -namespace Yi.BBS.Domain -{ - [DependsOn( - typeof(YiBBSDomainSharedModule) - )] - public class YiBBSDomainModule : IStartupModule - { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - } - - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/Yi.BBS.Sqlsugar.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/Yi.BBS.Sqlsugar.csproj deleted file mode 100644 index 96d709be..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/Yi.BBS.Sqlsugar.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - - - - diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/YiBBSSqlsugarModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/YiBBSSqlsugarModule.cs deleted file mode 100644 index 82f1798a..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Sqlsugar/YiBBSSqlsugarModule.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using StartupModules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Core.Attributes; -using Yi.Framework.Core.Sqlsugar; -using Yi.BBS.Domain; -using Yi.RBAC.Sqlsugar; -using SqlSugar; - -namespace Yi.BBS.Sqlsugar -{ - [DependsOn(typeof(YiFrameworkCoreSqlsugarModule), - typeof(YiBBSDomainModule), - typeof(YiRBACSqlsugarModule))] - public class YiBBSSqlsugarModule : IStartupModule - { - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - - } - - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - //services.AddTransient(); - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Program.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Program.cs deleted file mode 100644 index 208cd696..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Program.cs +++ /dev/null @@ -1,34 +0,0 @@ -using AspNetCore.Microsoft.AspNetCore.Hosting; -using Yi.Framework.Core.Autofac.Extensions; -using Yi.Framework.Core.Autofac.Modules; -using Yi.Framework.Core.Extensions; -using Yi.BBS.Web; -using Yi.Framework.Core.Module; -using NLog.Extensions.Logging; -using NLog; -using SqlSugar; - -var builder = WebApplication.CreateBuilder(args); -builder.Services.AddLogging(builder => { builder.ClearProviders().AddNLog("nlog.config").SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); }); -Logger? _logger = LogManager.Setup().LoadConfigurationFromAssemblyResource(typeof(Program).Assembly).GetCurrentClassLogger(); -_logger.Info("-----( ¯ □ ¯ )YiFrameowrk框架启动-----"); - -builder.WebHost.UseStartUrlsServer(builder.Configuration); - -builder.UseYiModules(typeof(YiBBSWebModule)); - -//添加autofac模块,需要添加模块 -builder.Host.ConfigureAutoFacContainer(container => -{ - container.RegisterYiModule(AutoFacModuleEnum.PropertiesAutowiredModule, ModuleAssembly.Assemblies); -}); - -var app = builder.Build(); -var db = app.Services.GetService(); -app.UseErrorHandlingServer(); - -app.UseAuthentication(); -app.UseAuthorization(); -app.MapControllers(); - -app.Run(); diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json deleted file mode 100644 index f6eca37f..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Properties/launchSettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "profiles": { - "Yi.BBS.Web": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "http://localhost:19001", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Yi.BBS.Web.csproj b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Yi.BBS.Web.csproj deleted file mode 100644 index cbfa880b..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/Yi.BBS.Web.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - - - - - - Always - - - Always - - - Always - - - Always - - - - - - Always - - - Always - - - Always - - - 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 deleted file mode 100644 index 490917be..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs +++ /dev/null @@ -1,60 +0,0 @@ -using AspNetCore.Microsoft.AspNetCore.Builder; -using StartupModules; -using Yi.Framework.Auth.JwtBearer; -using Yi.Framework.Core; -using Yi.Framework.Core.Attributes; -using Yi.BBS.Application; -using Yi.BBS.Sqlsugar; -using Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection; -using Yi.Framework.Core.Autofac; -using Yi.RBAC.Application; -using Yi.Framework.AspNetCore; -using Yi.Framework.Data.Json; -using Yi.Framework.OperLogManager; -using Yi.Framework.Core.Module; -using Microsoft.Extensions.Options; -using System.Text.Json.Serialization; - -namespace Yi.BBS.Web -{ - [DependsOn( - typeof(YiBBSSqlsugarModule), - typeof(YiFrameworkAspNetCoreModule), - typeof(YiFrameworkCoreAutofacModule), - typeof(YiBBSApplicationModule) - )] - public class YiBBSWebModule : IStartupModule - { - public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context) - { - //添加控制器与动态api - services.AddControllers().AddJsonOptions(opt => { - opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss")); - opt.JsonSerializerOptions.Converters.Add(new LongToStringConverter()); - opt.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()); - }); - - services.AddAutoApiService(opt => - { - //NETServiceTest所在程序集添加进动态api配置 - opt.CreateConventional(ModuleAssembly.Assemblies, option => option.RootPath = string.Empty); - }); - - //添加swagger - services.AddSwaggerServer(); - } - public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) - { - //if (app.Environment.IsDevelopment()) - { - app.UseSwaggerServer(); - } - - app.UseHttpsRedirection(); - - app.UseAuthorization(); - - app.UseRouting(); - } - } -} 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 deleted file mode 100644 index 43792456..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "Microsoft.AspNetCore": "Information" - } - }, - "AllowedHosts": "*", - - //程序启动地址，*代表全部网口 - "StartUrl": "http://*:19001", - - //数据库类型列表 - "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], - - "DbConnOptions": { - "Url": "DataSource=yi-sqlsugar-dev.db", - "DbType": "Sqlite", - "EnabledReadWrite": false, - "EnabledCodeFirst": false, - "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 - ] - }, - - //授权 - "JwtTokenOptions": { - "Audience": "yi", - "Issuer": "localhost:19002", - "Subject": "yiframwork", - "ExpSecond": 259200 - }, - - //开启种子数据 - "EnabledDataSeed": false, - - //阿里云短信 - "SmsAliyunOptions": { - "AccessKeyId": "", - "AccessKeySecret": "", - "SignName": "", - "TemplateCode": "", - "EnableFeature": false - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/ip2region.db b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/ip2region.db deleted file mode 100644 index 0fc60e6c..00000000 Binary files a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/ip2region.db and /dev/null differ diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/key.pem b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/key.pem deleted file mode 100644 index 3314ab6e..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7VJTUt9Us8cKj -MzEfYyjiWA4R4/M2bS1GB4t7NXp98C3SC6dVMvDuictGeurT8jNbvJZHtCSuYEvu -NMoSfm76oqFvAp8Gy0iz5sxjZmSnXyCdPEovGhLa0VzMaQ8s+CLOyS56YyCFGeJZ -qgtzJ6GR3eqoYSW9b9UMvkBpZODSctWSNGj3P7jRFDO5VoTwCQAWbFnOjDfH5Ulg -p2PKSQnSJP3AJLQNFNe7br1XbrhV//eO+t51mIpGSDCUv3E0DDFcWDTH9cXDTTlR -ZVEiR2BwpZOOkE/Z0/BVnhZYL71oZV34bKfWjQIt6V/isSMahdsAASACp4ZTGtwi -VuNd9tybAgMBAAECggEBAKTmjaS6tkK8BlPXClTQ2vpz/N6uxDeS35mXpqasqskV -laAidgg/sWqpjXDbXr93otIMLlWsM+X0CqMDgSXKejLS2jx4GDjI1ZTXg++0AMJ8 -sJ74pWzVDOfmCEQ/7wXs3+cbnXhKriO8Z036q92Qc1+N87SI38nkGa0ABH9CN83H -mQqt4fB7UdHzuIRe/me2PGhIq5ZBzj6h3BpoPGzEP+x3l9YmK8t/1cN0pqI+dQwY -dgfGjackLu/2qH80MCF7IyQaseZUOJyKrCLtSD/Iixv/hzDEUPfOCjFDgTpzf3cw -ta8+oE4wHCo1iI1/4TlPkwmXx4qSXtmw4aQPz7IDQvECgYEA8KNThCO2gsC2I9PQ -DM/8Cw0O983WCDY+oi+7JPiNAJwv5DYBqEZB1QYdj06YD16XlC/HAZMsMku1na2T -N0driwenQQWzoev3g2S7gRDoS/FCJSI3jJ+kjgtaA7Qmzlgk1TxODN+G1H91HW7t -0l7VnL27IWyYo2qRRK3jzxqUiPUCgYEAx0oQs2reBQGMVZnApD1jeq7n4MvNLcPv -t8b/eU9iUv6Y4Mj0Suo/AU8lYZXm8ubbqAlwz2VSVunD2tOplHyMUrtCtObAfVDU -AhCndKaA9gApgfb3xw1IKbuQ1u4IF1FJl3VtumfQn//LiH1B3rXhcdyo3/vIttEk -48RakUKClU8CgYEAzV7W3COOlDDcQd935DdtKBFRAPRPAlspQUnzMi5eSHMD/ISL -DY5IiQHbIH83D4bvXq0X7qQoSBSNP7Dvv3HYuqMhf0DaegrlBuJllFVVq9qPVRnK -xt1Il2HgxOBvbhOT+9in1BzA+YJ99UzC85O0Qz06A+CmtHEy4aZ2kj5hHjECgYEA -mNS4+A8Fkss8Js1RieK2LniBxMgmYml3pfVLKGnzmng7H2+cwPLhPIzIuwytXywh -2bzbsYEfYx3EoEVgMEpPhoarQnYPukrJO4gwE2o5Te6T5mJSZGlQJQj9q4ZB2Dfz -et6INsK0oG8XVGXSpQvQh3RUYekCZQkBBFcpqWpbIEsCgYAnM3DQf3FJoSnXaMhr -VBIovic5l0xFkEHskAjFTevO86Fsz1C2aSeRKSqGFoOQ0tmJzBEs1R6KqnHInicD -TQrKhArgLXX4v3CddjfTRJkFWDbE/CkvKZNOrcf1nhaGCPspRJj2KUkj1Fhl9Cnc -dn/RsYEONbwQSjIfMPkvxF+8HQ== ------END PRIVATE KEY----- \ No newline at end of file diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/nlog.config b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/nlog.config deleted file mode 100644 index d4224b1a..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/nlog.config +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/public.pem b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/public.pem deleted file mode 100644 index 1c9b622d..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/public.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1SU1LfVLPHCozMxH2Mo -4lgOEePzNm0tRgeLezV6ffAt0gunVTLw7onLRnrq0/IzW7yWR7QkrmBL7jTKEn5u -+qKhbwKfBstIs+bMY2Zkp18gnTxKLxoS2tFczGkPLPgizskuemMghRniWaoLcyeh -kd3qqGElvW/VDL5AaWTg0nLVkjRo9z+40RQzuVaE8AkAFmxZzow3x+VJYKdjykkJ -0iT9wCS0DRTXu269V264Vf/3jvredZiKRkgwlL9xNAwxXFg0x/XFw005UWVRIkdg -cKWTjpBP2dPwVZ4WWC+9aGVd+Gyn1o0CLelf4rEjGoXbAAEgAqeGUxrcIlbjXfbc -mwIDAQAB ------END PUBLIC KEY----- \ No newline at end of file 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 deleted file mode 100644 index 32705633..00000000 Binary files a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db and /dev/null differ