From c199ba439dce3cb789614914c57fa8fdf00a6796 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 31 Dec 2022 10:35:22 +0800 Subject: [PATCH] fix(axios): the api path should start with '/' --- .../TypeScript/AxiosHttpApiScriptGenerator.cs | 2 +- .../TypeScript/UniAppAxiosHttpApiScriptGenerator.cs | 2 +- .../TypeScript/VbenAxiosHttpApiScriptGenerator.cs | 2 +- .../TypeScript/VbenDynamicHttpApiScriptGenerator.cs | 8 +++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs index c5b4d9ca0..dba30de5d 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/AxiosHttpApiScriptGenerator.cs @@ -64,7 +64,7 @@ public class AxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransientDe foreach (var action in actionModel.Actions) { - var url = action.Value.Url; + var url = action.Value.Url.EnsureStartsWith('/'); var isFormatUrl = false; var formatUrlIndex = 0; diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs index f8ec8e8bc..c1af79063 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/UniAppAxiosHttpApiScriptGenerator.cs @@ -65,7 +65,7 @@ public class UniAppAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans foreach (var action in actionModel.Actions) { - var url = action.Value.Url; + var url = action.Value.Url.EnsureStartsWith('/'); var isFormatUrl = false; var formatUrlIndex = 0; diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs index 695ab61c9..dd27ca1f6 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenAxiosHttpApiScriptGenerator.cs @@ -65,7 +65,7 @@ public class VbenAxiosHttpApiScriptGenerator : IHttpApiScriptGenerator, ITransie foreach (var action in actionModel.Actions) { - var url = action.Value.Url; + var url = action.Value.Url.EnsureStartsWith('/'); var isFormatUrl = false; var formatUrlIndex = 0; diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs index 86df36956..832b2ddb1 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/TypeScript/VbenDynamicHttpApiScriptGenerator.cs @@ -140,7 +140,13 @@ public class VbenDynamicHttpApiScriptGenerator : IHttpApiScriptGenerator, ITrans var inPathParams = action.Value.Parameters.Where(p => p.BindingSourceId == "Path"); var inBodyParams = action.Value.Parameters.Where(p => p.BindingSourceId == "Body"); - if (inPathParams.Any()) + if (inPathParams.Any() && + inPathParams.Count() == 1) + { + apiScriptBuilder.AppendFormat(" params: {0},", inPathParams.First().NameOnMethod); + apiScriptBuilder.AppendLine(""); + } + else { apiScriptBuilder.AppendLine(" params: {"); foreach (var paramter in inPathParams)