更新WebApi

3 years ago · 36e4aa492d
parent dee082e916
commit 36e4aa492d
30 changed files with 3965 additions and 41 deletions
--- a/Demo/WebApiPublish/DockerStudyApi.deps.json
+++ b/Demo/WebApiPublish/DockerStudyApi.deps.json
--- a/Demo/WebApiPublish/DockerStudyApi.dll
+++ b/Demo/WebApiPublish/DockerStudyApi.dll
--- a/Demo/WebApiPublish/DockerStudyApi.exe
+++ b/Demo/WebApiPublish/DockerStudyApi.exe
--- a/Demo/WebApiPublish/DockerStudyApi.runtimeconfig.json
+++ b/Demo/WebApiPublish/DockerStudyApi.runtimeconfig.json
@ -0,0 +1,14 @@
+{
+  "runtimeOptions": {
+    "tfm": "net5.0",
+    "framework": {
+      "name": "Microsoft.AspNetCore.App",
+      "version": "5.0.0"
+    },
+    "configProperties": {
+      "System.GC.Server": true,
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
+    }
+  }
+}
--- a/Demo/WebApiPublish/DockerStudyApi.xml
+++ b/Demo/WebApiPublish/DockerStudyApi.xml
@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>DockerStudyApi</name>
+    </assembly>
+    <members>
+        <member name="T:DockerStudyApi.Controllers.DemoController">
+            <summary>
+            配置测试控制器
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.Ping">
+            <summary>
+            服务测试
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.TestOption">
+            <summary>
+            说明：泛型左右尖括号，不能写在注释里，会生成无效的xml
+            解决：用[]或{}或中文符号＜＞ 代替，或者使用xml转义字符 &lt;&gt;
+            获取 IOptions＜TestOption＞
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.MonitorTestOption">
+            <summary>
+            获取 IOptionsMonitor＜TestOptionT＞
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.MonitorCacheTestOption">
+            <summary>
+            获取 IOptionsMonitorCache＜TestOption＞
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.SnapshotTestOption">
+            <summary>
+            获取 IOptionsSnapshot＜TestOption＞
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.CmdPara(System.String)">
+            <summary>
+            获取命令参数
+            (仅支持字符串或Key=value两种形式)
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.Evn(System.String)">
+            <summary>
+            获取环境变量
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.ConfigItem(System.String)">
+            <summary>
+            获取配置项
+            </summary>
+        </member>
+        <member name="M:DockerStudyApi.Controllers.DemoController.Info">
+            <summary>
+            获取所有配置项
+            </summary>
+        </member>
+    </members>
+</doc>
--- a/Demo/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll
+++ b/Demo/WebApiPublish/Microsoft.AspNetCore.JsonPatch.dll
--- a/Demo/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll
+++ b/Demo/WebApiPublish/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Abstractions.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Configuration.Binder.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.DependencyInjection.Abstractions.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Options.ConfigurationExtensions.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Options.DataAnnotations.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Options.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Options.dll
--- a/Demo/WebApiPublish/Microsoft.Extensions.Primitives.dll
+++ b/Demo/WebApiPublish/Microsoft.Extensions.Primitives.dll
--- a/Demo/WebApiPublish/Microsoft.OpenApi.dll
+++ b/Demo/WebApiPublish/Microsoft.OpenApi.dll
--- a/Demo/WebApiPublish/Newtonsoft.Json.Bson.dll
+++ b/Demo/WebApiPublish/Newtonsoft.Json.Bson.dll
--- a/Demo/WebApiPublish/Newtonsoft.Json.dll
+++ b/Demo/WebApiPublish/Newtonsoft.Json.dll
--- a/Demo/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll
+++ b/Demo/WebApiPublish/Swashbuckle.AspNetCore.Newtonsoft.dll
--- a/Demo/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll
+++ b/Demo/WebApiPublish/Swashbuckle.AspNetCore.Swagger.dll
--- a/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll
+++ b/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerGen.dll
--- a/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll
+++ b/Demo/WebApiPublish/Swashbuckle.AspNetCore.SwaggerUI.dll
--- a/Demo/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll
+++ b/Demo/WebApiPublish/System.Runtime.CompilerServices.Unsafe.dll
--- a/Demo/WebApiPublish/appsettings.Development.json
+++ b/Demo/WebApiPublish/appsettings.Development.json
@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
--- a/Demo/WebApiPublish/appsettings.json
+++ b/Demo/WebApiPublish/appsettings.json
@ -0,0 +1,21 @@
+{
+  "TestOption": {
+    "AppId": "WebApiDemo1",
+    "AppName": "示例WebApi",
+    "AppDesc": "Docker学习测试WebApi服务",
+    "AppVersion": {
+      "Major": 1,
+      "Minor": 5,
+      "Revision": 6,
+      "Build": 15236
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
--- a/Demo/WebApiPublish/web.config
+++ b/Demo/WebApiPublish/web.config
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <location path="." inheritInChildApplications="false">
+    <system.webServer>
+      <handlers>
+        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+      </handlers>
+      <aspNetCore processPath="dotnet" arguments=".\DockerStudyApi.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
+    </system.webServer>
+  </location>
+</configuration>
+<!--ProjectGuid: 969d5123-0168-4a1d-998b-e3ad43e77b69-->
--- a/DockerStudyApi/DockerStudyApi/.config/dotnet-tools.json
+++ b/DockerStudyApi/DockerStudyApi/.config/dotnet-tools.json
@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "6.0.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
--- a/DockerStudyApi/DockerStudyApi/Controllers/DemoController.cs
+++ b/DockerStudyApi/DockerStudyApi/Controllers/DemoController.cs
@ -26,7 +26,15 @@ namespace DockerStudyApi.Controllers

        private readonly IConfiguration _configuration;

-        public DemoController(ILogger<DemoController> logger, IOptions<TestOption> tespOption,IOptionsMonitor<TestOption> monitorTestOption,IOptionsMonitorCache<TestOption> monitorCacheTestOption,IOptionsSnapshot<TestOption> snapshotTestOption, IConfiguration configuration)
+        public DemoController
+        (
+            ILogger<DemoController> logger,
+            IOptions<TestOption> tespOption,
+            IOptionsMonitor<TestOption> monitorTestOption,
+            IOptionsMonitorCache<TestOption> monitorCacheTestOption,
+            IOptionsSnapshot<TestOption> snapshotTestOption, 
+            IConfiguration configuration
+        )
        {
            _logger = logger;
            _tespOption = tespOption;
@ -86,16 +94,73 @@ namespace DockerStudyApi.Controllers
            return _snapshotTestOption.Value;
        }

+        /// <summary>
+        /// 获取命令参数
+        /// (仅支持字符串或Key=value两种形式)
+        /// </summary>
+        [HttpGet]
+        public IActionResult CmdPara(string cmdName)
+        {
+            var cmdArgs = System.Environment.GetCommandLineArgs();
+            if (cmdArgs == null)
+            { 
+                return Ok("启动时没有设置：命令行参数");
+            }
+
+            var kvArgs = new Dictionary<string,string>();
+            var singleArgs=  new List<string>();
+
+            foreach (var arg in cmdArgs)
+            {
+                var item = arg.Split('=').ToList();
+                if (item.Count ==1)
+                {
+                    singleArgs.Add(item[0]);
+                }
+
+                if (item.Count == 2)
+                { 
+                    kvArgs.Add(item[0], item[1]); 
+                }
+
+            }
+
+            var result =string.Empty;
+
+            var kvArg = kvArgs.FirstOrDefault(q=>q.Key == cmdName);
+
+            if (kvArg.Key == cmdName)
+            {
+                result = kvArg.Value;
+
+                return Ok($"{cmdName} 命令参数值为:{kvArg.Value} ");
+            }
+
+            var singleArg = singleArgs.FirstOrDefault(q=> q == cmdName);
+            return Ok(singleArg ?? $"无 {cmdName} 命令参数 ");
+           
+        }
+
        /// <summary>
        /// 获取环境变量
        /// </summary>
        [HttpGet]
        public IActionResult Evn(string envName)
        {
-            var envValue = _configuration.GetValue<string>(envName);
+            var envValue = System.Environment.GetEnvironmentVariable(envName);
            return Ok(envValue??"无此环境变量");
        }

+        /// <summary>
+        /// 获取配置项
+        /// </summary>
+        [HttpGet]
+        public IActionResult ConfigItem(string itemName)
+        {
+            var envValue = _configuration.GetValue<string>(itemName);
+            return Ok(envValue ?? "无此配置变量");
+        }
+
        /// <summary>
        /// 获取所有配置项
        /// </summary>
--- a/DockerStudyApi/DockerStudyApi/Program.cs
+++ b/DockerStudyApi/DockerStudyApi/Program.cs
@ -19,10 +19,10 @@ namespace DockerStudyApi

        public static IHostBuilder CreateHostBuilder(string[] args) =>
            Host.CreateDefaultBuilder(args)
-                //.ConfigureAppConfiguration((hostingContext, config) => 
-                //{
-                //    config.AddJsonFile("appsettings.json", false, true);
-                //})
+                .ConfigureAppConfiguration((hostingContext, config) =>
+                {
+                   // config.AddJsonFile("appsettings.json", false, true);
+                })
                .ConfigureWebHostDefaults(webBuilder =>
                {
                    webBuilder.UseStartup<Startup>();
--- a/DockerStudyApi/DockerStudyApi/Properties/launchSettings.json
+++ b/DockerStudyApi/DockerStudyApi/Properties/launchSettings.json
@ -1,4 +1,5 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
@ -7,7 +8,6 @@
      "sslPort": 0
    }
  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
  "profiles": {
    "IIS Express": {
      "commandName": "IISExpress",
@ -19,13 +19,14 @@
    },
    "DockerStudyApi": {
      "commandName": "Project",
+      "commandLineArgs": "ApiVersion=1.0.0.1",
      "launchBrowser": true,
      "launchUrl": "swagger",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      },
-      "dotnetRunMessages": "true",
-      "applicationUrl": "http://localhost:5000"
+      "applicationUrl": "http://localhost:5000",
+      "dotnetRunMessages": "true"
    },
    "Docker": {
      "commandName": "Docker",
--- a/DockerStudyApi/DockerStudyApi/true
+++ b/DockerStudyApi/DockerStudyApi/true
@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>DockerStudyApi</name>
-    </assembly>
-    <members>
-        <member name="T:DockerStudyApi.Controllers.DemoController">
-            <summary>
-            配置测试控制器
-            </summary>
-        </member>
-        <member name="M:DockerStudyApi.Controllers.DemoController.Ping">
-            <summary>
-            服务测试
-            </summary>
-        </member>
-        <!-- Badly formed XML comment ignored for member "M:DockerStudyApi.Controllers.DemoController.TestOption" -->
-        <!-- Badly formed XML comment ignored for member "M:DockerStudyApi.Controllers.DemoController.MonitorTestOption" -->
-        <!-- Badly formed XML comment ignored for member "M:DockerStudyApi.Controllers.DemoController.MonitorCacheTestOption" -->
-        <!-- Badly formed XML comment ignored for member "M:DockerStudyApi.Controllers.DemoController.SnapshotTestOption" -->
-        <member name="M:DockerStudyApi.Controllers.DemoController.Evn(System.String)">
-            <summary>
-            获取环境变量
-            </summary>
-        </member>
-        <member name="M:DockerStudyApi.Controllers.DemoController.Info">
-            <summary>
-            获取所有配置项
-            </summary>
-        </member>
-    </members>
-</doc>