diff --git a/Yi.Vue3.x.Vant/.env.development b/Yi.App.Vue3/.env.development similarity index 100% rename from Yi.Vue3.x.Vant/.env.development rename to Yi.App.Vue3/.env.development diff --git a/Yi.Vue3.x.Vant/.env.production b/Yi.App.Vue3/.env.production similarity index 100% rename from Yi.Vue3.x.Vant/.env.production rename to Yi.App.Vue3/.env.production diff --git a/Yi.Vue3.x.Vant/.env.staging b/Yi.App.Vue3/.env.staging similarity index 100% rename from Yi.Vue3.x.Vant/.env.staging rename to Yi.App.Vue3/.env.staging diff --git a/Yi.Vue3.x.Vant/.gitignore b/Yi.App.Vue3/.gitignore similarity index 100% rename from Yi.Vue3.x.Vant/.gitignore rename to Yi.App.Vue3/.gitignore diff --git a/Yi.Vue3.x.Vant/.vscode/extensions.json b/Yi.App.Vue3/.vscode/extensions.json similarity index 100% rename from Yi.Vue3.x.Vant/.vscode/extensions.json rename to Yi.App.Vue3/.vscode/extensions.json diff --git a/Yi.Vue3.x.Vant/README.md b/Yi.App.Vue3/README.md similarity index 100% rename from Yi.Vue3.x.Vant/README.md rename to Yi.App.Vue3/README.md diff --git a/Yi.Vue3.x.Vant/components.d.ts b/Yi.App.Vue3/components.d.ts similarity index 63% rename from Yi.Vue3.x.Vant/components.d.ts rename to Yi.App.Vue3/components.d.ts index b2477968..d4bc2f34 100644 --- a/Yi.Vue3.x.Vant/components.d.ts +++ b/Yi.App.Vue3/components.d.ts @@ -16,26 +16,12 @@ declare module '@vue/runtime-core' { RouterView: typeof import('vue-router')['RouterView'] VanActionSheet: typeof import('vant/es')['ActionSheet'] VanButton: typeof import('vant/es')['Button'] - VanCell: typeof import('vant/es')['Cell'] - VanCellGroup: typeof import('vant/es')['CellGroup'] VanCol: typeof import('vant/es')['Col'] VanField: typeof import('vant/es')['Field'] - VanGrid: typeof import('vant/es')['Grid'] - VanGridItem: typeof import('vant/es')['GridItem'] VanIcon: typeof import('vant/es')['Icon'] - VanImage: typeof import('vant/es')['Image'] - VanList: typeof import('vant/es')['List'] - VanLoading: typeof import('vant/es')['Loading'] VanNavBar: typeof import('vant/es')['NavBar'] - VanPopup: typeof import('vant/es')['Popup'] - VanPullRefresh: typeof import('vant/es')['PullRefresh'] VanRow: typeof import('vant/es')['Row'] - VanSticky: typeof import('vant/es')['Sticky'] - VanSwipe: typeof import('vant/es')['Swipe'] - VanSwipeItem: typeof import('vant/es')['SwipeItem'] - VanTab: typeof import('vant/es')['Tab'] VanTabbar: typeof import('vant/es')['Tabbar'] VanTabbarItem: typeof import('vant/es')['TabbarItem'] - VanTabs: typeof import('vant/es')['Tabs'] } } diff --git a/Yi.Vue3.x.Vant/index.html b/Yi.App.Vue3/index.html similarity index 100% rename from Yi.Vue3.x.Vant/index.html rename to Yi.App.Vue3/index.html diff --git a/Yi.Vue3.x.Vant/package-lock.json b/Yi.App.Vue3/package-lock.json similarity index 100% rename from Yi.Vue3.x.Vant/package-lock.json rename to Yi.App.Vue3/package-lock.json diff --git a/Yi.Vue3.x.Vant/package.json b/Yi.App.Vue3/package.json similarity index 100% rename from Yi.Vue3.x.Vant/package.json rename to Yi.App.Vue3/package.json diff --git a/Yi.Vue3.x.Vant/public/vite.svg b/Yi.App.Vue3/public/vite.svg similarity index 100% rename from Yi.Vue3.x.Vant/public/vite.svg rename to Yi.App.Vue3/public/vite.svg diff --git a/Yi.Vue3.x.Vant/src/App.vue b/Yi.App.Vue3/src/App.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/App.vue rename to Yi.App.Vue3/src/App.vue diff --git a/Yi.Vue3.x.Vant/src/api/agreeApi.ts b/Yi.App.Vue3/src/api/agreeApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/agreeApi.ts rename to Yi.App.Vue3/src/api/agreeApi.ts diff --git a/Yi.Vue3.x.Vant/src/api/articleApi.ts b/Yi.App.Vue3/src/api/articleApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/articleApi.ts rename to Yi.App.Vue3/src/api/articleApi.ts diff --git a/Yi.Vue3.x.Vant/src/api/commentApi.ts b/Yi.App.Vue3/src/api/commentApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/commentApi.ts rename to Yi.App.Vue3/src/api/commentApi.ts diff --git a/Yi.Vue3.x.Vant/src/api/fileApi.ts b/Yi.App.Vue3/src/api/fileApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/fileApi.ts rename to Yi.App.Vue3/src/api/fileApi.ts diff --git a/Yi.Vue3.x.Vant/src/api/login.ts b/Yi.App.Vue3/src/api/login.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/login.ts rename to Yi.App.Vue3/src/api/login.ts diff --git a/Yi.Vue3.x.Vant/src/api/skuApi.ts b/Yi.App.Vue3/src/api/skuApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/skuApi.ts rename to Yi.App.Vue3/src/api/skuApi.ts diff --git a/Yi.Vue3.x.Vant/src/api/spuApi.ts b/Yi.App.Vue3/src/api/spuApi.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/api/spuApi.ts rename to Yi.App.Vue3/src/api/spuApi.ts diff --git a/Yi.Vue3.x.Vant/src/assets/vue.svg b/Yi.App.Vue3/src/assets/vue.svg similarity index 100% rename from Yi.Vue3.x.Vant/src/assets/vue.svg rename to Yi.App.Vue3/src/assets/vue.svg diff --git a/Yi.Vue3.x.Vant/src/components/AppCard.vue b/Yi.App.Vue3/src/components/AppCard.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/components/AppCard.vue rename to Yi.App.Vue3/src/components/AppCard.vue diff --git a/Yi.Vue3.x.Vant/src/components/AppCreateTime.vue b/Yi.App.Vue3/src/components/AppCreateTime.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/components/AppCreateTime.vue rename to Yi.App.Vue3/src/components/AppCreateTime.vue diff --git a/Yi.Vue3.x.Vant/src/components/AppGrid.vue b/Yi.App.Vue3/src/components/AppGrid.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/components/AppGrid.vue rename to Yi.App.Vue3/src/components/AppGrid.vue diff --git a/Yi.Vue3.x.Vant/src/components/AppUserIcon.vue b/Yi.App.Vue3/src/components/AppUserIcon.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/components/AppUserIcon.vue rename to Yi.App.Vue3/src/components/AppUserIcon.vue diff --git a/Yi.Vue3.x.Vant/src/components/HelloWorld.vue b/Yi.App.Vue3/src/components/HelloWorld.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/components/HelloWorld.vue rename to Yi.App.Vue3/src/components/HelloWorld.vue diff --git a/Yi.Vue3.x.Vant/src/layout/bottom/index.vue b/Yi.App.Vue3/src/layout/bottom/index.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/layout/bottom/index.vue rename to Yi.App.Vue3/src/layout/bottom/index.vue diff --git a/Yi.Vue3.x.Vant/src/layout/head/index.vue b/Yi.App.Vue3/src/layout/head/index.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/layout/head/index.vue rename to Yi.App.Vue3/src/layout/head/index.vue diff --git a/Yi.Vue3.x.Vant/src/layout/index.vue b/Yi.App.Vue3/src/layout/index.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/layout/index.vue rename to Yi.App.Vue3/src/layout/index.vue diff --git a/Yi.Vue3.x.Vant/src/layout/main/index.vue b/Yi.App.Vue3/src/layout/main/index.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/layout/main/index.vue rename to Yi.App.Vue3/src/layout/main/index.vue diff --git a/Yi.Vue3.x.Vant/src/layout/tab/index.vue b/Yi.App.Vue3/src/layout/tab/index.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/layout/tab/index.vue rename to Yi.App.Vue3/src/layout/tab/index.vue diff --git a/Yi.Vue3.x.Vant/src/main.ts b/Yi.App.Vue3/src/main.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/main.ts rename to Yi.App.Vue3/src/main.ts diff --git a/Yi.Vue3.x.Vant/src/permission.ts b/Yi.App.Vue3/src/permission.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/permission.ts rename to Yi.App.Vue3/src/permission.ts diff --git a/Yi.Vue3.x.Vant/src/router/index.ts b/Yi.App.Vue3/src/router/index.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/router/index.ts rename to Yi.App.Vue3/src/router/index.ts diff --git a/Yi.Vue3.x.Vant/src/store/index.ts b/Yi.App.Vue3/src/store/index.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/store/index.ts rename to Yi.App.Vue3/src/store/index.ts diff --git a/Yi.Vue3.x.Vant/src/store/modules/user.ts b/Yi.App.Vue3/src/store/modules/user.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/store/modules/user.ts rename to Yi.App.Vue3/src/store/modules/user.ts diff --git a/Yi.Vue3.x.Vant/src/style.css b/Yi.App.Vue3/src/style.css similarity index 100% rename from Yi.Vue3.x.Vant/src/style.css rename to Yi.App.Vue3/src/style.css diff --git a/Yi.Vue3.x.Vant/src/type/class/AppGridData.ts b/Yi.App.Vue3/src/type/class/AppGridData.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/type/class/AppGridData.ts rename to Yi.App.Vue3/src/type/class/AppGridData.ts diff --git a/Yi.Vue3.x.Vant/src/type/interface/ArticleEntity.ts b/Yi.App.Vue3/src/type/interface/ArticleEntity.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/type/interface/ArticleEntity.ts rename to Yi.App.Vue3/src/type/interface/ArticleEntity.ts diff --git a/Yi.Vue3.x.Vant/src/utils/auth.ts b/Yi.App.Vue3/src/utils/auth.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/utils/auth.ts rename to Yi.App.Vue3/src/utils/auth.ts diff --git a/Yi.Vue3.x.Vant/src/utils/myaxios.ts b/Yi.App.Vue3/src/utils/myaxios.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/utils/myaxios.ts rename to Yi.App.Vue3/src/utils/myaxios.ts diff --git a/Yi.Vue3.x.Vant/src/view/login.vue b/Yi.App.Vue3/src/view/login.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/login.vue rename to Yi.App.Vue3/src/view/login.vue diff --git a/Yi.Vue3.x.Vant/src/view/main/follow.vue b/Yi.App.Vue3/src/view/main/follow.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/main/follow.vue rename to Yi.App.Vue3/src/view/main/follow.vue diff --git a/Yi.Vue3.x.Vant/src/view/main/recommend.vue b/Yi.App.Vue3/src/view/main/recommend.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/main/recommend.vue rename to Yi.App.Vue3/src/view/main/recommend.vue diff --git a/Yi.Vue3.x.Vant/src/view/main/square.vue b/Yi.App.Vue3/src/view/main/square.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/main/square.vue rename to Yi.App.Vue3/src/view/main/square.vue diff --git a/Yi.Vue3.x.Vant/src/view/my.vue b/Yi.App.Vue3/src/view/my.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/my.vue rename to Yi.App.Vue3/src/view/my.vue diff --git a/Yi.Vue3.x.Vant/src/view/send/imageText.vue b/Yi.App.Vue3/src/view/send/imageText.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/send/imageText.vue rename to Yi.App.Vue3/src/view/send/imageText.vue diff --git a/Yi.Vue3.x.Vant/src/view/shop/shopDetails.vue b/Yi.App.Vue3/src/view/shop/shopDetails.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/shop/shopDetails.vue rename to Yi.App.Vue3/src/view/shop/shopDetails.vue diff --git a/Yi.Vue3.x.Vant/src/view/shop/shopIndex.vue b/Yi.App.Vue3/src/view/shop/shopIndex.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/shop/shopIndex.vue rename to Yi.App.Vue3/src/view/shop/shopIndex.vue diff --git a/Yi.Vue3.x.Vant/src/view/shop/shopSearch.vue b/Yi.App.Vue3/src/view/shop/shopSearch.vue similarity index 100% rename from Yi.Vue3.x.Vant/src/view/shop/shopSearch.vue rename to Yi.App.Vue3/src/view/shop/shopSearch.vue diff --git a/Yi.Vue3.x.Vant/src/vite-env.d.ts b/Yi.App.Vue3/src/vite-env.d.ts similarity index 100% rename from Yi.Vue3.x.Vant/src/vite-env.d.ts rename to Yi.App.Vue3/src/vite-env.d.ts diff --git a/Yi.Vue3.x.Vant/tsconfig.json b/Yi.App.Vue3/tsconfig.json similarity index 100% rename from Yi.Vue3.x.Vant/tsconfig.json rename to Yi.App.Vue3/tsconfig.json diff --git a/Yi.Vue3.x.Vant/tsconfig.node.json b/Yi.App.Vue3/tsconfig.node.json similarity index 100% rename from Yi.Vue3.x.Vant/tsconfig.node.json rename to Yi.App.Vue3/tsconfig.node.json diff --git a/Yi.Vue3.x.Vant/vite.config.ts b/Yi.App.Vue3/vite.config.ts similarity index 100% rename from Yi.Vue3.x.Vant/vite.config.ts rename to Yi.App.Vue3/vite.config.ts diff --git a/Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs b/Yi.App.Vue3/vite.config.ts.timestamp-1665906237992.mjs similarity index 100% rename from Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs rename to Yi.App.Vue3/vite.config.ts.timestamp-1665906237992.mjs diff --git a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml index 2c394b0c..5964d07e 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml +++ b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml @@ -554,6 +554,17 @@ + + + WebFirst + + + + + 测试 + + + Web To Code diff --git a/Yi.Furion.Net6/Yi.Furion.Application/App/Services/ITrendsService.cs b/Yi.Furion.Net6/Yi.Furion.Application/App/Services/ITrendsService.cs new file mode 100644 index 00000000..b3634c97 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Application/App/Services/ITrendsService.cs @@ -0,0 +1,13 @@ +using Yi.Framework.Infrastructure.Ddd.Services.Abstract; +using Yi.Furion.Core.App.Dtos.Trends; + +namespace Yi.Furion.Application.App.Services +{ + /// + /// Trends服务抽象 + /// + public interface ITrendsService : ICrudAppService + { + + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Application/App/Services/Impl/TrendsService.cs b/Yi.Furion.Net6/Yi.Furion.Application/App/Services/Impl/TrendsService.cs new file mode 100644 index 00000000..ee78f699 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Application/App/Services/Impl/TrendsService.cs @@ -0,0 +1,34 @@ +using SqlSugar; +using Yi.Framework.Infrastructure.Ddd.Dtos; +using Yi.Framework.Infrastructure.Ddd.Services; +using Yi.Furion.Application.App.Services; +using Yi.Furion.Core.App.Dtos.Trends; +using Yi.Furion.Core.App.Entities; + +namespace Yi.Furion.Application.App.Services.Impl +{ + /// + /// Trends服务实现 + /// + [ApiDescriptionSettings("App")] + public class TrendsService : CrudAppService, + ITrendsService, IDynamicApiController, ITransient + { + /// + /// 多查 + /// + /// + /// + public override async Task> GetListAsync(TrendsGetListInput input) + { + var entity = await MapToEntityAsync(input); + + RefAsync total = 0; + + var entities = await _DbQueryable + .WhereIF(input.StartTime is not null && input.EndTime is not null, x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime) + .ToPageListAsync(input.PageNum, input.PageSize, total); + return new PagedResultDto(total, await MapToGetListOutputDtosAsync(entities)); + } + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs index 5d296305..18184f25 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs +++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs @@ -12,16 +12,16 @@ using Microsoft.Extensions.Options; using Yi.Framework.Infrastructure.Extensions; using Yi.Framework.Infrastructure.Helper; -namespace Yi.Furion.Application.Rbac.Services +namespace Yi.Furion.Application.Rbac.Services.Impl { [ApiDescriptionSettings("RBAC")] - public class MonitorServerService: IMonitorServerService,IDynamicApiController, ITransient + public class MonitorServerService : IMonitorServerService, IDynamicApiController, ITransient { private IWebHostEnvironment _hostEnvironment; private IHttpContextAccessor _httpContextAccessor; public MonitorServerService(IWebHostEnvironment hostEnvironment, IHttpContextAccessor httpContextAccessor) { - this._hostEnvironment = hostEnvironment; + _hostEnvironment = hostEnvironment; _httpContextAccessor = httpContextAccessor; } [HttpGet("info")] diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml b/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml index 0444753b..ffba5655 100644 --- a/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml +++ b/Yi.Furion.Net6/Yi.Furion.Application/Yi.Furion.Application.xml @@ -4,6 +4,23 @@ Yi.Furion.Application + + + Trends服务实现 + + + + + 多查 + + + + + + + Trends服务抽象 + + 论坛模块的领域服务 diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsCreateInput.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsCreateInput.cs new file mode 100644 index 00000000..d96891af --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsCreateInput.cs @@ -0,0 +1,14 @@ +namespace Yi.Furion.Core.App.Dtos.Trends +{ + /// + /// Trends输入创建对象 + /// + public class TrendsCreateInput + { + public string Title { get; set; } + public string Content { get; set; } + public string? Remark { get; set; } + public List? Images { get; set; } + + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListInput.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListInput.cs new file mode 100644 index 00000000..47f9db3c --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListInput.cs @@ -0,0 +1,12 @@ +using Yi.Framework.Infrastructure.Ddd.Dtos; + +namespace Yi.Furion.Core.App.Dtos.Trends +{ + /// + /// 查询参数 + /// + public class TrendsGetListInput : PagedAllResultRequestDto + { + + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListOutputDto.cs new file mode 100644 index 00000000..c0a5567b --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetListOutputDto.cs @@ -0,0 +1,20 @@ +using Yi.Framework.Infrastructure.Ddd.Dtos.Abstract; + +namespace Yi.Furion.Core.App.Dtos.Trends +{ + public class TrendsGetListOutputDto : IEntityDto + { + public long Id { get; set; } + public string Title { get; set; } + public string Content { get; set; } + public long UserId { get; set; } + public bool IsDeleted { get; set; } + public string? Remark { get; set; } + public List? Images { get; set; } + public DateTime CreationTime { get; set; } + public long? CreatorId { get; set; } + public long? LastModifierId { get; set; } + public DateTime? LastModificationTime { get; set; } + + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetOutputDto.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetOutputDto.cs new file mode 100644 index 00000000..79e4e2b0 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsGetOutputDto.cs @@ -0,0 +1,21 @@ +using Yi.Framework.Infrastructure.Ddd.Dtos.Abstract; + +namespace Yi.Furion.Core.App.Dtos.Trends +{ + public class TrendsGetOutputDto : IEntityDto + { + public long Id { get; set; } + public string Title { get; set; } + public string Content { get; set; } + public long UserId { get; set; } + public bool IsDeleted { get; set; } + public string? Remark { get; set; } + public List? Images { get; set; } + public DateTime CreationTime { get; set; } + public long? CreatorId { get; set; } + public long? LastModifierId { get; set; } + public DateTime? LastModificationTime { get; set; } + + + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsUpdateInput.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsUpdateInput.cs new file mode 100644 index 00000000..ff42e11c --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Dtos/Trends/TrendsUpdateInput.cs @@ -0,0 +1,10 @@ +namespace Yi.Furion.Core.App.Dtos.Trends +{ + public class TrendsUpdateInputVo + { + public string? Title { get; set; } + public string? Content { get; set; } + public string? Remark { get; set; } + public List? Images { get; set; } + } +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/App/Entities/TrendsEntity.cs b/Yi.Furion.Net6/Yi.Furion.Core/App/Entities/TrendsEntity.cs new file mode 100644 index 00000000..623a9c2b --- /dev/null +++ b/Yi.Furion.Net6/Yi.Furion.Core/App/Entities/TrendsEntity.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using Yi.Framework.Infrastructure.Data.Auditing; +using Yi.Framework.Infrastructure.Data.Entities; +using Yi.Framework.Infrastructure.Ddd.Entities; +using Yi.Framework.Infrastructure.Helper; + +namespace Yi.Furion.Core.App.Entities +{ + /// + /// 动态 + /// + [SugarTable("Trends")] + public class TrendsEntity : AuditedObject, IEntity, ISoftDelete + { + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + public string Title { get; set; } + + + [SugarColumn(Length = 99999)] + public string Content { get; set; } + + public bool IsDeleted { get; set; } + + public string? Remark { get; set; } + + [SugarColumn(IsJson = true, Length = 99999)] + public List Images { get; set; } + } + + +} diff --git a/Yi.Furion.Net6/Yi.Furion.Core/Yi.Furion.Core.xml b/Yi.Furion.Net6/Yi.Furion.Core/Yi.Furion.Core.xml index 7c05e273..c9d86f36 100644 --- a/Yi.Furion.Net6/Yi.Furion.Core/Yi.Furion.Core.xml +++ b/Yi.Furion.Net6/Yi.Furion.Core/Yi.Furion.Core.xml @@ -4,6 +4,21 @@ Yi.Furion.Core + + + Trends输入创建对象 + + + + + 查询参数 + + + + + 动态 + + 常量定义 diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs index 95a4913a..66ea8066 100644 --- a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs +++ b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs @@ -1,4 +1,5 @@ using System; +using System.Text; using Furion; using Furion.Schedule; using Furion.TimeCrontab; @@ -38,7 +39,7 @@ public class Startup : AppStartup { // 注册作业，并配置作业触发器 //options.AddJob(Triggers.Period(10000)); - //options.AddJob(Triggers.Period(10000)); + //options.AddJob(Triggers.Period(10000)); options.AddJob(Triggers.Cron("0 0 0,12 ? * ?", CronStringFormat.WithSeconds)); // 表示每天凌晨与12点 }); services.AddFileLogging("log/application-{0:yyyy}-{0:MM}-{0:dd}.log", options => @@ -72,7 +73,19 @@ public class Startup : AppStartup app.UseAuthorization(); app.UseInject(string.Empty); + } + private string ConverStr(string utf8mb3String) + { + // 将 utf8mb3String 转换为 UTF-8mb3 编码的字节数组 + byte[] utf8mb3Bytes = Encoding.UTF8.GetBytes(utf8mb3String); + + // 将 UTF-8mb3 编码的字节数组转换为 UTF-8mb4 编码的字节数组 + byte[] utf8mb4Bytes = Encoding.Convert(Encoding.UTF8, new UTF8Encoding(true), utf8mb3Bytes); + + // 将 UTF-8mb4 编码的字节数组转换为字符串 + string utf8mb4String = Encoding.UTF8.GetString(utf8mb4Bytes); + return utf8mb4String; } } diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db b/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db deleted file mode 100644 index 8f745095..00000000 Binary files a/Yi.Furion.Net6/Yi.Furion.Web.Entry/yi-sqlsugar-dev.db and /dev/null differ