.gitea/workflows/push-dev.yaml

@@ -48,7 +48,6 @@ jobs:
             OWNER=${{ gitea.repository_owner }}
             TAG=${{ gitea.ref_name }}
             ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
-            replicas=1
         run: |
           echo "$env_file">.env
 
@@ -60,7 +59,7 @@ jobs:
           username: ${{ secrets.PUBLISH_USER_NAME }}
           password: ${{ secrets.PUBLISH_PASSWORD }}
           target: ${{ env.PUBLISH_PATH }}
-          source: docker-swarm.yaml,.env
+          source: docker-compose.yaml,.env
 
       - name: 部署到服务器
         uses: docker://appleboy/drone-ssh
@@ -75,7 +74,7 @@ jobs:
 
             [ -f .env ] && export $(sed '/^#/d' .env)
 
-            docker stack deploy -c docker-swarm.yaml --with-registry-auth mk
+            docker stack deploy -c docker-compose.yaml --with-registry-auth mk
 
       - name: 发送构建通知
         if: ${{ always() }}
@@ -94,7 +93,6 @@ jobs:
                         >**代码分支**: ${{ gitea.ref_name }}
                         >**提交标识**: ${{ gitea.sha }}
                         >**提交发起**: ${{ gitea.actor }}
-                        >**提交信息**: ${{ gitea.event.head_commit.message }}\n
                       "
                 }
             }

.gitea/workflows/push-master.yaml

@@ -30,31 +30,27 @@ jobs:
     name: 编译发布
     runs-on: linux
     needs: release
+    env:
+      version: ${{ needs.release.outputs.version }}
     container:
       image: node:16-bullseye
       volumes:
         - /opt/.runner/nuget_packages:/root/.nuget/packages
 
-    env:
-      run_cmd: |
-
-        cd D:/marking.cut.service/publish
-
-        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: 下载源码
         uses: actions/checkout@v3
 
+      - name: 使用缓存
+        uses: actions/cache@master
+        with:
+          mount: |
+            node_modules
+
       - name: 编译后端
         uses: actions/aspnet@8.0
         with:
           project_name: ${{ env.PROJECT_NAME }}
-          os: win
 
       - name: 打包压缩
         run: |
@@ -89,12 +85,7 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
-
-            echo "${{ env.run_cmd }}"
-            echo "${{ env.run_cmd }}"> publish/run.cmd
-
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 启动生产环境106
         uses: docker://appleboy/drone-ssh
@@ -111,12 +102,7 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
-
-            echo "${{ env.run_cmd }}"
-            echo "${{ env.run_cmd }}"> publish/run.cmd
-
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 发送构建通知
         if: ${{ always() }}
@@ -135,7 +121,6 @@ jobs:
                         >**代码分支**: ${{ gitea.ref_name }}
                         >**提交标识**: ${{ gitea.sha }}
                         >**提交发起**: ${{ gitea.actor }}
-                        >**提交信息**: ${{ gitea.event.head_commit.message }}\n
                       "
                 }
             }

.gitea/workflows/push-staging.yaml

@@ -48,7 +48,6 @@ jobs:
             OWNER=${{ gitea.repository_owner }}
             TAG=${{ gitea.ref_name }}
             ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
-            replicas=8
         run: |
           echo "$env_file">.env
 
@@ -60,7 +59,7 @@ jobs:
           username: ${{ secrets.PUBLISH_USER_NAME }}
           password: ${{ secrets.PUBLISH_PASSWORD }}
           target: ${{ env.PUBLISH_PATH }}
-          source: docker-swarm.yaml,.env
+          source: docker-compose.yaml,.env
 
       - name: 部署到服务器
         uses: docker://appleboy/drone-ssh
@@ -75,7 +74,7 @@ jobs:
 
             [ -f .env ] && export $(sed '/^#/d' .env)
 
-            docker stack deploy -c docker-swarm.yaml --with-registry-auth mk
+            docker stack deploy -c docker-compose.yaml --with-registry-auth mk
 
       - name: 发送构建通知
         if: ${{ always() }}
@@ -94,7 +93,6 @@ jobs:
                         >**代码分支**: ${{ gitea.ref_name }}
                         >**提交标识**: ${{ gitea.sha }}
                         >**提交发起**: ${{ gitea.actor }}
-                        >**提交信息**: ${{ gitea.event.head_commit.message }}\n
                       "
                 }
             }

.gitea/workflows/release-version.yaml

@@ -22,17 +22,6 @@ jobs:
       volumes:
         - /opt/.runner/nuget_packages:/root/.nuget/packages
 
-    env:
-      run_cmd: |
-
-        cd D:/marking.cut.service/publish
-
-        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: 下载源码
         uses: actions/checkout@v3
@@ -41,17 +30,16 @@ jobs:
         uses: actions/aspnet@8.0
         with:
           project_name: ${{ env.PROJECT_NAME }}
-          os: win
 
-      # - name: 打包上传镜像
+      - name: 打包上传镜像
-      #   uses: actions/docker@master
+        uses: actions/docker@master
-      #   with:
+        with:
-      #     registry: ${{ secrets.DOCKER_REGISTRY }}
+          registry: ${{ secrets.DOCKER_REGISTRY }}
-      #     username: ${{ secrets.DOCKER_USERNAME }}
+          username: ${{ secrets.DOCKER_USERNAME }}
-      #     password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
-      #     image: ${{ env.IMAGE_NAME }}
+          image: ${{ env.IMAGE_NAME }}
-      #     context: publish
+          context: publish
-      #     tags: latest,${{ gitea.ref_name }}
+          tags: latest,${{ gitea.ref_name }}
 
       - name: 打包压缩
         run: |
@@ -86,12 +74,7 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
-
-            echo "${{ env.run_cmd }}"
-            echo "${{ env.run_cmd }}"> publish/run.cmd
-
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 启动生产环境106
         uses: docker://appleboy/drone-ssh
@@ -108,12 +91,7 @@ jobs:
             rm -rf marking.cut.service.tar.gz
             curl -O https://static.w.23544.com:8843/marking/marking.cut.service.tar.gz
             tar -zxvf marking.cut.service.tar.gz
-            # curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
+            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/Dolphin.ExamPictureCut.HttpApi.Host.exe&count=2"
-
-            echo "${{ env.run_cmd }}"
-            echo "${{ env.run_cmd }}"> publish/run.cmd
-
-            curl "http://localhost:5244/publish/run?execPath=D:/marking.cut.service/publish/run.cmd&count=2"
 
       - name: 发送构建通知
         if: ${{ always() }}
@@ -132,7 +110,6 @@ jobs:
                         >**代码分支**: ${{ gitea.ref_name }}
                         >**提交标识**: ${{ gitea.sha }}
                         >**提交发起**: ${{ gitea.actor }}
-                        >**提交信息**: ${{ gitea.event.release.target_commitish }}\n
                       "
                 }
             }

Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs

@@ -105,7 +105,7 @@ public class ExamManager : DomainService, IExamManager
             }).ToListAsync();
 
         var gotoCount = 0;
-        dotPenOriginalImg:
+dotPenOriginalImg:
         var zgtSettingDtls = await DbBiz.Queryable<MarkingSettingSubjective>().Where(w => w.ExamSubjectId == eto.ExamSubjectId).ToListAsync();
 
         // 割原题
@@ -391,6 +391,8 @@ 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);
                         }
@@ -411,19 +413,11 @@ public class ExamManager : DomainService, IExamManager
                 await DbBiz.BeginTranAsync();
 
                 // 删除
-                var delObjectiveIds = await DbBiz.Queryable<MkExamResult>()
+                await DbBiz.Deleteable<MkExamResult>().Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial).ExecuteCommandAsync();
-                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial)
-                    .Select(s => s.Id).ToListAsync();
-                await DbBiz.Deleteable<MkExamResult>().Where(w => delObjectiveIds.Contains(w.Id)).ExecuteCommandAsync();
-
-                var delSubjectiveIds = await DbBiz.Queryable<SubjectiveMarkingResult>()
-                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
-                    .Select(s => s.Id).ToListAsync();
                 await DbBiz.Updateable<SubjectiveMarkingResult>()
                     .SetColumns(s => new SubjectiveMarkingResult { IsDeleted = true, UpdateDate = Clock.Now })
-                    .Where(w => delSubjectiveIds.Contains(w.Id))
+                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
                     .ExecuteCommandAsync();
-
                 // 新增
                 await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync();
                 await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync();
@@ -443,7 +437,6 @@ 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
         {

Dolphin.ExamPictureCut.Application/Services/ExamAppService.cs

@@ -1,5 +1,4 @@
 using Dolphin.ExamPictureCut.Exams;
-using Dolphin.ExamPictureCut.Extensions;
 
 namespace Dolphin.ExamPictureCut.Services;
 
@@ -15,9 +14,4 @@ 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"} 收集失败! 异常： {"通知测试"}");
-    }
 }

Dolphin.ExamPictureCut.Core/Extensions/NotifyExt.cs

@@ -1,19 +0,0 @@
-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();
-    }
-}

Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile

@@ -1,4 +1,7 @@
-FROM dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+
+ARG ASPNETCORE_ENVIRONMENT
+ENV ASPNETCORE_ENVIRONMENT ${ASPNETCORE_ENVIRONMENT}
 
 ENV TZ=Asia/Shanghai \
     DEBIAN_FRONTEND=noninteractive

Dolphin.ExamPictureCut.HttpApi.Host/DolphinExamPictureCutHttpApiHostModule.cs

@@ -63,7 +63,7 @@ public class DolphinExamPictureCutHttpApiHostModule : AbpModule
                 },
                 db =>
                 {
-                    //db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
+                    db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
 
                     var config = new SqlSugarConfig();
                     db.Aop.DataExecuting = config.DataExecuting(context.Services);

Dolphin.ExamPictureCut.HttpApi.Host/web.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <location path="." inheritInChildApplications="false">
+    <system.webServer>
+      <handlers>
+        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+      </handlers>
+      <aspNetCore processPath="dotnet" arguments=".\Dolphin.ExamPictureCut.HttpApi.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
+    </system.webServer>
+  </location>
+  <system.webServer>
+    <httpProtocol>
+      <customHeaders>
+        <remove name="x-powered-by" />
+      </customHeaders>
+    </httpProtocol>
+  </system.webServer>
+</configuration>
+
+

docker-compose.yaml

@@ -12,4 +12,4 @@ services:
     #   - 9925:80
     deploy:
       mode: replicated
-      replicas: ${replicas:-1}
+      replicas: 1