全部框架升级3.1

AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj

@@ -2,13 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <NoWin32Manifest>true</NoWin32Manifest>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
   </ItemGroup>
 
   <ItemGroup>

AutoGeneratePurchaseAdvise/Dockerfile

-FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:3.1 AS base
 WORKDIR /app
 RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
-COPY AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj AutoGeneratePurchaseAdvise/
-COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
-COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
-COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
-COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
-RUN dotnet restore AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj
+COPY ["AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj", "AutoGeneratePurchaseAdvise/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
+RUN dotnet restore "AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj"
 COPY . .
-WORKDIR /src/AutoGeneratePurchaseAdvise
-RUN dotnet build AutoGeneratePurchaseAdvise.csproj -c Release -o /app
+WORKDIR "/src/AutoGeneratePurchaseAdvise"
+RUN dotnet build "AutoGeneratePurchaseAdvise.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish AutoGeneratePurchaseAdvise.csproj -c Release -o /app
+RUN dotnet publish "AutoGeneratePurchaseAdvise.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "AutoGeneratePurchaseAdvise.dll"]
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoGeneratePurchaseAdvise.dll"]
\ No newline at end of file

AutoGeneratePurchaseAdvise/Dockerfile.original

+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
+
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+WORKDIR /src
+COPY AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj AutoGeneratePurchaseAdvise/
+COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
+COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
+COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
+COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
+RUN dotnet restore AutoGeneratePurchaseAdvise/AutoGeneratePurchaseAdvise.csproj
+COPY . .
+WORKDIR /src/AutoGeneratePurchaseAdvise
+RUN dotnet build AutoGeneratePurchaseAdvise.csproj -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish AutoGeneratePurchaseAdvise.csproj -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "AutoGeneratePurchaseAdvise.dll"]

AutoGeneratePurchaseAdvise/Properties/launchSettings.json

@@ -5,6 +5,9 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "dev"
       }
+    },
+    "Docker": {
+      "commandName": "Docker"
     }
   }
 }
\ No newline at end of file

AutoTurnOver.DB/AutoTurnOver.DB.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 

AutoTurnOver.DownloadService/AutoTurnOver.DownloadService.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>

AutoTurnOver.DownloadService/Dockerfile

 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/runtime:2.1 AS base
+FROM mcr.microsoft.com/dotnet/runtime:3.1 AS base
 WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-EXPOSE 80
-EXPOSE 443
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-# RUN ln -s /lib/x86_64-linux-gnu/libdl-2.24.so /lib/x86_64-linux-gnu/libdl.so
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends libgdiplus libc6-dev 
-
-FROM mcr.microsoft.com/dotnet/sdk:2.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
 COPY ["AutoTurnOver.DownloadService/AutoTurnOver.DownloadService.csproj", "AutoTurnOver.DownloadService/"]
 COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
 COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
 COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
 COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
 RUN dotnet restore "AutoTurnOver.DownloadService/AutoTurnOver.DownloadService.csproj"
 COPY . .
 WORKDIR "/src/AutoTurnOver.DownloadService"

AutoTurnOver.DownloadService/Dockerfile1.original

+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:2.1 AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+EXPOSE 80
+EXPOSE 443
+
+# RUN ln -s /lib/x86_64-linux-gnu/libdl-2.24.so /lib/x86_64-linux-gnu/libdl.so
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends libgdiplus libc6-dev 
+
+FROM mcr.microsoft.com/dotnet/sdk:2.1 AS build
+WORKDIR /src
+COPY ["AutoTurnOver.DownloadService/AutoTurnOver.DownloadService.csproj", "AutoTurnOver.DownloadService/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+RUN dotnet restore "AutoTurnOver.DownloadService/AutoTurnOver.DownloadService.csproj"
+COPY . .
+WORKDIR "/src/AutoTurnOver.DownloadService"
+RUN dotnet build "AutoTurnOver.DownloadService.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "AutoTurnOver.DownloadService.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoTurnOver.DownloadService.dll"]
\ No newline at end of file

AutoTurnOver.Models/AutoTurnOver.Models.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 

AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj

@@ -2,14 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
   </ItemGroup>
 
   <ItemGroup>

AutoTurnOver.Purchase.AverageTarget/Dockerfile

-FROM microsoft/dotnet:2.1-runtime-alpine AS base
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:3.1 AS base
 WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-FROM microsoft/dotnet:2.1-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
-COPY AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj AutoTurnOver.Purchase.AverageTarget/
-COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
-COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
-COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
-COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
-RUN dotnet restore AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj
+COPY ["AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj", "AutoTurnOver.Purchase.AverageTarget/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
+RUN dotnet restore "AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj"
 COPY . .
-WORKDIR /src/AutoTurnOver.Purchase.AverageTarget
-RUN dotnet build AutoTurnOver.Purchase.AverageTarget.csproj -c Release -o /app
+WORKDIR "/src/AutoTurnOver.Purchase.AverageTarget"
+RUN dotnet build "AutoTurnOver.Purchase.AverageTarget.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish AutoTurnOver.Purchase.AverageTarget.csproj -c Release -o /app
+RUN dotnet publish "AutoTurnOver.Purchase.AverageTarget.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "AutoTurnOver.Purchase.AverageTarget.dll"]
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoTurnOver.Purchase.AverageTarget.dll"]
\ No newline at end of file

AutoTurnOver.Purchase.AverageTarget/Dockerfile.original

+FROM microsoft/dotnet:2.1-runtime-alpine AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+FROM microsoft/dotnet:2.1-sdk-alpine AS build
+WORKDIR /src
+COPY AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj AutoTurnOver.Purchase.AverageTarget/
+COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
+COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
+COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
+COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
+RUN dotnet restore AutoTurnOver.Purchase.AverageTarget/AutoTurnOver.Purchase.AverageTarget.csproj
+COPY . .
+WORKDIR /src/AutoTurnOver.Purchase.AverageTarget
+RUN dotnet build AutoTurnOver.Purchase.AverageTarget.csproj -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish AutoTurnOver.Purchase.AverageTarget.csproj -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "AutoTurnOver.Purchase.AverageTarget.dll"]

AutoTurnOver.Purchase.AverageTarget/Properties/launchSettings.json

@@ -5,6 +5,9 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "dev"
       }
+    },
+    "Docker": {
+      "commandName": "Docker"
     }
   }
 }
\ No newline at end of file

AutoTurnOver.Services/AutoTurnOver.Services.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 

AutoTurnOver.Utility/AutoTurnOver.Utility.csproj

 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 

AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj

@@ -2,11 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
 	</ItemGroup>
 
 	<ItemGroup>

AutoTurnOver.WeeklyStatistics/Dockerfile

-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:3.1 AS base
 WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-FROM microsoft/dotnet:2.1-sdk-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
-COPY AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj AutoTurnOver.WeeklyStatistics/
-COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
-COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
-COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
-COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
-RUN dotnet restore AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj
+COPY ["AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj", "AutoTurnOver.WeeklyStatistics/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
+RUN dotnet restore "AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj"
 COPY . .
-WORKDIR /src/AutoTurnOver.WeeklyStatistics
-RUN dotnet build AutoTurnOver.WeeklyStatistics.csproj -c Release -o /app
+WORKDIR "/src/AutoTurnOver.WeeklyStatistics"
+RUN dotnet build "AutoTurnOver.WeeklyStatistics.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish AutoTurnOver.WeeklyStatistics.csproj -c Release -o /app
+RUN dotnet publish "AutoTurnOver.WeeklyStatistics.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "AutoTurnOver.WeeklyStatistics.dll"]
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoTurnOver.WeeklyStatistics.dll"]
\ No newline at end of file

AutoTurnOver.WeeklyStatistics/Dockerfile.original

+FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+FROM microsoft/dotnet:2.1-sdk-alpine AS build
+WORKDIR /src
+COPY AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj AutoTurnOver.WeeklyStatistics/
+COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
+COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
+COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
+COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
+RUN dotnet restore AutoTurnOver.WeeklyStatistics/AutoTurnOver.WeeklyStatistics.csproj
+COPY . .
+WORKDIR /src/AutoTurnOver.WeeklyStatistics
+RUN dotnet build AutoTurnOver.WeeklyStatistics.csproj -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish AutoTurnOver.WeeklyStatistics.csproj -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "AutoTurnOver.WeeklyStatistics.dll"]

AutoTurnOver.WeeklyStatistics/Properties/launchSettings.json

+{
+  "profiles": {
+    "AutoTurnOver.WeeklyStatistics": {
+      "commandName": "Project"
+    },
+    "Docker": {
+      "commandName": "Docker"
+    }
+  }
+}
\ No newline at end of file

AutoTurnOver/AutoTurnOver.csproj

 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <UserSecretsId>aa5d859c-e942-4964-9437-3587e8faaa42</UserSecretsId>
     <ServerGarbageCollection>false</ServerGarbageCollection>

AutoTurnOver/Dockerfile

 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base
 WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
 COPY ["AutoTurnOver/AutoTurnOver.csproj", "AutoTurnOver/"]
 COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
 COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
 COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
 COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
 RUN dotnet restore "AutoTurnOver/AutoTurnOver.csproj"
 COPY . .
 WORKDIR "/src/AutoTurnOver"

AutoTurnOver/Dockerfile.original

+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+WORKDIR /src
+COPY ["AutoTurnOver/AutoTurnOver.csproj", "AutoTurnOver/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+RUN dotnet restore "AutoTurnOver/AutoTurnOver.csproj"
+COPY . .
+WORKDIR "/src/AutoTurnOver"
+RUN dotnet build "AutoTurnOver.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "AutoTurnOver.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoTurnOver.dll"]
\ No newline at end of file

AutoTurnOver/Dockerfile1.original

+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+WORKDIR /src
+COPY ["AutoTurnOver/AutoTurnOver.csproj", "AutoTurnOver/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
+RUN dotnet restore "AutoTurnOver/AutoTurnOver.csproj"
+COPY . .
+WORKDIR "/src/AutoTurnOver"
+RUN dotnet build "AutoTurnOver.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "AutoTurnOver.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AutoTurnOver.dll"]
\ No newline at end of file

AutoTurnOver/appsettings.Production.json

@@ -47,7 +47,7 @@
   "PostPlatCategoryRate": "http://172.31.255.11/api/platfee/ProfitPlatfee/PostPlatCategoryRate",
   "api_plat_category": "http://doc.bailuntec.com:6040/profitplatfee/getplatcategory",
   "BrowseLogSetting": {
-    "Url": "http://10.0.0.11:5001/operationloginfo/addoperationloginfo",
+    "Url": "http://security-authorize-admin.default/operationloginfo/addoperationloginfo",
     "CanLog": "yes"
   },
   "SupplierReturnSkuInfo": "http://pps.bailuntec.com/distributionapi/Manager/SupplierReturnSkuInfo/InsertReturnSkuInfo",

ShortagePush/Dockerfile

-FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:3.1 AS base
 WORKDIR /app
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone 
 
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
 WORKDIR /src
-COPY ShortagePush/ShortagePush.csproj ShortagePush/
-COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
-COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
-COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
-COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
-RUN dotnet restore ShortagePush/ShortagePush.csproj
+COPY ["ShortagePush/ShortagePush.csproj", "ShortagePush/"]
+COPY ["AutoTurnOver.Services/AutoTurnOver.Services.csproj", "AutoTurnOver.Services/"]
+COPY ["AutoTurnOver.DB/AutoTurnOver.DB.csproj", "AutoTurnOver.DB/"]
+COPY ["AutoTurnOver.Utility/AutoTurnOver.Utility.csproj", "AutoTurnOver.Utility/"]
+COPY ["AutoTurnOver.Models/AutoTurnOver.Models.csproj", "AutoTurnOver.Models/"]
+COPY ["FikaAmazonAPI/FikaAmazonAPI.csproj", "FikaAmazonAPI/"]
+RUN dotnet restore "ShortagePush/ShortagePush.csproj"
 COPY . .
-WORKDIR /src/ShortagePush
-RUN dotnet build ShortagePush.csproj -c Release -o /app
+WORKDIR "/src/ShortagePush"
+RUN dotnet build "ShortagePush.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish ShortagePush.csproj -c Release -o /app
+RUN dotnet publish "ShortagePush.csproj" -c Release -o /app/publish
 
 FROM base AS final
 WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "ShortagePush.dll"]
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "ShortagePush.dll"]
\ No newline at end of file

ShortagePush/Dockerfile.original

+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build
+WORKDIR /src
+COPY ShortagePush/ShortagePush.csproj ShortagePush/
+COPY AutoTurnOver.Services/AutoTurnOver.Services.csproj AutoTurnOver.Services/
+COPY AutoTurnOver.DB/AutoTurnOver.DB.csproj AutoTurnOver.DB/
+COPY AutoTurnOver.Utility/AutoTurnOver.Utility.csproj AutoTurnOver.Utility/
+COPY AutoTurnOver.Models/AutoTurnOver.Models.csproj AutoTurnOver.Models/
+RUN dotnet restore ShortagePush/ShortagePush.csproj
+COPY . .
+WORKDIR /src/ShortagePush
+RUN dotnet build ShortagePush.csproj -c Release -o /app
+
+FROM build AS publish
+RUN dotnet publish ShortagePush.csproj -c Release -o /app
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app .
+ENTRYPOINT ["dotnet", "ShortagePush.dll"]

ShortagePush/Properties/launchSettings.json

+{
+  "profiles": {
+    "ShortagePush": {
+      "commandName": "Project"
+    },
+    "Docker": {
+      "commandName": "Docker"
+    }
+  }
+}
\ No newline at end of file

ShortagePush/ShortagePush.csproj

@@ -2,12 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
   </ItemGroup>
 
   <ItemGroup>