dev #15

Merged
qxa merged 3 commits from dev into staging 2024-04-18 13:35:52 +08:00
8 changed files with 34 additions and 26 deletions

View File

@ -48,6 +48,7 @@ jobs:
OWNER=${{ gitea.repository_owner }} OWNER=${{ gitea.repository_owner }}
TAG=${{ gitea.ref_name }} TAG=${{ gitea.ref_name }}
ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }} ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
replicas=1
run: | run: |
echo "$env_file">.env echo "$env_file">.env
@ -59,7 +60,7 @@ jobs:
username: ${{ secrets.PUBLISH_USER_NAME }} username: ${{ secrets.PUBLISH_USER_NAME }}
password: ${{ secrets.PUBLISH_PASSWORD }} password: ${{ secrets.PUBLISH_PASSWORD }}
target: ${{ env.PUBLISH_PATH }} target: ${{ env.PUBLISH_PATH }}
source: docker-compose.yaml,.env source: docker-swarm.yaml,.env
- name: 部署到服务器 - name: 部署到服务器
uses: docker://appleboy/drone-ssh uses: docker://appleboy/drone-ssh
@ -74,7 +75,7 @@ jobs:
[ -f .env ] && export $(sed '/^#/d' .env) [ -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: 发送构建通知 - name: 发送构建通知
if: ${{ always() }} if: ${{ always() }}

View File

@ -48,6 +48,7 @@ jobs:
OWNER=${{ gitea.repository_owner }} OWNER=${{ gitea.repository_owner }}
TAG=${{ gitea.ref_name }} TAG=${{ gitea.ref_name }}
ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }} ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
replicas=8
run: | run: |
echo "$env_file">.env echo "$env_file">.env
@ -59,7 +60,7 @@ jobs:
username: ${{ secrets.PUBLISH_USER_NAME }} username: ${{ secrets.PUBLISH_USER_NAME }}
password: ${{ secrets.PUBLISH_PASSWORD }} password: ${{ secrets.PUBLISH_PASSWORD }}
target: ${{ env.PUBLISH_PATH }} target: ${{ env.PUBLISH_PATH }}
source: docker-compose.yaml,.env source: docker-swarm.yaml,.env
- name: 部署到服务器 - name: 部署到服务器
uses: docker://appleboy/drone-ssh uses: docker://appleboy/drone-ssh
@ -74,7 +75,7 @@ jobs:
[ -f .env ] && export $(sed '/^#/d' .env) [ -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: 发送构建通知 - name: 发送构建通知
if: ${{ always() }} if: ${{ always() }}

View File

@ -445,6 +445,7 @@ public class ExamManager : DomainService, IExamManager
catch (Exception ex) catch (Exception ex)
{ {
Logger.LogError("{ExamSubjectId} {penSerial} 收集失败! {error}", eto.ExamSubjectId, penSerial, ex); Logger.LogError("{ExamSubjectId} {penSerial} 收集失败! {error}", eto.ExamSubjectId, penSerial, ex);
await NotifyExt.DingTalk($"{eto.ExamSubjectId} {penSerial} 收集失败! 异常:{ex.Message}");
} }
finally finally
{ {

View File

@ -1,4 +1,5 @@
using Dolphin.ExamPictureCut.Exams; using Dolphin.ExamPictureCut.Exams;
using Dolphin.ExamPictureCut.Extensions;
namespace Dolphin.ExamPictureCut.Services; 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 }); 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"} 收集失败! 异常: {""}");
}
} }

View File

@ -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();
}
}

View File

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

View File

@ -1,20 +0,0 @@
<?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>

View File

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