fix(issue-229): fix the bug of docker-compose

Merge pull request #230 from live-dev999/live-dev999/issue229
O2-Bionics · Mar 23, 2022 · 70b744a · 70b744a
2 parents f78fca4 + ee6a634
commit 70b744a
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 28 deletions.
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs b/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+namespace O2NextGen.Auth.Web.Controllers
+{
+
+    [AllowAnonymous]
+    public class VersionController : ControllerBase
+    {
+        #region Fields
+
+        private readonly IHostingEnvironment _environment;
+        private readonly ILogger<VersionController> _logger;
+
+        #endregion
+
+
+        #region Ctors
+
+        public VersionController(IHostingEnvironment environment, ILogger<VersionController> logger)
+        {
+            _environment = environment;
+            _logger = logger;
+        }
+
+        #endregion
+
+        [HttpGet("[controller]")]
+        public object Index()
+        {
+            var exVersion = Assembly.GetExecutingAssembly().GetName().Version;
+            _logger.LogInformation($"get version - {exVersion}");
+            return new
+            {
+                Environment = _environment.EnvironmentName,
+                Version = exVersion.ToString()
+            };
+        }
+    }
+}
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json b/src/Services/auth/O2NextGen.Auth.Web/Properties/launchSettings.json
@@ -8,12 +8,12 @@
       },
       "applicationUrl": "https://localhost:10001;http://localhost:5001"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true,
-      "useSSL": true
-    }
+    //"Docker": {
+    //  "commandName": "Docker",
+    //  "launchBrowser": true,
+    //  "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+    //  "publishAllPorts": true,
+    //  "useSSL": true
+    //}
   }
 }
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Properties/launchSettings.json
@@ -8,12 +8,12 @@
       },
       "applicationUrl": "https://localhost:10002;http://localhost:5002"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true,
-      "useSSL": true
-    }
+    //"Docker": {
+    //  "commandName": "Docker",
+    //  "launchBrowser": true,
+    //  "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+    //  "publishAllPorts": true,
+    //  "useSSL": true
+    //}
   }
 }
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Properties/launchSettings.json b/src/Services/e-sender/O2NextGen.ESender.Api/Properties/launchSettings.json
@@ -26,12 +26,12 @@
       },
       "applicationUrl": "https://localhost:10004;http://localhost:5004"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
-      "publishAllPorts": true,
-      "useSSL": true
-    }
+    //"Docker": {
+    //  "commandName": "Docker",
+    //  "launchBrowser": true,
+    //  "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
+    //  "publishAllPorts": true,
+    //  "useSSL": true
+    //}
   }
 }
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Properties/launchSettings.json b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Properties/launchSettings.json
@@ -26,12 +26,12 @@
       },
       "applicationUrl": "https://localhost:10003;http://localhost:5003"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
-      "publishAllPorts": true,
-      "useSSL": true
-    }
+    //"Docker": {
+    //  "commandName": "Docker",
+    //  "launchBrowser": true,
+    //  "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
+    //  "publishAllPorts": true,
+    //  "useSSL": true
+    //}
   }
 }