diff --git a/OpenAuth.App/BuilderTable/BuilderTableApp.cs b/OpenAuth.App/BuilderTable/BuilderTableApp.cs index 37984c0a..9fde3eb7 100644 --- a/OpenAuth.App/BuilderTable/BuilderTableApp.cs +++ b/OpenAuth.App/BuilderTable/BuilderTableApp.cs @@ -290,7 +290,7 @@ namespace OpenAuth.App { domainContent = domainContent.Replace("{BaseAppName}", "BaseStringApp"); } - FileHelper.WriteFile(appRootPath, sysTableInfo.ModuleCode + ".cs", domainContent); + FileHelper.WriteFile($"{appRootPath}\\{sysTableInfo.ModuleCode}", $"{sysTableInfo.ModuleCode}.cs", domainContent); } /// @@ -313,7 +313,7 @@ namespace OpenAuth.App .Replace("{ModuleName}", sysTableInfo.ModuleName) .Replace("{ClassName}", sysTableInfo.ClassName) .Replace("{StartName}", StratName); - FileHelper.WriteFile(Path.Combine(appRootPath, "Request"), $"Query{sysTableInfo.ClassName}ListReq.cs", + FileHelper.WriteFile(Path.Combine(appRootPath, $"{sysTableInfo.ModuleCode}\\Request"), $"Query{sysTableInfo.ClassName}ListReq.cs", domainContent); @@ -352,7 +352,7 @@ namespace OpenAuth.App tableAttr.Append("\r\n"); domainContent = domainContent.Replace("{AttributeManager}", tableAttr.ToString()); - FileHelper.WriteFile(Path.Combine(appRootPath, "Request"), $"AddOrUpdate{sysTableInfo.ClassName}Req.cs", + FileHelper.WriteFile(Path.Combine(appRootPath, $"{sysTableInfo.ModuleCode}\\Request"), $"AddOrUpdate{sysTableInfo.ClassName}Req.cs", domainContent); } @@ -528,7 +528,7 @@ namespace OpenAuth.App { if (type == "DateTime") { - return "DateTime.Now;"; + return "DateTime.Now"; } return Activator.CreateInstance(t).ToString(); } diff --git a/OpenAuth.App/Test/TestBuilder.cs b/OpenAuth.App/Test/TestBuilder.cs index 998a73bf..7fcf251f 100644 --- a/OpenAuth.App/Test/TestBuilder.cs +++ b/OpenAuth.App/Test/TestBuilder.cs @@ -39,7 +39,7 @@ namespace OpenAuth.App.Test //模拟路径 var path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) - .Replace("\\OpenAuth.App\\bin\\Debug\\net5.0",""); + .Replace("\\OpenAuth.App\\bin\\Debug\\netcoreapp3.1",""); var mockPathProvider = new Mock(); mockPathProvider.Setup(x => x.MapPath("",false)).Returns(path); services.AddScoped(x => mockHttpFac.Object); @@ -70,15 +70,6 @@ namespace OpenAuth.App.Test public void CreateEntity() { var app = _autofacServiceProvider.GetService(); - // var id = app.Add(new AddOrUpdateBuilderTableReq() - // { - // TableName = "application", - // Comment = "这是一个普通的应用管理生成模版", - // ClassName = "Application", - // Folder = "Application", - // ModuleCode = "Application", - // ModuleName = "模块管理" - // }); app.CreateEntity(new CreateEntityReq {