From 4d4f9897b1160d92ed188a844941f8348700a1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Fri, 15 Oct 2021 08:54:04 +0000 Subject: [PATCH 1/2] =?UTF-8?q?!155=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9cropperImg.js=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E5=AF=BC=E8=87=B4linux=E4=B8=8B404=E9=97=AE=E9=A2=98=20*=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0cropperImg.js=20*=20=E5=88=A0=E9=99=A4cropper?= =?UTF-8?q?Img.js=E6=96=87=E4=BB=B6=20*=20=E4=BF=AE=E6=94=B9cropperImg.js?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98=20*=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Repository/User/CoreCmsUserShipRepository.cs | 2 +- CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj | 1 - .../lib/layuiAdmin/controller/{CropperImg.js => cropperImg.js} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/controller/{CropperImg.js => cropperImg.js} (100%) diff --git a/CoreCms.Net.Repository/User/CoreCmsUserShipRepository.cs b/CoreCms.Net.Repository/User/CoreCmsUserShipRepository.cs index b1f49f9..02edc97 100644 --- a/CoreCms.Net.Repository/User/CoreCmsUserShipRepository.cs +++ b/CoreCms.Net.Repository/User/CoreCmsUserShipRepository.cs @@ -85,7 +85,7 @@ namespace CoreCms.Net.Repository } //事物处理过程结束 - var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync(); + var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync(); jm.code = bl ? 0 : 1; jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 78fed1c..7c65b2e 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -189,7 +189,6 @@ - diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/controller/CropperImg.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/controller/cropperImg.js similarity index 100% rename from CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/controller/CropperImg.js rename to CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/controller/cropperImg.js -- Gitee From 6421892e03103b3825e384148ab01a93690a18ed Mon Sep 17 00:00:00 2001 From: wangqi <122058662@qq.com> Date: Tue, 19 Oct 2021 15:58:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Lunix=20docker=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E5=90=8Ehttp://=E5=9F=9F=E5=90=8D/api/Tools/?= =?UTF-8?q?UploadFilesFByBase64=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=9B=A0=E5=AE=B9=E5=99=A8=E4=B8=AD=E7=BC=BA=E5=B0=91libgdiplu?= =?UTF-8?q?s=20=E5=BA=93=E5=AF=BC=E8=87=B4502=20bad=20gateway=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Web.Admin/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CoreCms.Net.Web.Admin/Dockerfile b/CoreCms.Net.Web.Admin/Dockerfile index 6e46781..4dcee07 100644 --- a/CoreCms.Net.Web.Admin/Dockerfile +++ b/CoreCms.Net.Web.Admin/Dockerfile @@ -1,5 +1,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:5.0 +RUN apt-get update && apt-get install -y libgdiplus + WORKDIR /app EXPOSE 80 -- Gitee