XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2026-02-09 20:58:46 -05:00
parent 369a0803f9 1f7b96d9f0
commit ee76366a1c
8 changed files with 148 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.API/appsettings.json
View File

@ -44,8 +44,10 @@
]
},
"WeComNoticeConfig": {
"IsOpenWeComNotice": true,
"WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
"NoticeUserList": [ "ZhouHang" ]
"APINoticeUserList": [ "ZhouHang" ],
"VueNoticeUserList": [ "wangxiaoshuang" ]
},
"IRaCISImageStore": {
"SwitchingMode": "RemainingDiskCapacity",

51
IRaCIS.Core.Application/BusinessFilter/LegacyController/ModelActionFilter .cs
View File

@ -1,18 +1,22 @@
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Helper.OtherTool;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Localization;
using Newtonsoft.Json;
using System;
using System.Reflection;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace IRaCIS.Core.Application.Filter;
public class ModelActionFilter(IStringLocalizer _localizer) : ActionFilterAttribute, IActionFilter
public class ModelActionFilter(IStringLocalizer _localizer, IConfiguration _config, IUserInfo _userInfo) : ActionFilterAttribute, IActionFilter
{
@ -27,6 +31,49 @@ public class ModelActionFilter(IStringLocalizer _localizer) : ActionFilterAttrib
.Select(e => e.ErrorMessage)
.ToArray();
var request = context.HttpContext.Request;
try
{
bool isOpenWeComNotice = _config.GetValue<bool>("WeComNoticeConfig:IsOpenWeComNotice");
if (isOpenWeComNotice)
{
string webhook = _config["WeComNoticeConfig:WebhookUrl"] ?? string.Empty;
var uri = new Uri(_config["SystemEmailSendConfig:SiteUrl"]);
var baseUrl = uri.GetLeftPart(UriPartial.Authority);
var userList = _config.GetSection("WeComNoticeConfig:VueNoticeUserList").Get<string[]>();
var requestBody = context.HttpContext.Items["RequestBody"] as string;
// 🔔 异步告警（不要阻塞请求）
_ = WeComNotifier.SendAlertAsync(
webhook: webhook,
alert: new WeComAlert
{
Env = baseUrl,
UserName = _userInfo.UserName.IsNotNullOrEmpty()? $"{_userInfo.UserName}({_userInfo.UserTypeShortName})": "匿名",
Api = $"{request.Method} {request.Path}",
Message = $"前端传递参数，后端模型验证失败\n 具体信息：{JsonConvert.SerializeObject(validationErrors)}",
JsonData = requestBody,
AtUsers = userList ?? []
}
);
}
}
catch (Exception ex)
{
Log.Logger.Error($"模型验证过滤器里发送企业微信出现错误：{ex.Message}");
}
//---提供给接口的参数无效。
context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject(validationErrors)));
}

24
IRaCIS.Core.Application/BusinessFilter/LegacyController/ProjectExceptionFilter.cs
View File

@ -52,21 +52,35 @@ public class ProjectExceptionFilter(ILogger<ProjectExceptionFilter> _logger, ISt
: (exception.Message + "Inner ExceptionMsg:" + exception.InnerException?.Message)), ApiResponseCodeEnum.ProgramException));
try
{
bool isOpenWeComNotice = _config.GetValue<bool>("WeComNoticeConfig:IsOpenWeComNotice");
if (isOpenWeComNotice)
{
string webhook = _config["WeComNoticeConfig:WebhookUrl"] ?? string.Empty;
var uri = new Uri(_config["SystemEmailSendConfig:SiteUrl"]);
var baseUrl = uri.GetLeftPart(UriPartial.Authority);
var userList = _config.GetSection("WeComNoticeConfig:NoticeUserList").Get<string[]>();
var userList = _config.GetSection("WeComNoticeConfig:APINoticeUserList").Get<string[]>();
var requestBody = context.HttpContext.Items["RequestBody"] as string;
var alert = new WeComAlert
{
Env = baseUrl,
UserName = $"{_userInfo.UserName}({_userInfo.UserTypeShortName})",
Api = context.HttpContext.Request.Path,
Message = exception.Message,
JsonData = requestBody,
Stack = exception.StackTrace,
AtUsers = userList ?? []
};
_ = WeComNotifier.SendAlertAsync(webhook, alert);
}
WeComNotifier.SendErrorAsync(webhook, baseUrl, $"{_userInfo.UserName}({_userInfo.UserTypeShortName})", context.HttpContext.Request.Path, requestBody, exception, userList).GetAwaiter().GetResult();
}
catch (Exception ex)
{

93
IRaCIS.Core.Application/Helper/OtherTool/WeComNotifier.cs
View File

@ -12,76 +12,87 @@ using IdentityModel;
namespace IRaCIS.Core.Application.Helper.OtherTool;
public class WeComAlert
{
public string Env { get; set; } = "";
public string UserName { get; set; } = "";
public string Api { get; set; } = "";
public string Message { get; set; } = "";
public string? JsonData { get; set; }
public string? Stack { get; set; }
public bool HasStack => !string.IsNullOrWhiteSpace(Stack);
public string[] AtUsers { get; set; } = [];
}
public static class WeComNotifier
{
public static async Task SendErrorAsync(string webhook, string env, string userName,string api,string json, Exception ex, params string[] atUsers)
public static async Task SendAlertAsync(string webhook, WeComAlert alert)
{
try
{
var client = new RestClient();
var request = new RestRequest(webhook, Method.Post);
string hostName = Dns.GetHostName();
string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var stack = ex.StackTrace ?? "无堆栈信息";
stack = stack.Replace("\n", "\n> "); // 每行变成引用，防止markdown断裂
// 处理 @
var atText = alert.AtUsers != null && alert.AtUsers.Any()
? string.Join("", alert.AtUsers.Select(u => $" <@{u}>"))
: "";
// 处理堆栈
var stack = alert.Stack;
if (!string.IsNullOrWhiteSpace(stack))
{
stack = stack.Replace("\n", "\n> ");
if (stack.Length > 1200)
stack = stack.Substring(0, 1200) + "...(已截断)";
string atText = "";
if (atUsers != null && atUsers.Any())
{
foreach (var u in atUsers)
{
atText += $" <@{u}>"; // 注意空格分隔
}
stack = stack[..1200] + "...(已截断)";
}
//> **运行环境：** < font color = ""comment"" >{ EnvironmentName}</ font > danger danger warning
var markdown = $@"## 🚨 系统异常告警
var markdown = $@"## 🚨 系统告警
> {atText}
> **部署环境：** [{env}]({env})
> **服务器：** {hostName}
> **部署环境：** [{alert.Env}]({alert.Env})
> **发生时间：** {time}
> **操作人：** {userName}
> **接口地址：** {api}
### ❗ 异常信息
<font color=""warning"">{ex.Message}</font>
> **操作人：** {alert.UserName}
> **接口地址：** {alert.Api}
### ❗ 告警信息
<font color=""warning"">{alert.Message}</font>";
if (!string.IsNullOrWhiteSpace(alert.JsonData))
{
markdown += $@"
> **📦 请求数据（JSON 格式）：**
```json
{json}
```
{alert.JsonData}
```";
}
if (!string.IsNullOrWhiteSpace(stack))
{
markdown += $@"
### 堆栈信息（部分）
> <font color=""comment"">{stack}</font>
";
<font color=""comment"">{stack}</font>";
}
var payload = new
{
msgtype = "markdown",
markdown = new
{
content = markdown
}
markdown = new { content = markdown }
};
request.AddHeader("Content-Type", "application/json");
request.AddStringBody(JsonConvert.SerializeObject(payload), DataFormat.Json);
var response = await client.ExecuteAsync(request);
if (!response.IsSuccessful)
await client.ExecuteAsync(request);
}
catch (Exception ex)
{
Log.Logger.Error($"企业微信通知失败: {response.StatusCode} {response.ErrorMessage}");
}
}
catch (Exception notifyEx)
{
Log.Logger.Error("发送企业微信告警异常: " + notifyEx.Message);
}
Log.Logger.Error("企业微信告警发送失败: " + ex.Message);
}
}
}

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -985,6 +985,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string QuestionGroupName { get; set; }
public string QuestionGroupEnName { get; set; }
/// <summary>
/// 影像工具
/// </summary>

1
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -375,6 +375,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
CreateMap<ReadingQuestionTrial, ReadingQuestionTrialView>()
.ForMember(d => d.QuestionGroupName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupName : s.GroupInfo.GroupName))
.ForMember(d => d.QuestionGroupEnName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupEnName : s.GroupInfo.GroupEnName))
.ForMember(d => d.GroupName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupName : s.GroupInfo.GroupName))
.ForMember(d => d.GroupEnName, u => u.MapFrom(s => s.GroupInfo == null ? s.GroupEnName : s.GroupInfo.GroupEnName))
.ForMember(d => d.ParentQuestionName, u => u.MapFrom(s => s.ParentReadingQuestionTrial == null ? string.Empty : s.ParentReadingQuestionTrial.QuestionName))

20
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.Contracts
{
isVirtual = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.TrialType != TrialType.OfficialTrial).FirstNotNullAsync();
await _doctorRepository.UpdatePartialFromQueryAsync(x => x.Id == dockerInfo.Id, y => new Doctor()
await _doctorRepository.BatchUpdateNoTrackingAsync(x => x.Id == dockerInfo.Id, y => new Doctor()
{
IsVirtual = isVirtual,
AcceptingNewTrial = inDto.TrialId == null ? false : true,
@ -245,6 +245,17 @@ namespace IRaCIS.Core.Application.Contracts
{
result.DoctorId = dockerInfo.Id;
result.ReviewStatus = dockerInfo.ReviewStatus;
if(inDto.TrialId != null)
{
var isVirtual = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.TrialType != TrialType.OfficialTrial).FirstNotNullAsync();
await _doctorRepository.BatchUpdateNoTrackingAsync(x => x.Id == dockerInfo.Id, y => new Doctor()
{
IsVirtual = isVirtual,
AcceptingNewTrial = inDto.TrialId == null ? false : true,
CooperateStatus = inDto.TrialId == null ? ContractorStatusEnum.Noncooperation : ContractorStatusEnum.Cooperation,
});
}
}
else
{
@ -254,16 +265,19 @@ namespace IRaCIS.Core.Application.Contracts
{
isVirtual = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => x.TrialType != TrialType.OfficialTrial).FirstNotNullAsync();
}
Doctor doctor = new Doctor()
{
EMail = inDto.EmailOrPhone,
IsVirtual = isVirtual,
AcceptingNewTrial = false,
AcceptingNewTrial = inDto.TrialId == null ? false : true,
ActivelyReading = false,
CooperateStatus = ContractorStatusEnum.Noncooperation,
ResumeStatus = ResumeStatusEnum.Pass,
CooperateStatus = inDto.TrialId == null ? ContractorStatusEnum.Noncooperation : ContractorStatusEnum.Cooperation,
ReviewStatus = ReviewerInformationConfirmStatus.ConfirmRefuse
};
doctor.Code = await _doctorRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
doctor.ReviewerCode = AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));
var info = await _doctorRepository.AddAsync(doctor, true);

2
IRaCIS.Core.Application/TestService.cs
View File

@ -116,7 +116,7 @@ namespace IRaCIS.Core.Application.Service
var webhook = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=cdd97aab-d256-4f07-9145-a0a2b1555322";
//await WeComNotifier.SendErrorAsync(webhook, "http://irc.test.extimaging.com/login", new Exception("测试异常"), new[] { "ZhouHang" });
throw new Exception("手动测试异常抛出");
//throw new Exception("手动测试异常抛出");
return ResponseOutput.Ok(modelVerify);
}