From 009c4dc8ae8c251b889a01d0b03ea46d3f1e01f2 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 21 Jun 2022 22:24:50 +0800 Subject: [PATCH 001/108] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSQLSERVER=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=20=E8=87=AA=E5=AE=9A=E4=B9=89XML=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Apis/CodeTableApp/CodeTableController_CreateFile.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SoEasyPlatform/Apis/CodeTableApp/CodeTableController_CreateFile.cs b/SoEasyPlatform/Apis/CodeTableApp/CodeTableController_CreateFile.cs index 896999eb..6b6e9c31 100644 --- a/SoEasyPlatform/Apis/CodeTableApp/CodeTableController_CreateFile.cs +++ b/SoEasyPlatform/Apis/CodeTableApp/CodeTableController_CreateFile.cs @@ -160,6 +160,7 @@ private DbTypeInfo GetTypeInfoByDatabaseType(DbTypeInfo[] dbType, DbType databas break; case DbType.SqlServer: mstypes= SqlSugar.SqlServerDbBind.MappingTypesConst.Select(it => it.Key.ToLower()).ToList(); + mstypes.Add("xml"); break; case DbType.Sqlite: mstypes = SqlSugar.SqliteDbBind.MappingTypesConst.Select(it => it.Key.ToLower()).ToList(); From bc29e1f2246cffc304fd664a2971354cb2a1ad7e Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 13:23:35 +0800 Subject: [PATCH 002/108] - --- SoEasyPlatform/SoEasyPlatform.csproj | 6 +++ .../Furion_SqlSugar_Api/FurionApi.sln | 43 ++++++++++++++++++ .../FurionApi.Application.csproj | 29 ++++++++++++ .../FurionApi.Application.xml | 19 ++++++++ .../FurionApi.Application/GlobalUsings.cs | 14 ++++++ .../System/Dtos/Mapper.cs | 9 ++++ .../System/Services/ISystemService.cs | 7 +++ .../System/Services/SystemService.cs | 10 +++++ .../System/SystemAppService.cs | 23 ++++++++++ .../applicationsettings.json | 30 +++++++++++++ .../FurionApi/FurionApi.Core/DbContext.cs | 23 ++++++++++ .../FurionApi.Core/FurionApi.Core.csproj | 20 +++++++++ .../FurionApi.Core/FurionApi.Core.xml | 18 ++++++++ .../FurionApi.Web.Core.csproj | 17 +++++++ .../FurionApi.Web.Core/FurionApi.Web.Core.xml | 8 ++++ .../FurionApi.Web.Core/Handlers/JwtHandler.cs | 17 +++++++ .../FurionApi/FurionApi.Web.Core/Startup.cs | 45 +++++++++++++++++++ .../FurionApi.Web.Entry.csproj | 28 ++++++++++++ .../FurionApi/FurionApi.Web.Entry/Program.cs | 1 + .../appsettings.Development.json | 9 ++++ .../FurionApi.Web.Entry/appsettings.json | 18 ++++++++ .../FurionApi/FurionApi.sln | 43 ++++++++++++++++++ 22 files changed, 437 insertions(+) create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi.sln create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.csproj create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.xml create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/GlobalUsings.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Dtos/Mapper.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/ISystemService.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/SystemService.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/SystemAppService.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/applicationsettings.json create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/DbContext.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.csproj create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.xml create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.csproj create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.xml create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Handlers/JwtHandler.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Startup.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/Program.cs create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.Development.json create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.json create mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.sln diff --git a/SoEasyPlatform/SoEasyPlatform.csproj b/SoEasyPlatform/SoEasyPlatform.csproj index 6c42212e..c1229e9a 100644 --- a/SoEasyPlatform/SoEasyPlatform.csproj +++ b/SoEasyPlatform/SoEasyPlatform.csproj @@ -10,21 +10,27 @@ + + + + + + Always diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi.sln b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi.sln new file mode 100644 index 00000000..a7911c94 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32414.318 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurionApi.Application", "FurionApi\FurionApi.Application\FurionApi.Application.csproj", "{A9F8667D-7684-40C0-82F7-AEF6884F2521}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurionApi.Core", "FurionApi\FurionApi.Core\FurionApi.Core.csproj", "{B574A410-A4D8-4544-9927-6AD4536674C9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurionApi.Web.Core", "FurionApi\FurionApi.Web.Core\FurionApi.Web.Core.csproj", "{23F60BED-DCA5-4280-9C80-B2A51EA8B652}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurionApi.Web.Entry", "FurionApi\FurionApi.Web.Entry\FurionApi.Web.Entry.csproj", "{0B2EEE95-334F-4449-9384-78B7EF8F279F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A9F8667D-7684-40C0-82F7-AEF6884F2521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9F8667D-7684-40C0-82F7-AEF6884F2521}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9F8667D-7684-40C0-82F7-AEF6884F2521}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9F8667D-7684-40C0-82F7-AEF6884F2521}.Release|Any CPU.Build.0 = Release|Any CPU + {B574A410-A4D8-4544-9927-6AD4536674C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B574A410-A4D8-4544-9927-6AD4536674C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B574A410-A4D8-4544-9927-6AD4536674C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B574A410-A4D8-4544-9927-6AD4536674C9}.Release|Any CPU.Build.0 = Release|Any CPU + {23F60BED-DCA5-4280-9C80-B2A51EA8B652}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23F60BED-DCA5-4280-9C80-B2A51EA8B652}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23F60BED-DCA5-4280-9C80-B2A51EA8B652}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23F60BED-DCA5-4280-9C80-B2A51EA8B652}.Release|Any CPU.Build.0 = Release|Any CPU + {0B2EEE95-334F-4449-9384-78B7EF8F279F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B2EEE95-334F-4449-9384-78B7EF8F279F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B2EEE95-334F-4449-9384-78B7EF8F279F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B2EEE95-334F-4449-9384-78B7EF8F279F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {58DA8E4E-C5E8-4C81-9B92-1A042F330C88} + EndGlobalSection +EndGlobal diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.csproj b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.csproj new file mode 100644 index 00000000..f84312c6 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.csproj @@ -0,0 +1,29 @@ + + + + net6.0 + 1701;1702;1591 + FurionApi.Application.xml + enable + + + + + + + + + + PreserveNewest + + + + + + + + + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.xml b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.xml new file mode 100644 index 00000000..69a04870 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/FurionApi.Application.xml @@ -0,0 +1,19 @@ + + + + FurionApi.Application + + + + + 系统服务接口 + + + + + 获取系统描述 + + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/GlobalUsings.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/GlobalUsings.cs new file mode 100644 index 00000000..f7d2c04d --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/GlobalUsings.cs @@ -0,0 +1,14 @@ +global using Furion; +global using Furion.DataEncryption; +global using Furion.DataValidation; +global using Furion.DependencyInjection; +global using Furion.DynamicApiController; +global using Furion.Extensions; +global using Furion.FriendlyException; +global using Mapster; +global using Microsoft.AspNetCore.Authorization; +global using Microsoft.AspNetCore.Http; +global using Microsoft.AspNetCore.Mvc; +global using Microsoft.CodeAnalysis; +global using SqlSugar; +global using System.ComponentModel.DataAnnotations; diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Dtos/Mapper.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Dtos/Mapper.cs new file mode 100644 index 00000000..00c8d17c --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Dtos/Mapper.cs @@ -0,0 +1,9 @@ +namespace FurionApi.Application +{ + public class Mapper : IRegister + { + public void Register(TypeAdapterConfig config) + { + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/ISystemService.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/ISystemService.cs new file mode 100644 index 00000000..e743daef --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/ISystemService.cs @@ -0,0 +1,7 @@ +namespace FurionApi.Application +{ + public interface ISystemService + { + string GetDescription(); + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/SystemService.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/SystemService.cs new file mode 100644 index 00000000..52d4a742 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/Services/SystemService.cs @@ -0,0 +1,10 @@ +namespace FurionApi.Application +{ + public class SystemService : ISystemService, ITransient + { + public string GetDescription() + { + return "让 .NET 开发更简单，更通用，更流行。"; + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/SystemAppService.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/SystemAppService.cs new file mode 100644 index 00000000..ed7ad458 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/System/SystemAppService.cs @@ -0,0 +1,23 @@ +namespace FurionApi.Application +{ + /// + /// 系统服务接口 + /// + public class SystemAppService : IDynamicApiController + { + private readonly ISystemService _systemService; + public SystemAppService(ISystemService systemService) + { + _systemService = systemService; + } + + /// + /// 获取系统描述 + /// + /// + public string GetDescription() + { + return _systemService.GetDescription(); + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/applicationsettings.json b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/applicationsettings.json new file mode 100644 index 00000000..ed031952 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Application/applicationsettings.json @@ -0,0 +1,30 @@ +{ + "SpecificationDocumentSettings": { + "DocumentTitle": "Furion | 规范化接口", + "GroupOpenApiInfos": [ + { + "Group": "Default", + "Title": "规范化接口演示", + "Description": "让 .NET 开发更简单，更通用，更流行。", + "Version": "1.0.0", + "TermsOfService": "https://furion.icu", + "Contact": { + "Name": "百小僧", + "Url": "https://gitee.com/monksoul", + "Email": "monksoul@outlook.com" + }, + "License": { + "Name": "Apache-2.0", + "Url": "https://gitee.com/dotnetchina/Furion/blob/rc1/LICENSE" + } + } + ] + }, + "CorsAccessorSettings": { + "WithExposedHeaders": [ + "access-token", + "x-access-token", + "environment" + ] + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/DbContext.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/DbContext.cs new file mode 100644 index 00000000..b7c8ece9 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/DbContext.cs @@ -0,0 +1,23 @@ +using Furion; +using SqlSugar; +using System.Collections.Generic; + +namespace FurionApi.Core +{ + /// + /// 数据库上下文对象 + /// + public static class DbContext + { + /// + /// SqlSugar 数据库实例 + /// + public static readonly SqlSugarScope Instance = new( + // 读取 appsettings.json 中的 ConnectionConfigs 配置节点 + App.GetConfig>("ConnectionConfigs") + , db => + { + // 这里配置全局事件，比如拦截执行 SQL + }); + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.csproj b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.csproj new file mode 100644 index 00000000..01800ee4 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + 1701;1702;1591 + FurionApi.Core.xml + + + + + + + + + + + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.xml b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.xml new file mode 100644 index 00000000..eaf1659f --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Core/FurionApi.Core.xml @@ -0,0 +1,18 @@ + + + + FurionApi.Core + + + + + 数据库上下文对象 + + + + + SqlSugar 数据库实例 + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.csproj b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.csproj new file mode 100644 index 00000000..b8080fad --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + 1701;1702;1591 + FurionApi.Web.Core.xml + + + + + + + + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.xml b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.xml new file mode 100644 index 00000000..d1688cc2 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/FurionApi.Web.Core.xml @@ -0,0 +1,8 @@ + + + + FurionApi.Web.Core + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Handlers/JwtHandler.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Handlers/JwtHandler.cs new file mode 100644 index 00000000..1b831ac3 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Handlers/JwtHandler.cs @@ -0,0 +1,17 @@ +using Furion.Authorization; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using System.Threading.Tasks; + +namespace FurionApi.Web.Core +{ + public class JwtHandler : AppAuthorizeHandler + { + public override Task PipelineAsync(AuthorizationHandlerContext context, DefaultHttpContext httpContext) + { + // 这里写您的授权判断逻辑，授权通过返回 true，否则返回 false + + return Task.FromResult(true); + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Startup.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Startup.cs new file mode 100644 index 00000000..fc16d276 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Core/Startup.cs @@ -0,0 +1,45 @@ +using Furion; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace FurionApi.Web.Core +{ + public class Startup : AppStartup + { + public void ConfigureServices(IServiceCollection services) + { + services.AddJwt(); + + services.AddCorsAccessor(); + + services.AddControllers() + .AddInjectWithUnifyResult(); + } + + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseHttpsRedirection(); + + app.UseRouting(); + + app.UseCorsAccessor(); + + app.UseAuthentication(); + app.UseAuthorization(); + + app.UseInject(string.Empty); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj new file mode 100644 index 00000000..aeeced91 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj @@ -0,0 +1,28 @@ + + + + net6.0 + enable + en-US + + + + + + + + + + + + + + + + + + + + + + diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/Program.cs b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/Program.cs new file mode 100644 index 00000000..3fe06287 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/Program.cs @@ -0,0 +1 @@ +Serve.Run(RunOptions.Default); \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.Development.json b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.Development.json new file mode 100644 index 00000000..45fe774a --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.json b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.json new file mode 100644 index 00000000..09c090e3 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.Web.Entry/appsettings.json @@ -0,0 +1,18 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.EntityFrameworkCore": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionConfigs": [ + { + "ConnectionString": "Data Source=./Furion.db", + "DbType": "Sqlite", + "IsAutoCloseConnection": true + } + ] +} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.sln b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.sln new file mode 100644 index 00000000..8f842d35 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi/FurionApi.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32519.111 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurionApi.Application", "FurionApi.Application\FurionApi.Application.csproj", "{AB699EE9-43A8-46F2-A855-04A26DE63372}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurionApi.Web.Core", "FurionApi.Web.Core\FurionApi.Web.Core.csproj", "{9D14BB78-DA2A-4040-B9DB-5A515B599181}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurionApi.Core", "FurionApi.Core\FurionApi.Core.csproj", "{4FB30091-15C7-4FD9-AB7D-266814F360F5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurionApi.Web.Entry", "FurionApi.Web.Entry\FurionApi.Web.Entry.csproj", "{C8D99F52-EDC7-411F-8300-6DB14BF59E8C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AB699EE9-43A8-46F2-A855-04A26DE63372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB699EE9-43A8-46F2-A855-04A26DE63372}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB699EE9-43A8-46F2-A855-04A26DE63372}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB699EE9-43A8-46F2-A855-04A26DE63372}.Release|Any CPU.Build.0 = Release|Any CPU + {9D14BB78-DA2A-4040-B9DB-5A515B599181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D14BB78-DA2A-4040-B9DB-5A515B599181}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D14BB78-DA2A-4040-B9DB-5A515B599181}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D14BB78-DA2A-4040-B9DB-5A515B599181}.Release|Any CPU.Build.0 = Release|Any CPU + {4FB30091-15C7-4FD9-AB7D-266814F360F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FB30091-15C7-4FD9-AB7D-266814F360F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FB30091-15C7-4FD9-AB7D-266814F360F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FB30091-15C7-4FD9-AB7D-266814F360F5}.Release|Any CPU.Build.0 = Release|Any CPU + {C8D99F52-EDC7-411F-8300-6DB14BF59E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8D99F52-EDC7-411F-8300-6DB14BF59E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8D99F52-EDC7-411F-8300-6DB14BF59E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8D99F52-EDC7-411F-8300-6DB14BF59E8C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B2073C2C-0FD3-452B-8047-8134D68E12CE} + EndGlobalSection +EndGlobal From e7dadaabcf8885441a8af1128fbdff374f6246de Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 13:39:37 +0800 Subject: [PATCH 003/108] - --- SoEasyPlatform/Code/AppStart/InitTable.cs | 4 +- SoEasyPlatform/InitProjects.cs | 16 +++++++ SoEasyPlatform/database/sqlite.db | Bin 0 -> 106496 bytes .../FurionApi.Application.csproj | 0 .../FurionApi.Application.xml | 0 .../FurionApi.Application/GlobalUsings.cs | 0 .../System/Dtos/Mapper.cs | 0 .../System/Services/ISystemService.cs | 0 .../System/Services/SystemService.cs | 0 .../System/SystemAppService.cs | 0 .../applicationsettings.json | 0 .../FurionApi.Core/DbContext.cs | 0 .../FurionApi.Core/FurionApi.Core.csproj | 0 .../FurionApi.Core/FurionApi.Core.xml | 0 ...\344\275\223\351\205\215\347\275\256.json" | 1 + .../FurionApi.Web.Core.csproj | 0 .../FurionApi.Web.Core/FurionApi.Web.Core.xml | 0 .../FurionApi.Web.Core/Handlers/JwtHandler.cs | 0 .../FurionApi.Web.Core/Startup.cs | 0 .../FurionApi.Web.Entry.csproj | 0 .../FurionApi.Web.Entry/Program.cs | 0 .../appsettings.Development.json | 0 .../FurionApi.Web.Entry/appsettings.json | 0 .../FurionApi.sln | 0 .../Furion_SqlSugar_Api/FurionApi.sln | 43 ------------------ 25 files changed, 20 insertions(+), 44 deletions(-) create mode 100644 SoEasyPlatform/InitProjects.cs create mode 100644 SoEasyPlatform/database/sqlite.db rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/FurionApi.Application.csproj (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/FurionApi.Application.xml (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/GlobalUsings.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/System/Dtos/Mapper.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/System/Services/ISystemService.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/System/Services/SystemService.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/System/SystemAppService.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Application/applicationsettings.json (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Core/DbContext.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Core/FurionApi.Core.csproj (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Core/FurionApi.Core.xml (100%) create mode 100644 "SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Core/\345\256\236\344\275\223\351\205\215\347\275\256.json" rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Core/FurionApi.Web.Core.csproj (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Core/FurionApi.Web.Core.xml (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Core/Handlers/JwtHandler.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Core/Startup.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Entry/FurionApi.Web.Entry.csproj (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Entry/Program.cs (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Entry/appsettings.Development.json (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.Web.Entry/appsettings.json (100%) rename SoEasyPlatform/wwwroot/template/Projects/{Furion_SqlSugar_Api/FurionApi => FurionSqlSugarApi}/FurionApi.sln (100%) delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/Furion_SqlSugar_Api/FurionApi.sln diff --git a/SoEasyPlatform/Code/AppStart/InitTable.cs b/SoEasyPlatform/Code/AppStart/InitTable.cs index df507a3c..fb4ad95f 100644 --- a/SoEasyPlatform/Code/AppStart/InitTable.cs +++ b/SoEasyPlatform/Code/AppStart/InitTable.cs @@ -6,7 +6,7 @@ using SqlSugar; namespace SoEasyPlatform { - public class InitTable + public partial class InitTable { /// /// 默认实体ID @@ -59,6 +59,8 @@ public void Start() InitTagProperty(db); InitOther(db); + + InitProjects(db); } private void InitOther(SqlSugarClient db) diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs new file mode 100644 index 00000000..b79a371b --- /dev/null +++ b/SoEasyPlatform/InitProjects.cs @@ -0,0 +1,16 @@ +using SqlSugar; +using System.IO; + +namespace SoEasyPlatform +{ + /// + /// 用来初始化整个项目 template/ + /// + public partial class InitTable + { + private void InitProjects(SqlSugarClient db) + { + var directory = Directory.GetCurrentDirectory() + ""; + } + } +} diff --git a/SoEasyPlatform/database/sqlite.db b/SoEasyPlatform/database/sqlite.db new file mode 100644 index 0000000000000000000000000000000000000000..02c2b0276bd83cc826efbebf57cf4b6cbeddd927 GIT binary patch literal 106496 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 Date: Wed, 22 Jun 2022 13:39:53 +0800 Subject: [PATCH 004/108] - --- SoEasyPlatform/database/sqlite.db | Bin 106496 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 SoEasyPlatform/database/sqlite.db diff --git a/SoEasyPlatform/database/sqlite.db b/SoEasyPlatform/database/sqlite.db deleted file mode 100644 index 02c2b0276bd83cc826efbebf57cf4b6cbeddd927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106496 zcmeHwYj6}tmTtEMdH|B}V9+o!L%9jYEhAbl#9J643A=41WJ%c9mK8*)yCjwAu4<~P z5i-GD#2ecf@9-GEZM^oF@r;GNGq!o!8ym3^_vglqxO?~4{@7Kw#Qo#@j&x1AO~!zq9=e`a+LinU9gHzQ;JrtG-|K_`=EZ|15jHRGNQ%-YZ3l@1K0P zvn9_TUWQSQJ-Vp0detib$r_CxiV5v)x|#7uVAp?rQ6Oj(e)}Ij(I_|L$-%5b5gd?yrLs?J-_e zdlWe#DBXNq2yh2@B{Iq@!KRj$T8jpUaXW_E`#h{0L%=Dnu|zS4Mzn@ z6SZ;gw>^p&=auoN1kd*!f*Mi8geJ<8n^i0-VY6M13jO1W++`t=5NA)w2%WInA;bhN zvltv#dwki#((0NT|LI~a0y znPnhYOIltD?E^tZAwr%EiEn8Dfj23EoJt~;mPoJ}+A9nTiXcTYgp0%g!8p2RL232s z)&Aql?Sk>RA}15N9FX4+dWr~nHAguyN|aX)@?xX&8IG!UY!DnrZRpXEoGqe<+Q=p~ zfY!05a;o#z=sGV7dJk2MitSVX`G6BE+nYH;#dMxmH$hr)hcL`1W7;!(ESXirC&aSS z>J=;e$5xw_hU(T(yNffci)iDy^-p=FwY?8|DXj?~ zC+AybrM)xsG5Dj(qqG=4N73vU%C04e*yhE9aFsV!LH(#AK)=&3;;0}Bzcl!jp#y|H z34E6`Rsm76_O;l1gwGY2jXty(}gm`z;CaBh^BMsn9i9;j`-o`bO-GQvUWOiJSZq#%+}+^}dL zX%ZD;bVS}=E7aP=viYQooRCSa83P<_p7!4*&f2rTx*s)&eYZA`h|`HJPR8^R*nDq> z=EzLHsDYNqB`fw4=gZMEl$LO%MOOTTIzsQj~fI)M_wFf$3Ny{##;Yg<9Ge^~! zZ(h0Fqj*hBVB-Aqa-7sJU3A`8_3u^xSoLw0Qq@*fS^4M6f2;he@{P)uDqpDFQu&LD z|5x#^74KHOP*Jn!e?nCDVF)k;7y=9dh5$o=A;1t|2rvW~0{04m9ZO4KZ*ld$#i@%Y zQ!igmy?%P?_B*4RmQXj>*N=^jg`%<~Xf2_L9Ix+?BlS%i>zkTeHa?~*k=8L`XjoKK zZO4N;jr5uGGhdzq0y9TW6`-XXL zm|r`@D{FCUQd=vhPF%Tj>`MCLo6}cbsi`6it|(7mx}Ls#dV2Em^y??<_1%e;mE`5> z^7NVCrM|eB`r^Ixkx%OT`4M;zTb|nZ$_hO~>ck&XC%#C1_M7zNm-WWJYD|bew1`Al zS)RW5dHU?+^cOc%@4W&M=pN%k3yrszPEFnXO3&O_X?$pb@%GB)=`#jv#%j#3%CU57 zGD|me>eJNZTT|E1+&OV}`u60qvJzjpZ}n38lsa>E`uA7s0nBBk_VB4|Z-JcE?+8EN zSc2huYV`P%?@ir4|J|+AGoPGHz5Pw<<_#!9`pV_ht#jYqI#b^<^o%Hs)z8NyyH~iA zT)vVSpVVRFJd)sHR{})m=8c)lSF8*WDUzh7n6SHY>e`Vz7bd4Kyq`Y(dcCn&_{$=E zxn?D$N1;yLIA3q9_B`YVtR6NbL5PZ)UfYBW&i_lR-tkraxoWEFU#k9F)s3pp;E{b8 z0t^9$07HNwzz|>vFa#I^3;~7!Lx3T`5cq)*s46X9U9PXj5c}4JCB-#gT*z_a;9Re#13mREgGfBb}t%ZkPjU?*=7Z84+d!xn;(HSfk17jR{&=<5g{0OK?&4310)hqYZBR7 z@1#3G%G!_46M}*5I(_npM?-4^wSzQiA~_TjBU}U>7jZ^B(>H=nAK2dx?w|xdGRg(v zJU$0UXyf1-iKA>A*1v$53Mur$l6c?@$#6i#wUT6^us!TCE>PzPXyr5oon>t10s%l3 zQKN(mKSvfBGlUW`AG4C^PR3%bLF65nzz0Oi1_=kDy1IBRG8%M|4fQ35 zXpIFM>Kbe7xWGWe+D%X$mfWHM;m4J-HLy3Z#uc`uzMdAImOAzN+0?BgsgM3Nb?pWe z5^dR!ok*Shl5&37EP#tjYb$LO9&LznGDlvfuAQAZc6<7>GgCKSL&Nab&zg)>ETBKJ zp+w9ZfsTz=Ic3za15A`2}fkb$jeZ_up}Rrg57!Ee&!%yz-)s38#B z;p9e!Hnd)B4`NAbIa)Fjj(lL-wR_chxK)C7th0o%bme0ax^wf5naPh*M{aHAw)gU5 znIvq9-R!xQDy7O%-Aer_1?d-QV1ezFKZj$t?Es#o1ZzRZS_tV+L^06c*q&<*-K=M) zt7waR)JC=2DY)Erm;7;uxDi3y!m0R2FOc;Gzi7*DYG`U&+pvCZQxn(Nyt#SfX6X3K zir`PFANT)@tNz_r^?$4W7kse~Lx3T`5MT%}1Q-Gg0fqoWfFZyTUCyns|NUiGeejQc7y=9dh5$o=A;1t|2>cikVEg}QSK!{N zV*CG@CIoE%KOSQH|KoJ8mhJz8ZG~Z8M6HR~{=d!I0L>HJO7*9_|KG4N)VQvB!@8zT zWd2|Di4Xp<4@2O`iojdX6oK8R|4%hJ>^|w*7Pb2<(k(qLlTEwnCm7(_A9GrQ8m?DE zop|%2D5#KF%47bS$Ih~gmw3Epax(`?Syn|&R>rsLhNPw?8JLWsc@tGqV61lgJi0Fh zTd=SHe){IQ>6@RV&wM*|mM%~7G8!K z;GK6rOr3laUQgZpyXg-mz~pS|)?3pz-<eP9#|hQv-{UZkeL2=v{{hNOITV&>aZGzbJK z{qo0mF1+c6Cjr@j2^-e~@=q)$gSBA7hEHKBDjbBjjdkR)Pkc#$rzY+&K*yy{pS*MV z%WTNCKtuy?Bt_7(b6>|L44YdlHC$7q$}u7ItO6E%!9=JZF4Ky&%SlN?$Y;L2ka`j9&sY=S_jzYhil89$@={ce2f=K0w-ObU9ph-%7it5mM|S~J zFMp7J?boRry6Np~ImY<5Dn>B2hM~yd_ZM0sA0x1DDSFn*V{o3b_O7bX!nPI3c8b#Y)tOo~EL>9=cy=2hNX@HPC9CRzj zT7*-d*?>9@)($ibhA>5)og%^uMYH8W0PozN9PSaI-WZTeGWeyG#+OZBw643d%S!-meWkI|`Si2B9UG?HJ_K(gzo=reB=^eK>Rb z4`8wZvMeE?lxc0>Y)lW_44~*S4>#2^I_9(=YE|!@v&XM5qW|? z2!|-C;P@LIOY2gTd4_;gA~xFem#@rRy_h<8l(eHvDs76wk7p$_FbI0Vmfd0KbqyK> zwJ>2NXhk9Fl5p=C6WZSh=rodwWKH6qxqj!=xwI=4DQVQGb(&GHpd}T!@)j=Yg6o$( zv!#jy9gu(cUh4F3TwJulowx`dsb(A3q0WOsB&m@*t3gFjt#7MItmxCPb5>$|bsC&w zT|!S)ZmY+){{)@3y&g$_hDA$~TPO2ZB2m5BYmt&EpcZZUWtR(5r}VPRpp}5s5$QMS zW@Va`%7rXVMeCO)b=R*eReilZH>#;oA7v3{b3_Ib5#R%$Wz5SxAp~$FcSeS~vy%0)_oN6(cJJRTFku!f~SB5HiJy4*ERB2`;_HZZT_1CJG^kERn*{+rr@#0HNis zcAC4Z+G!H^_-g9fP4JMPF9Fsz+&)N@Ok-UWQT}wKMAL)Hf-Wxy6&M_~Zfk69ZL(O^ z`$950cCp%~--hl`@g{}L3NxyU77~3fFZyT_(>yhsiGJcl73&FVJEbRLAOtm%2iUGm5XOs1{nrn_H`(oax246UjYh{wA;K^wP)_D%m zK4_pVAzI;sdSI^%bgY(GSwY4-TnkzI_`eMf7wzy{3o`pQgT@gatMl4$&NoK_2T{ zgdD79%)It>>f9ywq7F&mTAwmfY*ongL*2Hu-uPvedO*h+X2m#948Rh@6L48pkF07s z*hoePoJ{jG2fEuhJ+-j_hDmG~<0H-;;G}Lc21^@U94F!WwA5k+qfrL+m;fe*;Ri+| zWMD#{U`XnD9u$M^BQc7VMdei$C3>!HyYCA@n7bTi3YF~ju407V6 zgH$L=?vd(Uqht-P)!ax8$#RUd#SRYaROI*$IXXTl54{N96<~}lM$u7#QKZ~>*-2qK zn*iMt(7wJ2OH($Lao0%EiFpAa;i{Jfj)#uoa2i!GP&D5lNmDpTMkSD9JAFvtD-2E( zi0q3QR^8nrw0a$jDY>!3_D0L=8T=GEiXdRMvnX>v}V`Lp}&QHbSUdN|8Hq&Zr-@w=Krq} z{r}DThoXP}NlyS+;eOHxTwYdE;d|sCR_=cQ9YpQ%Sv%~oF|BX_?snQ8CE)Dy43AzMgY-Rga!)DkYrOhx5{6rBpm6v&hec`)^ao&yVFv16 zs~mGRi<_Bh=WnC zFS@TaU`^G#JNrWr6d(n~NaS8ya@C4n_O1QAG9qX@QQ?ot%D!zt9f|Xa1d!hf*Wo%} z)ADWYm1PaLB#B3`Z8jfaTkD;#^!RP6D#V9k#9GlA-SGxvZ^iq0U3_j0gR2}H+lK!x zhx;zwf0vYm^632%R0t7O{Ij)(kL-g^tXCL@8kE4bSy+n1l2MQf>gfh0B)~lby&mi% z8-WMtV}PsI0fRmVd2}+g9ewdoPf3bF9#|kn!FqwThqwUAU~?e#x3|IH(e&?b-1*I) zX!XG(I6xze2R08_F^y}LaWMuW7`$u_w1gT$8$uglTX*nqL`^{Dd-i}EHm+OO*wmnZ z*5bG8kMZt!`MgTsV<(nokuq*f7~<|+zCQi-WFAoq!D0-G8$l_vA^|$LM3Jkm8@wfr z$$}|0cP$Go>o#p@H0s+W2ISFrcf72)(%0%K3m|t)6wqsz(G>qW)k0IthIP$Gb>|d? z7mBd+>GV(wC<^zZ^8vcvx&Ty%vuk0!&X2R#S-+`e)4IYm4ezh?)t}ts6tDCLr&6a* z-VfPQHLyV8m1q-_vA=Q^wtihhbHk?WDhx)>6=m>eQ3*~4=@^iVukDio+_wQooj4^R z!TJafW9w4_YcdcFn;kHj3ZQ)cO>OANI#9>Eq|9!7f-CgMq8* zypj67#B|p9)IL-N2E<{`poP}1F29h-qALLg5mOV~O`?o-3~jOK<9jl8#UJ`^1^r2v zMO~hJ@f8AQl)5hhWAZdH%YaD>82ZAjBmKtJ=^NipUwI`pc?PU&bdwu!SNzQ@R=%0D z8k(z)Ff>UGJoY-W;W~!&Z7fHyVN)qlpTPR~q!GktrK z1`XC(>|r{fq|@vp4s#)M&PoGsA=sTJthOaJxjiPUVA*CQhlJ<@*P?#do>LS`WfL(s zy8t&eNynu@0^*$$XMtyso#~tJPhC3##_ZGrJaznAD+??D7aa<<$%)Wz2{vS@y&de5 z0yjaJpC)RZ*5+$U6%BfQds3kzhGv=uT@)DQ_E z>!zVT0bOtFHs-+$`{Y`0`(S5AP)kOh#y7~CVN$FMH(27i0_`%Vr!$R?p*WDhe9RWr zupBnxl4mD3hifgnUFRFbhZyHVW*tKzQZZ=b1*<1y_t_{5exsTr(CJ3wD)(@q%Ffe; zw}X~#aoWh!15$iN*bV7CP^Y^6GAJLoZx-q|SWB(o&|Nfa_Hn!#NuRznbL0d*pkrTW z`H`Sa(|SBQcA9D4)GXR5R*0}^?+@n&n(AOvb=VZmEPIC_Sx$aD${fMN08l-KlzYel z?t4HCx*_f)Xtz~{f?6+UsU|*ps}MB->JSe1pq7ps+ZCYhEU9`@7A4{ezOl~y*|aSf z3WaK|R@jQ|jV#y&YY&A&AiP}yENoGa^0jp+Hgz(dTNoNw;mO$Qz+Wz1k*z-?;dIa2 z+l(Qb=Gyv<0Pw#vf+;?!d3xwE^oy! zdo=iQ_>i$^kGDP0*&^J_fD8H5ToA6wurKGsf_y~vT#Db=*tovAphXd!u(HoRLjceJ zm%x^P#XAdI%bQAn#rFU28MKVhUjPBN|IhaS+5W#i`Dgq8Z2zCxf)r*8!uJ1}SvZE!$+lw8mdKt%(@6Gkd*-jxlP83rsU~7fYJVWeQ8`hD_zFJDGB8cC%E?$&^bUhT# z8iF}?j>Cr3;|gN5BPqsUJ1a=yhsaY9u3%0|jxAVot<$!mtXpJ+ZB%rRFt!jELm3tZ z7&Sz>(Jwf4Fl4Q^V#fHvO>80q0vHfuYCV}61k+2}} zi^*f;Lh@lTvRe_sj|95v3+#=1z6$89z=mA^sHk#qJaJTx;{J`wMR@Sm5aou(Ic-$n z6fkWN<3fmob`JqoTutWqXcVpzrmi5s_<_WS0&AdR1tsJtBhkG^$ppiH1nkh$!70}4gHXx>c#0B3#N~-rP@)@RI)C}#(zTMp+ zI8S6nwDavK8y41Ta@gX6asvHDT4`Oy!IFXb+qbu;FMgc*=F{oduBL8X1j7$2fl+oK zWHwVl=@T?mXn3)@eyC@cEGM1-E8iG3fb$Fw(HrYQqB7~%*Q0Z?3)fTU-oQK3C%;U6 z^hxS-o2$w^j1VCBh}J8B3r;vC03c(<=)IZytwRp708h;-XTH9YdjEZkUnlsAiU@-+ zLKDi4vK|Gir$>&7k@28+Gt96C8lr;Jy*?(3r|9 zgb_vm4m~Ssqg|w7tHHqIo&DJ5_U!H>-%oV5b&%&hN(V$mmf~;#krSi?mYOk&ik2wwA`}KUYzKsxoWQ7Hv}OVAYHmOtM@4#U zLFqgg5s3JpwV6XEF$+Dmu5j|a-V=5yE~Mbf9)ltwIwE+IKLF-*ikQ%Xfq=c5FcN-D zP1h+!6JY8E@#6~8b3oXf|fyPfXPV~GN36t4<>lxxhM#QQAdZ8k$vDM*EaUi z%eW^Tvd0G3hmzpUo8GSJc!Q9S!k9-J4Xy>(h!*}>5L52RgY`~_7tZ*pS=uA9KGeNd zyg7C4Q@h^MQ=^L<(0HVBGDw4^@~Eun!y4}>2DmB+5`{UZCNU$0y7+`c_uC3>78ngF z$Uhj&n4@Zaw1RbJO_mBbr-1WIg`H+2{{Jg)`QRV>Fa#I^3;~7!Lx3T`5MT%}1Q-Gg z0fqoW;75tT(YEpmU;D9&O-re-FKg!&rv0k1_K8a$gJg*%pl^HzHXBPW7_ti&g{&Zs z3+SsB5Ej6tVkJ%%p91E(pXEUcqddzi609wFy$#~KV*Go%F{>%J-ozKmaiu;PT`X~Gk`7Zc6A!XN!65k`s_ZLy?#l4YHUTJL5 zZL$vqy3uj;<^YC*m*!o9G@^|LHa9lZ!9q(!jPtP$ux`ZF4)o%8c<_1#tX^|SU>vU@>1W@rN@^PVRrc6;u)U`qGRz4#!DM#pJe^I zS*966TUu?FiKJwFNN|X6cCk77^PiXcs;iGz7pY)Zq>(=sFywKTxdXpVvrp2vewJxe zXp3Nvch}goWNlFs_0=dbN5e$eiJY6w2Mn~vXP-GV=^^p1Id0C*amzBo@t&fQq!@i1 z{##X%N-Ll%+T6|xaI?)g~>bQ^zDgxdW%xUc-E0BbHq(5rcUT zl=@bzn1~b^J)H4v6BxZGEQqEhHrO>5l!QpmV$$N;i}26NBrZu2R_7!av{_#yds76_=s0oWvOq~@(Hm>qWR;E z7H%G-%%KlP%ZJ5mQXwnzD@uJ2FP{($R$2<;1Y*sek*tXbAB&uPKv@ezWcGXjY41dY zkA+S?z{6Pqd_XL3l9qsER!r7J$VbrvBBZ=gFU{))~ z0@yX*PR>L6GRftVqo?MT_*N_*(+is^M48lb$iwr+rM~48D<3ElM66}r4ROD2rvW~0t^9$07HNwzz|>vFa#I^3;~9~Pa6T8|F3{e{Hj%z z|5Eu9+yA%h5ZL}dSZUYY4A+Y^_ zV)@MW|4Dbl_WyHDuPhy$G2*#b`~RdCaQ)2 zaU0^y}AD;|X&G6B-ZJ033ewbh(%vk~vm4_q0HXB;9Lj>-J2t$<0QIUJ9K z>p1vWK`VgPj3cHBvpu^R=Ob`=NFi3o_M(!?qm${aX;%cvGEb~e_z0f9t(x2 zoE(DtK@tkorwVsR%rZG#=~5W(c;LB`D+LjS1J9Q5?|@@SmW(=2LBZ23xj||LA8LAJ z@v(vFa#I^3;~7! zLx3T`5MT%}1Q-Ggfw>_t@k@W1uW>`o#9&!u^9#mBvoCZAak-%})GcT&T;Kj!Uvh+3 z)=b?zpE`PFps}v0u6b}^dh$r>?8T{TXHs7r9o(C~bUl6f^j_)!VK0ea=N)D0+FPlY zFXxPsI&*gV_g85Yoc|XuI^(PAsT_bW_F)Jx1Q-Gg0fqoWfFZyTUq2Kn5d0uvV?D* z1drqygc=*1bo$14b#y2h*%uRRlw8TyhngYPAi8eD8{VNb+3tLIloA;>67(qYh{DG+ zE{V^Yzt8t3aM*hEo_gBnl`xB)P>P^NTb3MMi#6H|HCokV zuhBlRO%Wr4+ElmRR%0d`#_PG(s~y>1At9@xCZlh2THAZo1Rp`rGxLK=DT2Zq`D4ku zc!>w6dfvsh&$t^W*7~8)%~cay%F4=@tcF7S8tsMd1Q&uDl-aAqvFa-XR2(bD8 zUlM(mH$#9Szz|>vFa#I^3;~7!Lx3T`5MT%}1b!Fm>)zeZb?@1=i|gqPceV9C z$34~g9M`s|e|NYWh;(&!_t!y+_870KV1knnlx{TO;dF1g!KRj$T8jpUaXW_E`#h{0L*|J8W$0`?vmU!u8n)Y?NP)yuZ%wh7hZd$?hw?7A|^C+W#VELi%QsR z2g{NE@kH*jkVsgUo{$kbVYNeu30h_`IIi~ivW2D9H8uXz#Y7+gz!!yxrhhGUR+1h% z#|r8f;)xjCJROcUx=Ub%o2)VVWJU83u-s^& z((+1Z9|$rE5%Oe^YH0w0Hz|Rf zN+M)LB-jk?6@~>xkih85Ohy|Di2;Ifbj^a&>eZ|L$Cuj$<8eh!CUiLsXM&~meRjopTyI;39(4!$aTSO1Fkxgm_wI+IVjL zQ(kFp?;GV6A(2<%cMQ=ec#*xUOUfmnHKnE1D_8nY&bP`+M*z^r;EyVg(qi}=MYCfl zyOtzkn->qlRo++y^`qeZOB2vzR)CAbFXE@l997UxM-lcU@LkSW1w_f(*JAGxR(Hvf zeeU4^s*mOpB8ewAk=ikOIOBVPvu=#wIaW2tr-Ix zY@YVtCC=Kjzq%hah<&#zh$R!H)66eqg1xTHpQeH9s z!NkiPGF27R{$xLa9lY}KL%b>&-}9WX8^Lpg9Ti_r)S(qiFqHS0U^tqC(Vb+>wuoMA zzl&xFg4k13QoUx4|2cw(x<3ZS_Ip*BQ{lkV^;qmc$MrHO!QiY8Qr1ok_)DvoF7+Ry z!_qE6O5*<_N9q6u%@Nlg=!7LLyO@R}Ic98_Z(h0Fqr}`5XGjpv|L2!I;;a1ci>@zR zRPKkL?86XX2rvW~0t^9$07C!~n0U6b6vtIZ1v0Sef`g=@Gy>~bu=uTwyB>ex8X7qx zlTlKx$$CF70^}Xj6u6$=&yV29%2=p$t+By?@pxGUSw}ndEGZepH%evuS?w&5?ads= ze0wA@NtS)wteMND1uZkc1V)i#UJE!T9T@wO4FM+t_Saciz*&Fx Date: Wed, 22 Jun 2022 14:42:00 +0800 Subject: [PATCH 005/108] - --- .../Projects/FurionSqlSugarApi/Biz.txt | 1 + .../Projects/FurionSqlSugarApi/Entity.txt | 42 +++++++++++++++++++ .../System/Dtos/Mapper.cs | 9 ---- .../System/Services/ISystemService.cs | 7 ---- .../System/Services/SystemService.cs | 10 ----- .../System/SystemAppService.cs | 23 ---------- ...\344\275\223\351\205\215\347\275\256.json" | 1 - .../\351\205\215\347\275\256.json" | 19 +++++++++ 8 files changed, 62 insertions(+), 50 deletions(-) create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Entity.txt delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Dtos/Mapper.cs delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/ISystemService.cs delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/SystemService.cs delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/SystemAppService.cs delete mode 100644 "SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Core/\345\256\236\344\275\223\351\205\215\347\275\256.json" create mode 100644 "SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt new file mode 100644 index 00000000..d0ace7c4 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt @@ -0,0 +1 @@ +//未实现 \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Entity.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Entity.txt new file mode 100644 index 00000000..c75c1f47 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Entity.txt @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +namespace @Model.name_space +{ + /// + /// @((Model.Description+"").Replace("\r","").Replace("\n","")) + /// + public class @(Model.ClassName) + { +@foreach (var item in Model.PropertyGens) +{ + + var isNull=(item.IsNullable&&item.Type!="string"&&item.IsSpecialType==false&&item.Type!="byte[]")?"?":""; + + + var newPropertyName=item.PropertyName; //这里可以用C#处理 实体属性的显式格式 + //想和数据库一样就用 newPropertyName=item.DbColumnName + if(System.Text.RegularExpressions.Regex.IsMatch(newPropertyName.Substring(0,1), "[0-9]")) + { + newPropertyName="_"+newPropertyName;//处理属性名开头为数字情况 + } + if(newPropertyName==Model.ClassName) + { + newPropertyName="_"+newPropertyName;//处理属性名不能等于类名 + } + + + var desc=(item.Description+"").Replace("\r","").Replace("\n","");//处理换行 + + + @:/// + @:/// @(desc) + @if(item.DefaultValue!=null) + { + @:/// 默认值: @Raw(item.DefaultValue) + } + @:/// + @: public @Raw(item.Type)@isNull @newPropertyName { get; set; } + } + } +} diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Dtos/Mapper.cs b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Dtos/Mapper.cs deleted file mode 100644 index 00c8d17c..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Dtos/Mapper.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace FurionApi.Application -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/ISystemService.cs b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/ISystemService.cs deleted file mode 100644 index e743daef..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/ISystemService.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FurionApi.Application -{ - public interface ISystemService - { - string GetDescription(); - } -} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/SystemService.cs b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/SystemService.cs deleted file mode 100644 index 52d4a742..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/Services/SystemService.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FurionApi.Application -{ - public class SystemService : ISystemService, ITransient - { - public string GetDescription() - { - return "让 .NET 开发更简单，更通用，更流行。"; - } - } -} \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/SystemAppService.cs b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/SystemAppService.cs deleted file mode 100644 index ed7ad458..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Application/System/SystemAppService.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace FurionApi.Application -{ - /// - /// 系统服务接口 - /// - public class SystemAppService : IDynamicApiController - { - private readonly ISystemService _systemService; - public SystemAppService(ISystemService systemService) - { - _systemService = systemService; - } - - /// - /// 获取系统描述 - /// - /// - public string GetDescription() - { - return _systemService.GetDescription(); - } - } -} \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Core/\345\256\236\344\275\223\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Core/\345\256\236\344\275\223\351\205\215\347\275\256.json" deleted file mode 100644 index 98a6a2f0..00000000 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/FurionApi.Core/\345\256\236\344\275\223\351\205\215\347\275\256.json" +++ /dev/null @@ -1 +0,0 @@ -{ "templateId": 1 } \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" new file mode 100644 index 00000000..d590a947 --- /dev/null +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -0,0 +1,19 @@ +[ + { + "实体模版": "Entity.txt", + "文件夹": "FurionApi.Web.Core", + "子目录": "Entities" + }, + { + "业务模版": "Biz.txt", + "文件夹": "FurionApi.Application", + "子目录": "Entities" + } + , + { + "业务接口": "2", + "文件夹": "FurionApi.Application", + "子目录": "Entities" + } +] +//实体和业务模版 \ No newline at end of file From 87684dcdd66bae2afb235cbe3e280fe7018a55c0 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 14:44:35 +0800 Subject: [PATCH 006/108] - --- .../template/Projects/FurionSqlSugarApi/IBiz.txt | 1 + .../FurionSqlSugarApi/\351\205\215\347\275\256.json" | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt new file mode 100644 index 00000000..d0ace7c4 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt @@ -0,0 +1 @@ +//未实现 \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" index d590a947..5231daeb 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -2,18 +2,18 @@ { "实体模版": "Entity.txt", "文件夹": "FurionApi.Web.Core", - "子目录": "Entities" + "子目录": "Entities" }, { "业务模版": "Biz.txt", "文件夹": "FurionApi.Application", - "子目录": "Entities" + "子目录": "Services" } , { - "业务接口": "2", + "业务接口": "IBiz.txt", "文件夹": "FurionApi.Application", - "子目录": "Entities" + "子目录": "IServices" } ] -//实体和业务模版 \ No newline at end of file +//接口可以删掉 \ No newline at end of file From 7fbeccc51d4615aa4e8dbf0b26e15487e4bf511d Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 14:54:10 +0800 Subject: [PATCH 007/108] - --- SoEasyPlatform/InitProjects.cs | 2 +- .../template/Projects/FurionEfCoreApi/Biz.txt | 1 + .../Projects/FurionEfCoreApi/Entity.txt | 42 +++++++++++++++++++ .../Projects/FurionEfCoreApi/IBiz.txt | 1 + .../\351\205\215\347\275\256.json" | 19 +++++++++ 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt create mode 100644 "SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index b79a371b..73adfd75 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -4,7 +4,7 @@ namespace SoEasyPlatform { /// - /// 用来初始化整个项目 template/ + /// 用来初始化整个项目 /wwwroot/template/Projects /// public partial class InitTable { diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt new file mode 100644 index 00000000..d0ace7c4 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt @@ -0,0 +1 @@ +//未实现 \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt new file mode 100644 index 00000000..c75c1f47 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +namespace @Model.name_space +{ + /// + /// @((Model.Description+"").Replace("\r","").Replace("\n","")) + /// + public class @(Model.ClassName) + { +@foreach (var item in Model.PropertyGens) +{ + + var isNull=(item.IsNullable&&item.Type!="string"&&item.IsSpecialType==false&&item.Type!="byte[]")?"?":""; + + + var newPropertyName=item.PropertyName; //这里可以用C#处理 实体属性的显式格式 + //想和数据库一样就用 newPropertyName=item.DbColumnName + if(System.Text.RegularExpressions.Regex.IsMatch(newPropertyName.Substring(0,1), "[0-9]")) + { + newPropertyName="_"+newPropertyName;//处理属性名开头为数字情况 + } + if(newPropertyName==Model.ClassName) + { + newPropertyName="_"+newPropertyName;//处理属性名不能等于类名 + } + + + var desc=(item.Description+"").Replace("\r","").Replace("\n","");//处理换行 + + + @:/// + @:/// @(desc) + @if(item.DefaultValue!=null) + { + @:/// 默认值: @Raw(item.DefaultValue) + } + @:/// + @: public @Raw(item.Type)@isNull @newPropertyName { get; set; } + } + } +} diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt new file mode 100644 index 00000000..d0ace7c4 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt @@ -0,0 +1 @@ +//未实现 \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" new file mode 100644 index 00000000..5231daeb --- /dev/null +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" @@ -0,0 +1,19 @@ +[ + { + "实体模版": "Entity.txt", + "文件夹": "FurionApi.Web.Core", + "子目录": "Entities" + }, + { + "业务模版": "Biz.txt", + "文件夹": "FurionApi.Application", + "子目录": "Services" + } + , + { + "业务接口": "IBiz.txt", + "文件夹": "FurionApi.Application", + "子目录": "IServices" + } +] +//接口可以删掉 \ No newline at end of file From 2f7f442764f7fcaf44c2ea13e4e3abc4674c835b Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:07:46 +0800 Subject: [PATCH 008/108] - --- SoEasyPlatform/database/sqlite.db | Bin 0 -> 106496 bytes .../Projects/FurionSqlSugarApi/API.txt | 1 + .../Projects/FurionSqlSugarApi/Biz.txt | 2 +- .../Projects/FurionSqlSugarApi/IBiz.txt | 2 +- .../Projects/FurionSqlSugarApi/WebCore.txt | 1 + .../\351\205\215\347\275\256.json" | 32 +++++++++++++----- 6 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 SoEasyPlatform/database/sqlite.db create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/API.txt create mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/WebCore.txt diff --git a/SoEasyPlatform/database/sqlite.db b/SoEasyPlatform/database/sqlite.db new file mode 100644 index 0000000000000000000000000000000000000000..8c18327826a8ec20ab576cd3d6bedf93344a661f GIT binary patch literal 106496 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 CjHjId literal 0 HcmV?d00001 diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/API.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/API.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/API.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt index d0ace7c4..5f282702 100644 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Biz.txt @@ -1 +1 @@ -//未实现 \ No newline at end of file + \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt index d0ace7c4..5f282702 100644 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/IBiz.txt @@ -1 +1 @@ -//未实现 \ No newline at end of file + \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/WebCore.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/WebCore.txt new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/WebCore.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" index 5231daeb..8f5bf2e3 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -1,19 +1,33 @@ [ { - "实体模版": "Entity.txt", + "模版": "Entity.txt", "文件夹": "FurionApi.Web.Core", - "子目录": "Entities" + "子目录": "Entities", + "描述": "实体" }, { - "业务模版": "Biz.txt", + "模版": "Biz.txt", "文件夹": "FurionApi.Application", - "子目录": "Services" - } - , + "子目录": "Services", + "描述": "业务" + }, + { + "模版": "API.txt", + "文件夹": "FurionApi.Web.Entry", + "子目录": "Apis", + "描述": "启动项目" + }, { - "业务接口": "IBiz.txt", + "模版": "IBiz.txt", "文件夹": "FurionApi.Application", - "子目录": "IServices" + "子目录": "IServices", + "描述": "业务接口" + }, + { + "模版": "WebCore.txt", + "文件夹": "FurionApi.Web.Core", + "子目录": "", + "描述": "WEB辅助类库" } ] -//接口可以删掉 \ No newline at end of file +// \ No newline at end of file From 8a0a8d8d8ad41134352ba18d55d4816dfb67f069 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:09:51 +0800 Subject: [PATCH 009/108] - --- .../Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" index 8f5bf2e3..abd63ef6 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -30,4 +30,4 @@ "描述": "WEB辅助类库" } ] -// \ No newline at end of file + \ No newline at end of file From 1dce613cfd57e74ba647c84b20f7be243523bf1b Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:12:26 +0800 Subject: [PATCH 010/108] - --- .../Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" index abd63ef6..dc6f1ec5 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -3,7 +3,8 @@ "模版": "Entity.txt", "文件夹": "FurionApi.Web.Core", "子目录": "Entities", - "描述": "实体" + "描述": "实体", + "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改" }, { "模版": "Biz.txt", From 674fd2a9e25c247316ab593e2faf8b1d72e14704 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:17:16 +0800 Subject: [PATCH 011/108] - --- SoEasyPlatform/InitProjects.cs | 3 ++- .../FurionSqlSugarApi/\351\205\215\347\275\256.json" | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index 73adfd75..b3880739 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -10,7 +10,8 @@ public partial class InitTable { private void InitProjects(SqlSugarClient db) { - var directory = Directory.GetCurrentDirectory() + ""; + var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); + var projectPathList=Directory.GetDirectories(directory); } } } diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" index dc6f1ec5..4621868b 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ "b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" @@ -3,31 +3,36 @@ "模版": "Entity.txt", "文件夹": "FurionApi.Web.Core", "子目录": "Entities", + "文件后缀": "cs", "描述": "实体", - "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改" + "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改", }, { "模版": "Biz.txt", "文件夹": "FurionApi.Application", "子目录": "Services", + "文件后缀": "cs", "描述": "业务" }, { "模版": "API.txt", "文件夹": "FurionApi.Web.Entry", "子目录": "Apis", + "文件后缀": "cs", "描述": "启动项目" }, { "模版": "IBiz.txt", "文件夹": "FurionApi.Application", "子目录": "IServices", + "文件后缀": "cs", "描述": "业务接口" }, { "模版": "WebCore.txt", "文件夹": "FurionApi.Web.Core", "子目录": "", + "文件后缀": "cs", "描述": "WEB辅助类库" } ] From 231282dff2d022082c5a04b1f9b746b3911e293b Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:32:28 +0800 Subject: [PATCH 012/108] - --- SoEasyPlatform/InitProjects.cs | 2 ++ SoEasyPlatform/database/sqlite.db | Bin 106496 -> 106496 bytes .../Projects/FurionSqlSugarApi/Config.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) rename "SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" => SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json (95%) diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index b3880739..7469aeb5 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -12,6 +12,8 @@ private void InitProjects(SqlSugarClient db) { var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); var projectPathList=Directory.GetDirectories(directory); + var configUrl = directory + "Config.json"; + var jsonConfig = "directory"; } } } diff --git a/SoEasyPlatform/database/sqlite.db b/SoEasyPlatform/database/sqlite.db index 8c18327826a8ec20ab576cd3d6bedf93344a661f..f6e0148014f1f2b290b3cd58a6193286ddde92a4 100644 GIT binary patch delta 181 zcmZoTz}9epZGyC*83O}@6cEFJ=tLc3Mzf6x3+1KxzcX<0r!n$B;lIXzf`1qPTK+lw z{rrvm1^j876&1Yrxj49)MHzil^GZc07wETffsEkf1o4{;wiz%oI*9WtF>tW%WZ=8N zyN}16dmZNwjwtp#)}0e;a<;b=FwWy+0qVFnU9Fz+o&X!WCj;Llo}Ju0oQxdm?4Fw) X1x(qQ8>9KBtJX8#-mc!kcvBnzbQvxt delta 148 zcmZoTz}9epZGyC*76Su=6cEDz??fGAMy-tr3+1JOLR|a>4E*2tpYUJfKf%9?e=YwU z{(k;O{({Yd1|j^D3-sH#I2f5l8GTdpN=2Itwiz%oI`9IuakB1Y;8)_iz`Ji^QQ7vE s0>*iKla=^yPXArc$jQgbq0Yc}iDxG_4<{ps`esJ~QI75E9gH`{0XP;VU;qFB diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json similarity index 95% rename from "SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" rename to SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json index 4621868b..129d7fc8 100644 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/\351\205\215\347\275\256.json" +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json @@ -5,7 +5,7 @@ "子目录": "Entities", "文件后缀": "cs", "描述": "实体", - "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改", + "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改" }, { "模版": "Biz.txt", From 2345c5a8132ab3c36bc8f7100c37ede23f114753 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 15:36:48 +0800 Subject: [PATCH 013/108] - --- SoEasyPlatform/InitProjects.cs | 22 ++++++++- SoEasyPlatform/database/sqlite.db | Bin 106496 -> 106496 bytes .../template/Projects/FurionEfCoreApi/Biz.txt | 1 - .../Projects/FurionEfCoreApi/Entity.txt | 42 ------------------ .../Projects/FurionEfCoreApi/IBiz.txt | 1 - .../\351\205\215\347\275\256.json" | 19 -------- 6 files changed, 20 insertions(+), 65 deletions(-) delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt delete mode 100644 SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt delete mode 100644 "SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index 7469aeb5..82d057e1 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -1,5 +1,6 @@ using SqlSugar; using System.IO; +using System.Xml.Linq; namespace SoEasyPlatform { @@ -12,8 +13,25 @@ private void InitProjects(SqlSugarClient db) { var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); var projectPathList=Directory.GetDirectories(directory); - var configUrl = directory + "Config.json"; - var jsonConfig = "directory"; + foreach (var project in projectPathList) + { + var configUrl = FileSugar.MergeUrl(project, "Config.json"); + CheckProjectConfig(configUrl); + var json = XElement.Parse(configUrl); + } + } + + /// + /// 验证是否存在项目配置 + /// + /// + /// + private static void CheckProjectConfig(string configUrl) + { + if (FileSugar.IsExistFile(configUrl) == false) + { + throw new System.Exception("没有找到文件" + configUrl); + } } } } diff --git a/SoEasyPlatform/database/sqlite.db b/SoEasyPlatform/database/sqlite.db index f6e0148014f1f2b290b3cd58a6193286ddde92a4..470881bd53ff1027b8dd0320a04939d26e3aea49 100644 GIT binary patch delta 38 mcmZoTz}9epZGyC*B?AM46cEFJ_(UCJM$5*8tqF_^<^uqhA_x-z delta 38 mcmZoTz}9epZGyC*83O}@6cEFJ=tLc3Mzh9*tqF_^<^uqgnFtF2 diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt deleted file mode 100644 index d0ace7c4..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Biz.txt +++ /dev/null @@ -1 +0,0 @@ -//未实现 \ No newline at end of file diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt deleted file mode 100644 index c75c1f47..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/Entity.txt +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -namespace @Model.name_space -{ - /// - /// @((Model.Description+"").Replace("\r","").Replace("\n","")) - /// - public class @(Model.ClassName) - { -@foreach (var item in Model.PropertyGens) -{ - - var isNull=(item.IsNullable&&item.Type!="string"&&item.IsSpecialType==false&&item.Type!="byte[]")?"?":""; - - - var newPropertyName=item.PropertyName; //这里可以用C#处理 实体属性的显式格式 - //想和数据库一样就用 newPropertyName=item.DbColumnName - if(System.Text.RegularExpressions.Regex.IsMatch(newPropertyName.Substring(0,1), "[0-9]")) - { - newPropertyName="_"+newPropertyName;//处理属性名开头为数字情况 - } - if(newPropertyName==Model.ClassName) - { - newPropertyName="_"+newPropertyName;//处理属性名不能等于类名 - } - - - var desc=(item.Description+"").Replace("\r","").Replace("\n","");//处理换行 - - - @:/// - @:/// @(desc) - @if(item.DefaultValue!=null) - { - @:/// 默认值: @Raw(item.DefaultValue) - } - @:/// - @: public @Raw(item.Type)@isNull @newPropertyName { get; set; } - } - } -} diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt deleted file mode 100644 index d0ace7c4..00000000 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/IBiz.txt +++ /dev/null @@ -1 +0,0 @@ -//未实现 \ No newline at end of file diff --git "a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" "b/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" deleted file mode 100644 index 5231daeb..00000000 --- "a/SoEasyPlatform/wwwroot/template/Projects/FurionEfCoreApi/\351\205\215\347\275\256.json" +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "实体模版": "Entity.txt", - "文件夹": "FurionApi.Web.Core", - "子目录": "Entities" - }, - { - "业务模版": "Biz.txt", - "文件夹": "FurionApi.Application", - "子目录": "Services" - } - , - { - "业务接口": "IBiz.txt", - "文件夹": "FurionApi.Application", - "子目录": "IServices" - } -] -//接口可以删掉 \ No newline at end of file From df82772a7459e5182d581fe28d706459d94f34d2 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 22 Jun 2022 19:49:28 +0800 Subject: [PATCH 014/108] - --- SoEasyPlatform/InitProjects.cs | 49 +++++++++++++++++-- .../Projects/FurionSqlSugarApi/Config.json | 3 +- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index 82d057e1..7cb7a9b0 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -1,4 +1,5 @@ -using SqlSugar; +using Newtonsoft.Json.Linq; +using SqlSugar; using System.IO; using System.Xml.Linq; @@ -13,11 +14,49 @@ private void InitProjects(SqlSugarClient db) { var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); var projectPathList=Directory.GetDirectories(directory); - foreach (var project in projectPathList) + try { - var configUrl = FileSugar.MergeUrl(project, "Config.json"); - CheckProjectConfig(configUrl); - var json = XElement.Parse(configUrl); + db.BeginTran(); + foreach (var project in projectPathList) + { + var configUrl = FileSugar.MergeUrl(project, "Config.json"); + CheckProjectConfig(configUrl); + var json = FileSugar.FileToString(configUrl); + foreach (var item in JArray.Parse(json)) + { + CheckConfigItemChilds(configUrl, item); + var 模版 = item["模版"].ToString(); + var 文件夹 = item["文件夹"].ToString(); + var 子目录 = item["子目录"].ToString(); + var 文件后缀 = item["文件后缀"].ToString(); + var 描述 = item["描述"].ToString(); + + } + + } + db.CommitTran(); + } + catch (System.Exception ex) + { + db.RollbackTran(); + throw new System.Exception(ex.Message); + } + } + + private void CheckConfigItemChilds(string configUrl, JToken item) + { + CheckJsonItem(item["模版"], "模版", item, configUrl); + CheckJsonItem(item["文件夹"], "文件夹", item, configUrl); + CheckJsonItem(item["子目录"], "子目录", item, configUrl); + CheckJsonItem(item["文件后缀"], "文件后缀", item, configUrl); + CheckJsonItem(item["描述"], "描述", item, configUrl); + } + + private void CheckJsonItem(JToken jToken, string keyName, JToken item,string url) + { + if (jToken == null) + { + throw new System.Exception(url+"配置错误 ,缺少: "+keyName+"节点 。"+item.ToString() ); } } diff --git a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json index 129d7fc8..0c91e829 100644 --- a/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json +++ b/SoEasyPlatform/wwwroot/template/Projects/FurionSqlSugarApi/Config.json @@ -4,8 +4,7 @@ "文件夹": "FurionApi.Web.Core", "子目录": "Entities", "文件后缀": "cs", - "描述": "实体", - "使用说明": "模版.txt可以为空白，可以启动程序后在模管版理进行修改" + "描述": "实体" }, { "模版": "Biz.txt", From 9fefb0163f9b0042521a2e4bcc35e0ef91fdb13e Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 23 Jun 2022 16:18:02 +0800 Subject: [PATCH 015/108] =?UTF-8?q?=E8=BF=98=E5=8E=9F.NET=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SoEasyPlatform/InitProjects.cs | 134 ++++++++++++++---- .../PublishProfiles/FolderProfile.pubxml | 12 +- SoEasyPlatform/SoEasyPlatform.csproj | 6 +- SoEasyPlatform/database/sqlite.db | Bin 106496 -> 106496 bytes .../Projects/FurionSqlSugarApi/Config.json | 6 +- .../Projects/FurionSqlSugarApi/Entity.txt | 14 +- 6 files changed, 131 insertions(+), 41 deletions(-) diff --git a/SoEasyPlatform/InitProjects.cs b/SoEasyPlatform/InitProjects.cs index 7cb7a9b0..2d10bd7a 100644 --- a/SoEasyPlatform/InitProjects.cs +++ b/SoEasyPlatform/InitProjects.cs @@ -1,5 +1,7 @@ using Newtonsoft.Json.Linq; using SqlSugar; +using System; +using System.Collections.Generic; using System.IO; using System.Xml.Linq; @@ -12,34 +14,114 @@ public partial class InitTable { private void InitProjects(SqlSugarClient db) { - var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); - var projectPathList=Directory.GetDirectories(directory); - try + //var directory = FileSugar.MergeUrl(Directory.GetCurrentDirectory(), "wwwroot", "template", "Projects"); + //var slnListPathList = Directory.GetDirectories(directory); + //try + //{ + // db.BeginTran(); + // foreach (var sln in slnListPathList) + // { + // ProjectGroup projectGroup = new ProjectGroup(); + // AddProjects(db, sln); + // } + // db.CommitTran(); + //} + //catch (System.Exception ex) + //{ + // db.RollbackTran(); + // throw new System.Exception(ex.Message); + //} + } + + private List AddProjects(SqlSugarClient db, string sln) + { + List result = new List(); + var slnName = System.IO.Path.GetFileName(sln); + var configUrl = FileSugar.MergeUrl(sln, "Config.json"); + CheckProjectConfig(configUrl); + var json = FileSugar.FileToString(configUrl); + var projects = JArray.Parse(json); + foreach (var item in projects) { - db.BeginTran(); - foreach (var project in projectPathList) - { - var configUrl = FileSugar.MergeUrl(project, "Config.json"); - CheckProjectConfig(configUrl); - var json = FileSugar.FileToString(configUrl); - foreach (var item in JArray.Parse(json)) - { - CheckConfigItemChilds(configUrl, item); - var 模版 = item["模版"].ToString(); - var 文件夹 = item["文件夹"].ToString(); - var 子目录 = item["子目录"].ToString(); - var 文件后缀 = item["文件后缀"].ToString(); - var 描述 = item["描述"].ToString(); + CheckConfigItemChilds(configUrl, item); + var 模版 = item["模版"].ToString(); + var 文件夹 = item["文件夹"].ToString(); + var 子目录 = item["子目录"].ToString(); + var 文件后缀 = item["文件后缀"].ToString(); + var 描述 = item["描述"].ToString(); + var tempUrl = FileSugar.MergeUrl(sln, 模版); + CheckProjectConfig(tempUrl); + var tempId = AddTemplate(db, configUrl, 文件夹, 描述, tempUrl, slnName); + var projectPath = FileSugar.MergeUrl(sln, 文件夹); + var id= AddProject(db, tempId, 文件夹, sln, projectPath); + result.Add(id); + } + return result; + } - } + private int AddProject(SqlSugarClient db, int tempId, string apiName, string rootPath, string projectPath) + { + var files = Directory.GetFiles(projectPath); + + foreach (var filePath in files) + { - } - db.CommitTran(); + var path = filePath.Replace(projectPath, "").TrimStart('\\').TrimStart('/'); + FileInfo file = new FileInfo() + { + ChangeTime = DateTime.Now, + Content = FileSugar.FileToString(filePath), + IsDeleted = false, + IsInit = true, + Name = "", + Json = "{\"name\":\"" + System.IO.Path.GetFileName(filePath) + "\"}", + Suffix = "{\"name\":\"" + System.IO.Path.GetExtension(filePath) + "\"}", + SolutionId = "", + Sort = 999 + }; } - catch (System.Exception ex) + //throw new NotImplementedException(); + return 1; + } + + private int AddTemplate(SqlSugarClient db, string configUrl, string 文件夹, string 描述, string tempUrl,string slnName ) + { + var name = slnName+"_" +文件夹 + 描述 ; + var dbtemp = db.Queryable