Merge branch 'dev' of https://github.com/abpframework/abp into pr/alerts_documentation

docs/zh-Hans/CLI.md

@@ -59,6 +59,7 @@ abp new Acme.BookStore
 * `--output-folder` 或者 `-o`: 指定输出文件夹,默认是当前目录.
 * `--version` 或者 `-v`: 指定ABP和模板的版本.它可以是 [release tag](https://github.com/abpframework/abp/releases) 或者 [branch name](https://github.com/abpframework/abp/branches). 如果没有指定,则使用最新版本.大多数情况下,您会希望使用最新的版本.
 * `--template-source` 或者 `-ts`: 指定自定义模板源用于生成项目,可以使用本地源和网络源(例如 `D\localTemplate` 或 `https://<your url>.zip`).
+* `--create-solution-folder` 或者 `-csf`: 指定项目是在输出文件夹中的新文件夹中还是直接在输出文件夹中.
 
 ### add-package
 
@@ -171,6 +172,28 @@ abp login <username>
 abp logout
 ```
 
+### generate-proxy
+
+生成typescript服务和DTO代理
+
+基本用法:
+
+````bash
+abp generate-proxy [options] 
+````
+
+示例:
+
+````bash
+abp generate-proxy --apiUrl https://localhost:44305 --ui angular --module all
+````
+
+#### Options
+
+* `--apiUrl` 或者 `-a`：如果未指定这个选项,默认使用你的environment.ts文件的API URL, 你可以随时使用这个选项指定API源.
+* `--ui` 或者 `-u`: 指定UI框架,默认框架是angular.当前只有angular一个选项, 但我们会通过更改CLI增加新的选项. 尽请关注!
+* `--module` 或者 `-m`：指定模块名. 默认模块名称为app. 如果你想所有模块,你可以指定 `--module all` 命令.
+
 ### help
 
 CLI的基本用法信息.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -55,6 +55,12 @@ namespace Volo.Abp.Cli.Commands
                 Logger.LogInformation("Version: " + version);
             }
 
+            var isTiered = commandLineArgs.Options.ContainsKey(Options.Tiered.Long);
+            if (isTiered)
+            {
+                Logger.LogInformation("Tiered: yes");
+            }
+
             var databaseProvider = GetDatabaseProvider(commandLineArgs);
             if (databaseProvider != DatabaseProvider.NotSpecified)
             {
@@ -96,14 +102,9 @@ namespace Volo.Abp.Cli.Commands
             var outputFolderRoot =
                 outputFolder != null ? Path.GetFullPath(outputFolder) : Directory.GetCurrentDirectory();
 
-            if (createSolutionFolder)
-            {
-                outputFolder = Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName);
-            }
-            else
-            {
-                outputFolder = outputFolderRoot;
-            }
+            outputFolder = createSolutionFolder ?
+                Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName) :
+                outputFolderRoot;
 
             if (!Directory.Exists(outputFolder))
             {
@@ -232,7 +233,7 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
-        private UiFramework GetUiFramework(CommandLineArgs commandLineArgs)
+        protected virtual UiFramework GetUiFramework(CommandLineArgs commandLineArgs)
         {
             var optionValue = commandLineArgs.Options.GetOrNull(Options.UiFramework.Short, Options.UiFramework.Long);
             switch (optionValue)
@@ -248,7 +249,7 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
-        private MobileApp GetMobilePreference(CommandLineArgs commandLineArgs)
+        protected virtual MobileApp GetMobilePreference(CommandLineArgs commandLineArgs)
         {
             var optionValue = commandLineArgs.Options.GetOrNull(Options.Mobile.Short, Options.Mobile.Long);
             switch (optionValue)
@@ -316,6 +317,11 @@ namespace Volo.Abp.Cli.Commands
                 public const string Short = "csf";
                 public const string Long = "create-solution-folder";
             }
+
+            public static class Tiered
+            {
+                public const string Long = "tiered";
+            }
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

@@ -82,7 +82,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
             // Exclude unwanted or known options.
             var options = args.ExtraProperties
                 .Where(x => !x.Key.Equals(CliConsts.Command, StringComparison.InvariantCultureIgnoreCase))
-                .Where(x => !x.Key.Equals("tiered", StringComparison.InvariantCultureIgnoreCase))
+                .Where(x => !x.Key.Equals(NewCommand.Options.Tiered.Long, StringComparison.InvariantCultureIgnoreCase))
                 .Where(x => !x.Key.Equals(NewCommand.Options.DatabaseProvider.Long, StringComparison.InvariantCultureIgnoreCase) &&
                             !x.Key.Equals(NewCommand.Options.DatabaseProvider.Short, StringComparison.InvariantCultureIgnoreCase))
                 .Where(x => !x.Key.Equals(NewCommand.Options.OutputFolder.Long, StringComparison.InvariantCultureIgnoreCase) &&
@@ -102,7 +102,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
                 Tool = Options.ToolName,
                 Command = args.ExtraProperties.ContainsKey(CliConsts.Command) ? args.ExtraProperties[CliConsts.Command] : "",
                 DatabaseProvider = args.DatabaseProvider.ToProviderName(),
-                IsTiered = args.ExtraProperties.ContainsKey("tiered"),
+                IsTiered = args.ExtraProperties.ContainsKey(NewCommand.Options.Tiered.Long),
                 UiFramework = args.UiFramework.ToFrameworkName(),
                 Options = JsonSerializer.Serialize(options),
                 ProjectName = args.SolutionName.FullName,

npm/preview-publish.ps1

@@ -8,7 +8,7 @@ param(
 
 npm install
 
-$NextVersion = $(node get-version.js) + '-preview' + (Get-Date).tostring("yyyyMMdd")
+$NextVersion = $(node get-version.js)
 $rootFolder = (Get-Item -Path "./" -Verbose).FullName
 
 if(-Not $Version) {