diff --git a/api/SimpleAdmin/SimpleAdmin.System/Services/Gen/Basic/GenBasicService.cs b/api/SimpleAdmin/SimpleAdmin.System/Services/Gen/Basic/GenBasicService.cs index 4fd1ade2fad48dc0d979852a7e9b6480579c6f3a..a5a5b0f66f87968292e4e26e1adc9d18ef27f85b 100644 --- a/api/SimpleAdmin/SimpleAdmin.System/Services/Gen/Basic/GenBasicService.cs +++ b/api/SimpleAdmin/SimpleAdmin.System/Services/Gen/Basic/GenBasicService.cs @@ -1,4 +1,4 @@ -namespace SimpleAdmin.System; +namespace SimpleAdmin.System; /// /// @@ -431,7 +431,7 @@ public class GenBasicService : DbRepository, IGenbasicService { var backendCodeResults = new List();//结果集 var backendTemplatePath = Path.Combine(templatePath, _backendDir);//获取后端模板文件路径 - var serviceDir = Path.GetDirectoryName(App.WebHostEnvironment.ContentRootPath).CombinePath(genViewModel.ServicePosition);//服务文件夹 + var serviceDir = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName.CombinePath(genViewModel.ServicePosition);//服务文件夹 var serviceDicList = genViewModel.ServiceDictionary.Split("/").Where(it => !string.IsNullOrWhiteSpace(it)).ToList();//获取文件夹 foreach (var item in serviceDicList) { @@ -439,7 +439,7 @@ public class GenBasicService : DbRepository, IGenbasicService } serviceDir = serviceDir.CombinePath(genViewModel.ClassName); //获取控制器文件夹和后面的路径 - var controllerDir = Path.GetDirectoryName(App.WebHostEnvironment.ContentRootPath).CombinePath(genViewModel.ControllerPosition); + var controllerDir = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName.CombinePath(genViewModel.ControllerPosition); var controllerDicList = genViewModel.ControllerDictionary.Split("/").Where(it => !string.IsNullOrWhiteSpace(it)).ToList(); foreach (var item in controllerDicList) { diff --git a/api/SimpleAdmin/SimpleAdmin.System/ViewEngine/CodeGen/Backend/Controllers/Controller.cs.vm b/api/SimpleAdmin/SimpleAdmin.System/ViewEngine/CodeGen/Backend/Controllers/Controller.cs.vm index 7f2e0ade10e41848949e7d8dd3c345991d33aa14..8701c7ae8ee509658d0b8b60f8a98152320bbd9d 100644 --- a/api/SimpleAdmin/SimpleAdmin.System/ViewEngine/CodeGen/Backend/Controllers/Controller.cs.vm +++ b/api/SimpleAdmin/SimpleAdmin.System/ViewEngine/CodeGen/Backend/Controllers/Controller.cs.vm @@ -17,7 +17,7 @@ namespace @(@Model.ControllerPosition); /// @(@Model.FunctionName)控制器 /// [ApiDescriptionSettings("@(@Model.ApiGroup)", Tag = "@(@Model.FunctionName)")] -[Route("/@(@Model.RouteName)/@(@Model.BusName)")] +[Route("@(@Model.RouteName)/@(@Model.BusName)")] @if(dataPermission) @:[RolePermission] public class @(@Model.ClassName)Controller: IDynamicApiController {