Compare commits
No commits in common. "cf8e8b9fc3f5ca226956fd296aeb93a25cb11ce4" and "56f9f61400927b024a1dc05e45014182e8f1c737" have entirely different histories.
cf8e8b9fc3
...
56f9f61400
|
|
@ -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
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ jobs:
|
|||
|
||||
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"
|
||||
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"
|
||||
|
||||
steps:
|
||||
- name: 下载源码
|
||||
|
|
@ -135,7 +135,6 @@ jobs:
|
|||
>**代码分支**: ${{ gitea.ref_name }}
|
||||
>**提交标识**: ${{ gitea.sha }}
|
||||
>**提交发起**: ${{ gitea.actor }}
|
||||
>**提交信息**: ${{ gitea.event.head_commit.message }}\n
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ jobs:
|
|||
|
||||
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"
|
||||
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"
|
||||
|
||||
steps:
|
||||
- name: 下载源码
|
||||
|
|
@ -132,7 +132,6 @@ jobs:
|
|||
>**代码分支**: ${{ gitea.ref_name }}
|
||||
>**提交标识**: ${{ gitea.sha }}
|
||||
>**提交发起**: ${{ gitea.actor }}
|
||||
>**提交信息**: ${{ gitea.event.release.target_commitish }}\n
|
||||
"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -443,7 +445,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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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"} 收集失败! 异常： {"通知测试"}");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM dotnet/aspnet:8.0
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||
|
||||
ENV TZ=Asia/Shanghai \
|
||||
DEBIAN_FRONTEND=noninteractive
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
||||
|
|
@ -12,4 +12,4 @@ services:
|
|||
# - 9925:80
|
||||
deploy:
|
||||
mode: replicated
|
||||
replicas: ${replicas:-1}
|
||||
replicas: 1
|
||||
Loading…
Reference in New Issue