日志格式测试

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -69,14 +69,14 @@
 	<PackageReference Include="EasyCaching.Serialization.MessagePack" Version="1.9.2">
 	  <TreatAsUsed>true</TreatAsUsed>
 	</PackageReference>
-	  <PackageReference Include="Hangfire.AspNetCore" Version="1.8.11" />
+	  <PackageReference Include="Hangfire.AspNetCore" Version="1.8.12" />
 	  <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
-	  <PackageReference Include="Hangfire.SqlServer" Version="1.8.11" />
+	  <PackageReference Include="Hangfire.SqlServer" Version="1.8.12" />
     <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
     <PackageReference Include="LogDashboard" Version="1.4.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
     <PackageReference Include="Serilog.Sinks.Email" Version="3.0.0" />

IRaCIS.Core.API/Progranm.cs

@@ -27,6 +27,8 @@ using LogDashboard;
 using OfficeOpenXml.Utils;
 using FellowOakDicom.Network;
 using IRaCIS.Core.Application.Service.ImageAndDoc;
+using IP2Region.Net.Abstractions;
+using IP2Region.Net.XDB;
 
 
 #region 获取环境变量
@@ -160,7 +162,7 @@ builder.Services.AddSignalR();
 builder.Services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
 
 
-
+builder.Services.AddSingleton<ISearcher>(new Searcher(CachePolicy.Content, Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "ip2region.xdb")));
 
 
 #region  历史废弃配置

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -50,8 +50,8 @@ namespace IRaCIS.Core.API
                     //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIbeforeTrigger>();
-                    
 
+                    triggerOptions.AddTrigger<UserLogTrigger>();
 
 
 

IRaCIS.Core.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "JwtSetting": {
-    "SecurityKey": "SecurityKey_SHzyyl@2021",
+    "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021",
     "Issuer": "Extimaging",
     "Audience": "EICS",
     "TokenExpireDays": "7"

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -65,18 +65,19 @@
 	<ItemGroup>
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
-		<PackageReference Include="Hangfire.Core" Version="1.8.11" />
+		<PackageReference Include="Hangfire.Core" Version="1.8.12" />
 		<PackageReference Include="BeetleX.BNR" Version="1.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="EasyCaching.Redis" Version="1.9.2" />
 		<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
 		<PackageReference Include="ExcelDataReader" Version="3.6.0" />
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
-		<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
+		<PackageReference Include="DistributedLock.Redis" Version="1.0.3" />
-		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.3" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.4" />
 		<PackageReference Include="fo-dicom" Version="5.1.2" />
 		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.2" />
 		<PackageReference Include="fo-dicom.Codecs" Version="5.12.0" />
+		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
 		<PackageReference Include="Magicodes.IE.Core" Version="2.7.5.1" />
 		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.5.1">
 		  <TreatAsUsed>true</TreatAsUsed>
@@ -85,24 +86,30 @@
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.5.1" />
-		<PackageReference Include="MailKit" Version="4.4.0" />
+		<PackageReference Include="MailKit" Version="4.5.0" />
 		<PackageReference Include="MediatR" Version="12.2.0" />
-		<PackageReference Include="MimeKit" Version="4.4.0" />
+		<PackageReference Include="MimeKit" Version="4.5.0" />
-		<PackageReference Include="MiniExcel" Version="1.31.3" />
+		<PackageReference Include="MiniExcel" Version="1.32.0" />
 		<PackageReference Include="Minio" Version="6.0.2" />
 		<PackageReference Include="MiniWord" Version="0.8.0" />
-		<PackageReference Include="My.Extensions.Localization.Json" Version="3.2.0">
+		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="NPOI" Version="2.6.2" />
+		<PackageReference Include="NPOI" Version="2.7.0" />
-		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.1" />
+		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
-		<PackageReference Include="WinSCP" Version="6.3.2" />
+		<PackageReference Include="WinSCP" Version="6.3.3" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Resources\ip2region.xdb">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+
 </Project>

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -5612,6 +5612,11 @@
             是否是转变的任务(转为IRECIST)
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.JudgeDifferenceValue">
+            <summary>
+            裁判百分比或绝对值的相差值
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.QuestionType">
             <summary>
             问题类型
@@ -5717,6 +5722,16 @@
             标准
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetTrialCriterionJudgeQuestionAnswerGroupInDto.JudgeDifferenceValue">
+            <summary>
+            裁判百分比或绝对值的相差值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.JudgeDifferenceValue">
+            <summary>
+            裁判百分比或绝对值的相差值
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListOutDto.QuestionGenre">
             <summary>
             问题类型
@@ -5827,6 +5842,16 @@
             
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GroupTaskAnswerDto.JudgeDifferenceValue">
+            <summary>
+            裁判百分比或绝对值的相差值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TaskAnswerDto.JudgeDifferenceValue">
+            <summary>
+            裁判百分比或绝对值的相差值
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionDataInfo.Id">
             <summary>
             

IRaCIS.Core.Application/Triggers/UserLogTrigger.cs

@@ -0,0 +1,39 @@
+using EntityFrameworkCore.Triggered;
+using IP2Region.Net.Abstractions;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Triggers
+{
+    public class UserLogTrigger : IBeforeSaveTrigger<UserLog>
+    {
+        public ISearcher _searcher;
+
+        public ILogger<UserLogTrigger> _logger;
+        public UserLogTrigger(ISearcher searcher,ILogger<UserLogTrigger> logger)
+        {
+            _searcher = searcher;
+        }
+
+        //国家|区域|省份|城市|ISP   缺省的地域信息默认是0
+        //0|0|0|内网IP|内网IP
+        public async Task BeforeSave(ITriggerContext<UserLog> context, CancellationToken cancellationToken)
+        {
+            var userLog = context.Entity;
+
+            if (context.ChangeType == ChangeType.Added)
+            {
+
+                var dd = _searcher.Search(userLog.IP);
+
+                _logger.LogWarning(dd);
+
+            }
+        }
+    }
+}