Browse Source

Merge pull request #4521 from abpframework/maliming/cli-patch

Exclude primitive type in CreateType method.
pull/4533/head
Halil İbrahim Kalkan 6 years ago
committed by GitHub
parent
commit
ffe6360b70
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 26
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

26
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

@ -55,7 +55,7 @@ namespace Volo.Abp.Cli.Commands
var environment = JObject.Parse(environmentJson); var environment = JObject.Parse(environmentJson);
apiUrl = environment["apis"]["default"]["url"].ToString(); apiUrl = environment["apis"]["default"]["url"].ToString();
} }
apiUrl += "/api/abp/api-definition?IncludeTypes=true"; apiUrl = apiUrl.EnsureEndsWith('/') + "api/abp/api-definition?IncludeTypes=true";
var uiFramework = GetUiFramework(commandLineArgs); var uiFramework = GetUiFramework(commandLineArgs);
@ -469,17 +469,21 @@ namespace Volo.Abp.Cli.Commands
if (returnValueType.Contains("<")) if (returnValueType.Contains("<"))
{ {
returnValueType = returnValueType.Split('<')[1].Split('>')[0]; returnValueType = returnValueType.Split('<')[1].Split('>')[0];
var clrType = Type.GetType(returnValueType, throwOnError: false);
if (clrType != null && TypeHelper.IsPrimitiveExtended(clrType, includeEnums: true))
{
return null;
}
if (returnValueType.StartsWith("Volo.Abp.Application.Dtos") if (returnValueType.StartsWith("Volo.Abp.Application.Dtos")
|| returnValueType.StartsWith("System.Collections") || returnValueType.StartsWith("System.Collections")
|| returnValueType == "System.String" || returnValueType == "System.Void"
|| returnValueType == "System.Void" || returnValueType.Contains("System.Net.HttpStatusCode?")
|| returnValueType.Contains("System.Net.HttpStatusCode?") || returnValueType.Contains("IActionResult")
|| returnValueType.Contains("IActionResult") || returnValueType.Contains("ActionResult")
|| returnValueType.Contains("ActionResult") || returnValueType.Contains("IStringValueType")
|| returnValueType.Contains("IStringValueType") || returnValueType.Contains("IValueValidator")
|| returnValueType.Contains("IValueValidator") )
|| returnValueType.Contains("Guid")
)
{ {
return null; return null;
} }

Loading…
Cancel
Save