diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj
index 9786c23..55590ac 100644
--- a/24Hour/24Hour.csproj
+++ b/24Hour/24Hour.csproj
@@ -6,6 +6,8 @@
enable
_24Hour
True
+ e485308c-2f05-470b-b0a4-68f1ec2b3412
+ Linux
@@ -16,6 +18,7 @@
+
diff --git a/24Hour/24Hour.csproj.user b/24Hour/24Hour.csproj.user
index f241fe3..0f04b0a 100644
--- a/24Hour/24Hour.csproj.user
+++ b/24Hour/24Hour.csproj.user
@@ -4,5 +4,6 @@
MvcControllerEmptyScaffolder
root/Common/MVC/Controller
C:\Users\callm\source\repos\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml
+ Docker
\ No newline at end of file
diff --git a/24Hour/Dockerfile b/24Hour/Dockerfile
index 6f107b1..459aa4a 100644
--- a/24Hour/Dockerfile
+++ b/24Hour/Dockerfile
@@ -19,7 +19,7 @@ RUN echo 'Asia/Shanghai' >/etc/timezone
#EXPOSE 80
EXPOSE 5800
-ENV ASPNETCORE_URLS=http://+:8098
+ENV ASPNETCORE_URLS=http://+:8099
ENV ASPNETCORE_ENVIRONMENT Production
# 最后设置启动的dll
diff --git a/WebApplication1/Properties/launchSettings.json b/WebApplication1/Properties/launchSettings.json
index 22748e8..93113d5 100644
--- a/WebApplication1/Properties/launchSettings.json
+++ b/WebApplication1/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-锘縶
- "$schema": "https://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:34369",
- "sslPort": 44333
- }
- },
+{
"profiles": {
"WebApplication1": {
"commandName": "Project",
- "dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "swagger",
- "applicationUrl": "https://localhost:7156;http://localhost:5194",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
- }
+ },
+ "dotnetRunMessages": true,
+ "applicationUrl": "https://localhost:7156;http://localhost:5194"
},
"IIS Express": {
"commandName": "IISExpress",
@@ -26,6 +17,22 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
+ },
+ "Docker": {
+ "commandName": "Docker",
+ "launchBrowser": true,
+ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+ "publishAllPorts": true,
+ "useSSL": true
+ }
+ },
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://localhost:34369",
+ "sslPort": 44333
}
}
-}
+}
\ No newline at end of file
diff --git a/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json b/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json
index 9f373a5..c662172 100644
--- a/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json
+++ b/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json
@@ -8,6 +8,7 @@
".NETCoreApp,Version=v6.0": {
"WebApplication1/1.0.0": {
"dependencies": {
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1",
"Newtonsoft.Json": "13.0.3",
"Swashbuckle.AspNetCore": "6.0.0"
},
@@ -24,6 +25,7 @@
}
}
},
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {},
"Newtonsoft.Json/13.0.3": {
"runtime": {
"lib/net6.0/Newtonsoft.Json.dll": {
@@ -92,6 +94,13 @@
"path": "microsoft.openapi/1.2.3",
"hashPath": "microsoft.openapi.1.2.3.nupkg.sha512"
},
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==",
+ "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1",
+ "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512"
+ },
"Newtonsoft.Json/13.0.3": {
"type": "package",
"serviceable": true,
diff --git a/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfo.cs b/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfo.cs
index fcad7bc..bf60ecc 100644
--- a/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfo.cs
+++ b/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfo.cs
@@ -11,6 +11,7 @@
using System;
using System.Reflection;
+[assembly: Microsoft.Extensions.Configuration.UserSecrets.UserSecretsIdAttribute("ae1f7aa6-e320-4393-ac3f-984b92923499")]
[assembly: System.Reflection.AssemblyCompanyAttribute("WebApplication1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
diff --git a/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfoInputs.cache b/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfoInputs.cache
index 6d63d24..57828e5 100644
--- a/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfoInputs.cache
+++ b/WebApplication1/obj/Debug/net6.0/WebApplication1.AssemblyInfoInputs.cache
@@ -1 +1 @@
-dee9a2aee02504fa7cdc7ec740942fa35fde151a
+0497fdbf8846ef3edec613ba32acb896dcbcc846
diff --git a/WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.AssemblyReference.cache b/WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.AssemblyReference.cache
index 24cd32b..a5bee74 100644
Binary files a/WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.AssemblyReference.cache and b/WebApplication1/obj/Debug/net6.0/WebApplication1.csproj.AssemblyReference.cache differ
diff --git a/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfo.cs b/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfo.cs
index f61c658..7bd76fa 100644
--- a/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfo.cs
+++ b/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfo.cs
@@ -11,6 +11,7 @@
using System;
using System.Reflection;
+[assembly: Microsoft.Extensions.Configuration.UserSecrets.UserSecretsIdAttribute("ae1f7aa6-e320-4393-ac3f-984b92923499")]
[assembly: System.Reflection.AssemblyCompanyAttribute("WebApplication1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
diff --git a/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfoInputs.cache b/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfoInputs.cache
index 62cf5a3..362f405 100644
--- a/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfoInputs.cache
+++ b/WebApplication1/obj/Release/net6.0/WebApplication1.AssemblyInfoInputs.cache
@@ -1 +1 @@
-e5ea81544c71ccdf664c478fb6e2942e864600b3
+f1b09e843285889ef6521eaae99d3682ff7d81fe
diff --git a/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json b/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json
index f8eb543..df9153b 100644
--- a/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json
+++ b/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json
@@ -51,6 +51,10 @@
"net6.0": {
"targetAlias": "net6.0",
"dependencies": {
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": {
+ "target": "Package",
+ "version": "[1.18.1, )"
+ },
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.3, )"
diff --git a/WebApplication1/obj/WebApplication1.csproj.nuget.g.props b/WebApplication1/obj/WebApplication1.csproj.nuget.g.props
index 8e73332..e595a42 100644
--- a/WebApplication1/obj/WebApplication1.csproj.nuget.g.props
+++ b/WebApplication1/obj/WebApplication1.csproj.nuget.g.props
@@ -18,8 +18,10 @@
+
C:\Users\callm\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0
+ C:\Users\callm\.nuget\packages\microsoft.visualstudio.azure.containers.tools.targets\1.18.1
\ No newline at end of file
diff --git a/WebApplication1/obj/WebApplication1.csproj.nuget.g.targets b/WebApplication1/obj/WebApplication1.csproj.nuget.g.targets
index a03b337..235e910 100644
--- a/WebApplication1/obj/WebApplication1.csproj.nuget.g.targets
+++ b/WebApplication1/obj/WebApplication1.csproj.nuget.g.targets
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/WebApplication1/obj/project.assets.json b/WebApplication1/obj/project.assets.json
index 025747f..d56ba2a 100644
--- a/WebApplication1/obj/project.assets.json
+++ b/WebApplication1/obj/project.assets.json
@@ -26,6 +26,13 @@
}
}
},
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {
+ "type": "package",
+ "build": {
+ "build/Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props": {},
+ "build/Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets": {}
+ }
+ },
"Newtonsoft.Json/13.0.3": {
"type": "package",
"compile": {
@@ -152,6 +159,87 @@
"microsoft.openapi.nuspec"
]
},
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {
+ "sha512": "RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==",
+ "type": "package",
+ "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1",
+ "hasTools": true,
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "CHANGELOG.md",
+ "EULA.md",
+ "ThirdPartyNotices.txt",
+ "build/Container.props",
+ "build/Container.targets",
+ "build/Microsoft.VisualStudio.Azure.Containers.Tools.Targets.props",
+ "build/Microsoft.VisualStudio.Azure.Containers.Tools.Targets.targets",
+ "build/Rules/GeneralBrowseObject.xaml",
+ "build/Rules/cs-CZ/GeneralBrowseObject.xaml",
+ "build/Rules/de-DE/GeneralBrowseObject.xaml",
+ "build/Rules/es-ES/GeneralBrowseObject.xaml",
+ "build/Rules/fr-FR/GeneralBrowseObject.xaml",
+ "build/Rules/it-IT/GeneralBrowseObject.xaml",
+ "build/Rules/ja-JP/GeneralBrowseObject.xaml",
+ "build/Rules/ko-KR/GeneralBrowseObject.xaml",
+ "build/Rules/pl-PL/GeneralBrowseObject.xaml",
+ "build/Rules/pt-BR/GeneralBrowseObject.xaml",
+ "build/Rules/ru-RU/GeneralBrowseObject.xaml",
+ "build/Rules/tr-TR/GeneralBrowseObject.xaml",
+ "build/Rules/zh-CN/GeneralBrowseObject.xaml",
+ "build/Rules/zh-TW/GeneralBrowseObject.xaml",
+ "build/ToolsTarget.props",
+ "build/ToolsTarget.targets",
+ "icon.png",
+ "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512",
+ "microsoft.visualstudio.azure.containers.tools.targets.nuspec",
+ "tools/Microsoft.VisualStudio.Containers.Tools.Common.dll",
+ "tools/Microsoft.VisualStudio.Containers.Tools.Shared.dll",
+ "tools/Microsoft.VisualStudio.Containers.Tools.Tasks.dll",
+ "tools/Newtonsoft.Json.dll",
+ "tools/System.Security.Principal.Windows.dll",
+ "tools/cs/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/cs/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/cs/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/de/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/de/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/de/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/es/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/es/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/es/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/fr/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/fr/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/fr/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/it/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/it/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/it/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/ja/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/ja/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/ja/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/ko/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/ko/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/ko/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/pl/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/pl/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/pl/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/pt-BR/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/pt-BR/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/pt-BR/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/ru/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/ru/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/ru/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/tr/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/tr/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/tr/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/utils/KillProcess.exe",
+ "tools/zh-Hans/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/zh-Hans/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/zh-Hans/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll",
+ "tools/zh-Hant/Microsoft.VisualStudio.Containers.Tools.Common.resources.dll",
+ "tools/zh-Hant/Microsoft.VisualStudio.Containers.Tools.Shared.resources.dll",
+ "tools/zh-Hant/Microsoft.VisualStudio.Containers.Tools.Tasks.resources.dll"
+ ]
+ },
"Newtonsoft.Json/13.0.3": {
"sha512": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==",
"type": "package",
@@ -248,6 +336,7 @@
},
"projectFileDependencyGroups": {
"net6.0": [
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets >= 1.18.1",
"Newtonsoft.Json >= 13.0.3",
"Swashbuckle.AspNetCore >= 6.0.0"
]
@@ -305,6 +394,10 @@
"net6.0": {
"targetAlias": "net6.0",
"dependencies": {
+ "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": {
+ "target": "Package",
+ "version": "[1.18.1, )"
+ },
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.3, )"
diff --git a/WebApplication1/obj/project.nuget.cache b/WebApplication1/obj/project.nuget.cache
index 4c3f5e3..7835aa0 100644
--- a/WebApplication1/obj/project.nuget.cache
+++ b/WebApplication1/obj/project.nuget.cache
@@ -1,11 +1,12 @@
{
"version": 2,
- "dgSpecHash": "bS9QmmqQfP2i+ZmyVBEAp0TYQIot5GcyS3RQwnH4Hh6v20ZDeAtFDtGdQ3lt1YmygMIcbytxIyewDi05IvOoYw==",
+ "dgSpecHash": "VWYxV+vFRAGuC4anKgaucLVAxJMhCuRdnSoq/D2hflzPCBpBIu5R12vGBCyXZ3e6wQWP5DmYci9gO4JsLT71YQ==",
"success": true,
"projectFilePath": "C:\\Users\\callm\\source\\repos\\24Hour.Service\\WebApplication1\\WebApplication1.csproj",
"expectedPackageFiles": [
"C:\\Users\\callm\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512",
"C:\\Users\\callm\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
+ "C:\\Users\\callm\\.nuget\\packages\\microsoft.visualstudio.azure.containers.tools.targets\\1.18.1\\microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512",
"C:\\Users\\callm\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
"C:\\Users\\callm\\.nuget\\packages\\swashbuckle.aspnetcore\\6.0.0\\swashbuckle.aspnetcore.6.0.0.nupkg.sha512",
"C:\\Users\\callm\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.0.0\\swashbuckle.aspnetcore.swagger.6.0.0.nupkg.sha512",