From 4cc1f472e9f0058112d8498352e339ffaa4ba92e Mon Sep 17 00:00:00 2001 From: qxa Date: Fri, 29 Mar 2024 18:32:07 +0800 Subject: [PATCH 1/5] 1 --- .gitea/workflows/push-master.yaml | 10 +++++----- .gitea/workflows/release-version.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/push-master.yaml b/.gitea/workflows/push-master.yaml index 37d3760..0b52f0a 100644 --- a/.gitea/workflows/push-master.yaml +++ b/.gitea/workflows/push-master.yaml @@ -40,11 +40,11 @@ jobs: cd D:/marking.cut.service/publish - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30000" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30001" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30002" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30003" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30004" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30000" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30001" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30002" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30003" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30004" steps: - name: 下载源码 diff --git a/.gitea/workflows/release-version.yaml b/.gitea/workflows/release-version.yaml index 9a30b8b..0bd6372 100644 --- a/.gitea/workflows/release-version.yaml +++ b/.gitea/workflows/release-version.yaml @@ -27,11 +27,11 @@ jobs: cd D:/marking.cut.service/publish - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30000" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30001" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30002" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30003" - start Dolphin.ExamPictureCut.HttpApi.Host --URLS="http://*:30004" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30000" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30001" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30002" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30003" + start Dolphin.ExamPictureCut.HttpApi.Host.exe --URLS="http://*:30004" steps: - name: 下载源码 From 0005e17b3b832b5def1d91f532255e85273eb0bc Mon Sep 17 00:00:00 2001 From: lyndonliu Date: Mon, 1 Apr 2024 17:51:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=BC=82=E5=B8=B8=E9=92=89=E9=92=89?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exams/ExamManager.cs | 1 + .../Services/ExamAppService.cs | 6 ++++++ .../Extensions/NotifyExt.cs | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 Dolphin.ExamPictureCut.Core/Extensions/NotifyExt.cs diff --git a/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs b/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs index 7464b60..abb8e72 100644 --- a/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs +++ b/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs @@ -445,6 +445,7 @@ public class ExamManager : DomainService, IExamManager catch (Exception ex) { Logger.LogError("{ExamSubjectId} {penSerial} 收集失败! {error}", eto.ExamSubjectId, penSerial, ex); + await NotifyExt.DingTalk($"{eto.ExamSubjectId} {penSerial} 收集失败! 异常：{ex.Message}"); } finally { diff --git a/Dolphin.ExamPictureCut.Application/Services/ExamAppService.cs b/Dolphin.ExamPictureCut.Application/Services/ExamAppService.cs index 8756216..7650ee7 100644 --- a/Dolphin.ExamPictureCut.Application/Services/ExamAppService.cs +++ b/Dolphin.ExamPictureCut.Application/Services/ExamAppService.cs @@ -1,4 +1,5 @@ using Dolphin.ExamPictureCut.Exams; +using Dolphin.ExamPictureCut.Extensions; namespace Dolphin.ExamPictureCut.Services; @@ -14,4 +15,9 @@ public class ExamAppService : DolphinAppService { await _examManager.ExamStudentGather(new() { SchoolId = 3, StudentExamNum = "BP2-3G3-07K-C1", BookId = 529493484986437, ExamSubjectSchoolId = 530151338438726, ExamSubjectId = 530151329325125, LastCollectTime = DateTime.Now }); } + + public async Task NotifyTest() + { + await NotifyExt.DingTalk($"{530151329325125} {"BP2-3G3-07K-C1"} 收集失败! 异常： {"通知测试"}"); + } } diff --git a/Dolphin.ExamPictureCut.Core/Extensions/NotifyExt.cs b/Dolphin.ExamPictureCut.Core/Extensions/NotifyExt.cs new file mode 100644 index 0000000..c95635c --- /dev/null +++ b/Dolphin.ExamPictureCut.Core/Extensions/NotifyExt.cs @@ -0,0 +1,19 @@ +using Flurl.Http; + +namespace Dolphin.ExamPictureCut.Extensions; + +public class NotifyExt +{ + public static async Task DingTalk(string text) + { + await "https://oapi.dingtalk.com/robot/send?access_token=6ddafcada8f44f4bad4a7314c4d9bd19a895ded0a1ba1afdaff5dd01a5af6781".PostJsonAsync(new + { + msgtype = "markdown", + markdown = new + { + title = "异常通知", + text = $"dotpan,{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}异常\n > 来源:Dplphin.ExamPictureCut\n > 详情:" + text, + } + }).ReceiveString(); + } +} From 111b94f9d85100cfb873246b15497e96d4574bde Mon Sep 17 00:00:00 2001 From: qxa Date: Thu, 18 Apr 2024 11:33:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/push-dev.yaml | 5 +++-- .gitea/workflows/push-staging.yaml | 5 +++-- .../Dockerfile | 2 +- .../web.config | 20 ------------------- docker-compose.yaml => docker-swarm.yaml | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 Dolphin.ExamPictureCut.HttpApi.Host/web.config rename docker-compose.yaml => docker-swarm.yaml (91%) diff --git a/.gitea/workflows/push-dev.yaml b/.gitea/workflows/push-dev.yaml index 084ef00..18e6d12 100644 --- a/.gitea/workflows/push-dev.yaml +++ b/.gitea/workflows/push-dev.yaml @@ -48,6 +48,7 @@ jobs: OWNER=${{ gitea.repository_owner }} TAG=${{ gitea.ref_name }} ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }} + replicas=1 run: | echo "$env_file">.env @@ -59,7 +60,7 @@ jobs: username: ${{ secrets.PUBLISH_USER_NAME }} password: ${{ secrets.PUBLISH_PASSWORD }} target: ${{ env.PUBLISH_PATH }} - source: docker-compose.yaml,.env + source: docker-swarm.yaml,.env - name: 部署到服务器 uses: docker://appleboy/drone-ssh @@ -74,7 +75,7 @@ jobs: [ -f .env ] && export $(sed '/^#/d' .env) - docker stack deploy -c docker-compose.yaml --with-registry-auth mk + docker stack deploy -c docker-swarm.yaml --with-registry-auth mk - name: 发送构建通知 if: ${{ always() }} diff --git a/.gitea/workflows/push-staging.yaml b/.gitea/workflows/push-staging.yaml index 19c5179..5aa9e79 100644 --- a/.gitea/workflows/push-staging.yaml +++ b/.gitea/workflows/push-staging.yaml @@ -48,6 +48,7 @@ jobs: OWNER=${{ gitea.repository_owner }} TAG=${{ gitea.ref_name }} ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }} + replicas=8 run: | echo "$env_file">.env @@ -59,7 +60,7 @@ jobs: username: ${{ secrets.PUBLISH_USER_NAME }} password: ${{ secrets.PUBLISH_PASSWORD }} target: ${{ env.PUBLISH_PATH }} - source: docker-compose.yaml,.env + source: docker-swarm.yaml,.env - name: 部署到服务器 uses: docker://appleboy/drone-ssh @@ -74,7 +75,7 @@ jobs: [ -f .env ] && export $(sed '/^#/d' .env) - docker stack deploy -c docker-compose.yaml --with-registry-auth mk + docker stack deploy -c docker-swarm.yaml --with-registry-auth mk - name: 发送构建通知 if: ${{ always() }} diff --git a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile index 7e9c175..41d774d 100644 --- a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile +++ b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 +FROM dotnet/aspnet:8.0 ENV TZ=Asia/Shanghai \ DEBIAN_FRONTEND=noninteractive diff --git a/Dolphin.ExamPictureCut.HttpApi.Host/web.config b/Dolphin.ExamPictureCut.HttpApi.Host/web.config deleted file mode 100644 index 050e7f2..0000000 --- a/Dolphin.ExamPictureCut.HttpApi.Host/web.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/docker-compose.yaml b/docker-swarm.yaml similarity index 91% rename from docker-compose.yaml rename to docker-swarm.yaml index 8b74a02..40cd337 100644 --- a/docker-compose.yaml +++ b/docker-swarm.yaml @@ -12,4 +12,4 @@ services: # - 9925:80 deploy: mode: replicated - replicas: 1 + replicas: ${replicas:-1} From ac3b9c82f103a7d38216ee9dc1c186b49db80f7c Mon Sep 17 00:00:00 2001 From: qxa Date: Thu, 18 Apr 2024 15:30:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/push-dev.yaml | 1 + .gitea/workflows/push-master.yaml | 1 + .gitea/workflows/push-staging.yaml | 1 + .gitea/workflows/release-version.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/.gitea/workflows/push-dev.yaml b/.gitea/workflows/push-dev.yaml index 18e6d12..fca939b 100644 --- a/.gitea/workflows/push-dev.yaml +++ b/.gitea/workflows/push-dev.yaml @@ -94,6 +94,7 @@ jobs: >**代码分支**: ${{ gitea.ref_name }} >**提交标识**: ${{ gitea.sha }} >**提交发起**: ${{ gitea.actor }} + >**提交信息**: ${{ gitea.event.head_commit.message }}\n " } } diff --git a/.gitea/workflows/push-master.yaml b/.gitea/workflows/push-master.yaml index 0b52f0a..d25da41 100644 --- a/.gitea/workflows/push-master.yaml +++ b/.gitea/workflows/push-master.yaml @@ -135,6 +135,7 @@ jobs: >**代码分支**: ${{ gitea.ref_name }} >**提交标识**: ${{ gitea.sha }} >**提交发起**: ${{ gitea.actor }} + >**提交信息**: ${{ gitea.event.head_commit.message }}\n " } } diff --git a/.gitea/workflows/push-staging.yaml b/.gitea/workflows/push-staging.yaml index 5aa9e79..0e5ab47 100644 --- a/.gitea/workflows/push-staging.yaml +++ b/.gitea/workflows/push-staging.yaml @@ -94,6 +94,7 @@ jobs: >**代码分支**: ${{ gitea.ref_name }} >**提交标识**: ${{ gitea.sha }} >**提交发起**: ${{ gitea.actor }} + >**提交信息**: ${{ gitea.event.head_commit.message }}\n " } } diff --git a/.gitea/workflows/release-version.yaml b/.gitea/workflows/release-version.yaml index 0bd6372..c666bd5 100644 --- a/.gitea/workflows/release-version.yaml +++ b/.gitea/workflows/release-version.yaml @@ -132,6 +132,7 @@ jobs: >**代码分支**: ${{ gitea.ref_name }} >**提交标识**: ${{ gitea.sha }} >**提交发起**: ${{ gitea.actor }} + >**提交信息**: ${{ gitea.event.release.target_commitish }}\n " } } From 072ffebfbcad31f423a4638ed0f279c6966bbaa4 Mon Sep 17 00:00:00 2001 From: lyndonliu Date: Fri, 17 May 2024 09:48:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=AC=94=E8=BF=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs b/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs index abb8e72..efb52e0 100644 --- a/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs +++ b/Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs @@ -391,8 +391,6 @@ public class ExamManager : DomainService, IExamManager var skPointMode = SKPointMode.Polygon; if (points.Length == 1) skPointMode = SKPointMode.Points; - else if (points.Length == 2) - skPointMode = SKPointMode.Lines; canvas.DrawPoints(skPointMode, points, skPaint); }