合并

IRC.Core.SCP/BusinessFilter/UnifiedApiResultFilter.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure.Extention;
 
-namespace IRaCIS.Application.Services.BusinessFilter
+namespace IRaCIS.Core.Application.Service.BusinessFilter
 {
     /// <summary>
     ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码

IRC.Core.SCP/HostConfig/AutofacModuleSetup.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Reflection;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Application.Services;
+using IRaCIS.Core.Application.Service;
 using AutoMapper;
 using IRaCIS.Core.SCP.Service;
 

IRC.Core.SCP/IRC.Core.SCP.csproj

@@ -8,7 +8,6 @@
 
   <ItemGroup>
 	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
-	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
 	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
 	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
 	  <PackageReference Include="AWSSDK.S3" Version="3.7.402.7" />

IRC.Core.SCP/Service/BaseService.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using IRaCIS.Application.Services.BusinessFilter;
+using IRaCIS.Core.Application.Service.BusinessFilter;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -14,7 +14,7 @@ using System.Text;
 using Microsoft.AspNetCore.Http;
 using IRaCIS.Core.Application.Interfaces;
 using System.Threading.Tasks;
-using IRaCIS.Application.Services;
+using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infrastructure;

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -7,7 +7,7 @@ using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Authorization;
 using System.Threading.Tasks;
-using IRaCIS.Application.Services;
+using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -29,7 +29,7 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Application.Services.IMailVerificationService)">
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Core.Application.Service.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IMailVerificationService)">
             <summary>  系统用户登录接口[New] </summary>
         </member>
         <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
@@ -41,7 +41,7 @@
             <param name="param"></param>
             <returns>新记录Id</returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.WorkLoadAddOrUpdate(IRaCIS.Application.Services.IDoctorWorkloadService,IRaCIS.Application.Contracts.WorkloadCommand)">
+        <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.WorkLoadAddOrUpdate(IRaCIS.Core.Application.Service.IDoctorWorkloadService,IRaCIS.Application.Contracts.WorkloadCommand)">
             <summary>
             添加或更新工作量[AUTH]
             </summary>

IRaCIS.Core.API/Progranm.cs

@@ -20,7 +20,7 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using IRaCIS.Core.Application.Filter;
 using Microsoft.AspNetCore.HttpOverrides;
-using IRaCIS.Application.Services.BackGroundJob;
+using IRaCIS.Core.Application.Service.BackGroundJob;
 using LogDashboard;
 using FellowOakDicom.Network;
 using IRaCIS.Core.Application.Service.ImageAndDoc;

IRaCIS.Core.API/_PipelineExtensions/HangfireConfig.cs

@@ -1,7 +1,7 @@
 using Hangfire;
 using Hangfire.Dashboard;
 using Hangfire.Dashboard.BasicAuthorization;
-using IRaCIS.Application.Services.BackGroundJob;
+using IRaCIS.Core.Application.Service.BackGroundJob;
 using IRaCIS.Core.API.Filter;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Builder;

IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Reflection;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Application.Services;
+using IRaCIS.Core.Application.Service;
 using IRaCIS.Application.Interfaces;
 using AutoMapper;
 

IRaCIS.Core.Application/Auth/IRaCISPolicy.cs

@@ -1,10 +1,4 @@
-using System;
+namespace IRaCIS.Core.Application.Auth
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.Auth
 {
 
 

IRaCIS.Core.Application/Auth/JwtSetting.cs

@@ -1,6 +1,5 @@
-using System.Collections.Generic;
+using Microsoft.IdentityModel.Tokens;
 using System.Text;
-using Microsoft.IdentityModel.Tokens;
 
 namespace IRaCIS.Core.Application.Auth
 {

IRaCIS.Core.Application/Auth/TokenService.cs

@@ -1,7 +1,7 @@
-using System.IdentityModel.Tokens.Jwt;
+using IRaCIS.Core.Domain.Share;
-using System.Security.Claims;
-using IRaCIS.Core.Domain.Share;
 using Microsoft.Extensions.Options;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
 
 namespace IRaCIS.Core.Application.Auth
 {

IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs

@@ -1,16 +1,10 @@
 using Hangfire;
 using Hangfire.Storage;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using SharpCompress.Common;
-using ZiggyCreatures.Caching.Fusion;
 
-namespace IRaCIS.Application.Services.BackGroundJob
+namespace IRaCIS.Core.Application.Service.BackGroundJob
 {
 
     public interface IIRaCISHangfireJob

IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs

@@ -1,5 +1,4 @@
-using IRaCIS.Core.Infra.EFCore;
+using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging;
 
 namespace IRaCIS.Core.Application.BackGroundJob
 {

IRaCIS.Core.Application/BaseService.cs

@@ -1,17 +1,16 @@
 using AutoMapper;
-using IRaCIS.Application.Services.BusinessFilter;
+using IRaCIS.Core.Application.Service.BusinessFilter;
-using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Panda.DynamicWebApi;
 using Panda.DynamicWebApi.Attributes;
 using System.Diagnostics.CodeAnalysis;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Mvc;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace IRaCIS.Core.Application
+namespace IRaCIS.Core.Application.Service
 {
 
 #pragma warning disable CS8618

IRaCIS.Core.Application/BusinessFilter/Encryption/AesEncryption.cs

@@ -1,13 +1,9 @@
-using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Modes;
 using Org.BouncyCastle.Crypto.Paddings;
 using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Crypto;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using Org.BouncyCastle.Crypto.Modes;
 
 namespace IRaCIS.Core.Application.BusinessFilter;
 

IRaCIS.Core.Application/BusinessFilter/Encryption/EncreptApiResultFilter.cs

@@ -3,11 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.BusinessFilter;
 

IRaCIS.Core.Application/BusinessFilter/Encryption/EncryptionRequestMiddleware.cs

@@ -1,13 +1,8 @@
-using DocumentFormat.OpenXml.InkML;
+using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.BusinessFilter;
 

IRaCIS.Core.Application/BusinessFilter/Encryption/RSAEncryption.cs

@@ -1,14 +1,10 @@
-using System;
+using Org.BouncyCastle.Crypto;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Encodings;
 using Org.BouncyCastle.Crypto.Engines;
 using Org.BouncyCastle.Crypto.Generators;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Security;
+using System.Text;
 
 namespace IRaCIS.Core.Application.BusinessFilter;
 

IRaCIS.Core.Application/BusinessFilter/GlobalExceptionHandler.cs

@@ -1,16 +1,10 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 
-namespace IRaCIS.Core.Application.BusinessFilter
+namespace IRaCIS.Core.Application.BusinessFilter;
-{
+
 
 /// <summary>
 /// 不生效，不知道为啥 
@@ -47,4 +41,3 @@ namespace IRaCIS.Core.Application.BusinessFilter
         return ValueTask.FromResult(false);
     }
 }
-}

IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs

@@ -1,13 +1,11 @@
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Filter;

IRaCIS.Core.Application/BusinessFilter/ModelActionFilter .cs

@@ -1,12 +1,11 @@
-using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;
 
 
-namespace IRaCIS.Core.Application.Filter
+namespace IRaCIS.Core.Application.Filter;
-{
+
 
 
 public class ModelActionFilter : ActionFilterAttribute, IActionFilter
@@ -33,5 +32,3 @@ namespace IRaCIS.Core.Application.Filter
         }
     }
 }
-
-}

IRaCIS.Core.Application/BusinessFilter/ModelBinding.cs

@@ -1,10 +1,9 @@
-using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace IRaCIS.Core.Application.Filter
+namespace IRaCIS.Core.Application.Filter;
-{
+
 #region snippet_DisableFormValueModelBindingAttribute
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
 public class DisableFormValueModelBindingAttribute : Attribute, IResourceFilter
@@ -25,4 +24,3 @@ namespace IRaCIS.Core.Application.Filter
     }
 }
 #endregion
-}

IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs

@@ -1,13 +1,12 @@
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
-namespace IRaCIS.Core.Application.Filter
+namespace IRaCIS.Core.Application.Filter;
-{
+
 public class ProjectExceptionFilter : Attribute, IExceptionFilter
 {
     private readonly ILogger<ProjectExceptionFilter> _logger;
@@ -74,4 +73,3 @@ namespace IRaCIS.Core.Application.Filter
         }
     }
 }
-}

IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs

@@ -8,8 +8,8 @@ using System.Text.RegularExpressions;
 using ZiggyCreatures.Caching.Fusion;
 using static IRaCIS.Core.Domain.Share.StaticData;
 
-namespace IRaCIS.Core.Application.Filter
+namespace IRaCIS.Core.Application.Filter;
-{
+
 /// <summary>
 /// 主要为了 处理项目结束 锁库，不允许操作
 /// </summary>
@@ -178,4 +178,3 @@ namespace IRaCIS.Core.Application.Filter
 
     }
 }
-}

IRaCIS.Core.Application/BusinessFilter/UnifiedApiResultFilter.cs

@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.Mvc.Filters;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
 
-namespace IRaCIS.Application.Services.BusinessFilter
+namespace IRaCIS.Core.Application.Service.BusinessFilter;
-{
+
 /// <summary>
 ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
 /// by zhouhang 2021.09.12 周末
@@ -120,4 +120,3 @@ namespace IRaCIS.Application.Services.BusinessFilter
         return false;
     }
 }
-}

IRaCIS.Core.Application/GlobalUsings.cs

@@ -0,0 +1,11 @@
+global using AutoMapper.QueryableExtensions;
+global using IRaCIS.Core.Application.Service;
+global using IRaCIS.Core.Domain.Models;
+global using IRaCIS.Core.Infra.EFCore;
+global using IRaCIS.Core.Infrastructure.Extention;
+global using Microsoft.EntityFrameworkCore;
+global using System.Linq.Expressions;
+
+
+
+

IRaCIS.Core.Application/Helper/Attribute/DictionaryTranslateAttribute.cs

@@ -1,9 +1,4 @@
 using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Helper
 {

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -1,12 +1,5 @@
-using IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Application.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IRaCIS.Core.Application.Helper
-{
 
 public static class CacheKeys
 {
@@ -74,4 +67,3 @@ namespace IRaCIS.Core.Application.Helper
         return list;
     }
 }
-}

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -1,7 +1,4 @@
-using DocumentFormat.OpenXml.Drawing.Diagrams;
+using IRaCIS.Application.Contracts;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.Wordprocessing;
-using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Helper;
@@ -10,14 +7,9 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NPOI.HSSF.UserModel;
 using NPOI.XSSF.UserModel;
 using System.Collections;
-using System.ComponentModel;
 using System.Globalization;
-using System.IO;
 
 namespace IRaCIS.Core.Application.Service;
 

IRaCIS.Core.Application/Helper/FileConvertHelper.cs

@@ -1,12 +1,7 @@
-using System;
+using System.Diagnostics;
-using System.Collections.Generic;
+
-using System.Diagnostics;
+namespace IRaCIS.Core.Application.Helper;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IRaCIS.Core.Application.Helper
-{
 public class FileConvertHelper
 {
 
@@ -36,4 +31,3 @@ namespace IRaCIS.Core.Application.Helper
 
 
 }
-}

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -1,12 +1,7 @@
-
+using IRaCIS.Core.Domain.Share;
-
-using Aliyun.OSS;
-using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json.Linq;
-using System.Configuration;
 using System.Globalization;
 using System.Text.RegularExpressions;
 

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -1,15 +1,5 @@
 using Hangfire;
-using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NPOI.SS.Formula.Functions;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Helper
 {

IRaCIS.Core.Application/Helper/HolidayHelper.cs

@@ -1,12 +1,7 @@
 using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IRaCIS.Core.Application.Helper
+namespace IRaCIS.Core.Application.Helper;
-{
+
 
 #region 对接模型
 public class HolidayCalendar
@@ -108,4 +103,3 @@ namespace IRaCIS.Core.Application.Helper
 
 
 }
-}

IRaCIS.Core.Application/Helper/IRCEmailPasswordHelper.cs

@@ -1,12 +1,5 @@
-using NPOI.SS.Formula.Functions;
+namespace IRaCIS.Core.Application.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IRaCIS.Core.Application.Helper
-{
 public static class IRCEmailPasswordHelper
 {
     private static readonly Random Random = new Random();
@@ -82,4 +75,3 @@ namespace IRaCIS.Core.Application.Helper
         return new string(password.OrderBy(_ => Random.Next()).ToArray());
     }
 }
-}

IRaCIS.Core.Application/Helper/ImageHelper.cs

@@ -1,10 +1,8 @@
 
 using FellowOakDicom.Imaging;
-using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Processing;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace IRaCIS.Core.Application.Helper;
 

IRaCIS.Core.Application/Helper/InternationalizationHelper.cs

@@ -4,15 +4,9 @@ using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static IRaCIS.Core.Application.Service.Common.SystemMonitor;
 
-namespace IRaCIS.Core.Application.Helper
+namespace IRaCIS.Core.Application.Helper;
-{
+
 public static class InternationalizationHelper
 {
     public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
@@ -210,5 +204,4 @@ namespace IRaCIS.Core.Application.Helper
 
 
 
-    }
 }

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -1,37 +1,22 @@
-using Aliyun.OSS;
+using AlibabaCloud.SDK.Sts20150401;
-using IRaCIS.Core.Infrastructure;
+using Aliyun.OSS;
-using Microsoft.Extensions.Hosting;
+using Amazon;
-using Microsoft.Extensions.Options;
-using Minio.DataModel.Args;
-using Minio;
-using SharpCompress.Common;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.InteropServices;
-using System.Text.Json.Serialization;
-using Minio.ApiEndpoints;
-using System.Reactive.Linq;
-using IRaCIS.Core.Domain.Share;
-using static MassTransit.ValidationResultExtensions;
-using IRaCIS.Core.Infrastructure.NewtonsoftJson;
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
-using MassTransit.Caching.Internals;
-using MassTransit;
-using AlibabaCloud.SDK.Sts20150401;
 using Amazon.SecurityToken;
 using Amazon.SecurityToken.Model;
-using Amazon;
+using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.NewtonsoftJson;
+using MassTransit;
+using Microsoft.Extensions.Options;
+using Minio;
+using Minio.DataModel.Args;
+using System.Reactive.Linq;
+using System.Runtime.InteropServices;
+
+namespace IRaCIS.Core.Application.Helper;
 
-namespace IRaCIS.Core.Application.Helper
-{
 #region 绑定和返回模型
 
 [LowerCamelCaseJson]
@@ -774,6 +759,3 @@ namespace IRaCIS.Core.Application.Helper
     }
 
 }
-
-
-}

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -1,9 +1,7 @@
-using DocumentFormat.OpenXml.Spreadsheet;
+using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Domain.Share;
 using MailKit;
 using MailKit.Security;
 using MimeKit;
-using NPOI.HPSF;
 
 
 namespace IRaCIS.Core.Application.Helper;

IRaCIS.Core.Application/Helper/WordTempleteHelper.cs

@@ -1,16 +1,11 @@
 using IRaCIS.Core.Domain.Share;
 using NPOI.XWPF.UserModel;
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xceed.Document.NET;
 using Xceed.Words.NET;
 
-namespace IRaCIS.Core.Application.Helper
+namespace IRaCIS.Core.Application.Helper;
-{
+
 /// <summary>
 /// 利用DocX 库 处理word国际化模板
 /// </summary>
@@ -98,4 +93,3 @@ namespace IRaCIS.Core.Application.Helper
     }
 
 }
-}

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

@@ -19,21 +19,6 @@
 	</PropertyGroup>
 
 
-
-	<ItemGroup>
-
-    <Using Include="IRaCIS.Core.Application;" />
-		<Using Include="AutoMapper.QueryableExtensions;" />
-		<Using Include="Microsoft.EntityFrameworkCore;" />
-		<Using Include="IRaCIS.Core.Domain.Models;" />
-		<Using Include="IRaCIS.Core.Infrastructure.Extention;" />
-		<Using Include="IRaCIS.Core.Infra.EFCore;" />
-
-		<!-- Global using -->
-
-	</ItemGroup>
-
-
 	<ItemGroup>
 		<Compile Remove="WebAppConfig.cs" />
 	</ItemGroup>

IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs

@@ -1,10 +1,5 @@
 using MiniExcelLibs.Attributes;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.MassTransit.Command
 {

IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs

@@ -5,12 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using MassTransit;
 using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.MassTransit.Consumer
 {

IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs

@@ -3,12 +3,10 @@
 //	   生成时间 2022-06-07 13:16:33 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {
@@ -112,7 +110,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public List<CriterionReadingCategory> CriterionCategoryList =>
 
             TrialReadingCriterionList.Select(t =>
-            new CriterionReadingCategory() { 
+            new CriterionReadingCategory()
+            {
                 EnrollId = EnrollId,
                 TrialReadingCriterionId = t.TrialReadingCriterionId,
                 ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()

IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs

@@ -3,9 +3,7 @@
 //	   生成时间 2022-07-01 15:33:01 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 

IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewRuleViewModel.cs

@@ -3,11 +3,8 @@
 //	   生成时间 2022-06-29 13:36:46 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {

IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs

@@ -3,9 +3,7 @@
 //	   生成时间 2022-06-29 10:59:50 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -3,11 +3,9 @@
 //	   生成时间 2022-06-07 14:10:54 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {

IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs

@@ -4,13 +4,12 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Contracts;
-using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Filter;
+using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -4,23 +4,16 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Application.Interfaces;
-using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Domain.Share;
-using System.Linq.Expressions;
-using IRaCIS.Core.Infra.EFCore.Common;
-using System.Linq;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
-using Medallion.Threading;
+using IRaCIS.Core.Application.Interfaces;
-using IRaCIS.Core.Infrastructure.Extention;
-using System;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NPOI.SS.Formula.Functions;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Common;
+using IRaCIS.Core.Infrastructure;
+using Medallion.Threading;
+using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs

@@ -4,11 +4,10 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Filter;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Application.Filter;
+using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs

@@ -4,14 +4,12 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Filter;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Infrastructure;
-using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -4,20 +4,13 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure;
-using AutoMapper;
-using MassTransit;
-using IRaCIS.Core.Infra.EFCore.Common;
-using System.Linq.Expressions;
 using IRaCIS.Core.Domain.Share.Reading;
-using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Infra.EFCore.Common;
-using System.Runtime.InteropServices;
+using MassTransit;
-using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Mvc;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Service

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -4,24 +4,17 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Application.Contracts;
-using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore.Common;
-using System.Linq.Expressions;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Application.Filter;
-using DocumentFormat.OpenXml.Office2010.Word;
-using System.Linq.Dynamic.Core;
-using System.Linq;
-using DocumentFormat.OpenXml.Bibliography;
 using IRaCIS.Core.Domain.Share.Reading;
+using IRaCIS.Core.Infra.EFCore.Common;
+using IRaCIS.Core.Infrastructure;
 using MassTransit;
-using System.Reactive.Subjects;
+using Microsoft.AspNetCore.Mvc;
+using System.Linq.Dynamic.Core;
 using Subject = IRaCIS.Core.Domain.Models.Subject;
 
 namespace IRaCIS.Core.Application.Service.Allocation;

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -1,8 +1,6 @@
 using AutoMapper;
 using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service

IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs

@@ -4,12 +4,10 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs

@@ -3,9 +3,7 @@
 //	   生成时间 2022-03-31 13:18:48 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
 

IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs

@@ -1,5 +1,4 @@
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Application.Contracts

IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs

@@ -3,9 +3,7 @@
 //	   生成时间 2022-02-15 11:55:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
-using Newtonsoft.Json;
 namespace IRaCIS.Core.Application.Contracts
 {
     public class TrialSelectEmailNoticeConfigView : EmailNoticeConfigView

IRaCIS.Core.Application/Service/Common/DTO/ExploreRecommendViewModel.cs

@@ -3,9 +3,6 @@
 //	   生成时间 2024-07-02 09:29:36 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> ExploreRecommendView  列表视图模型 </summary>

IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs

@@ -3,11 +3,8 @@
 //	   生成时间 2022-03-28 16:43:52 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using IRaCIS.Core.Infra.EFCore.Common;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -3,9 +3,6 @@
 //	   生成时间 2023-06-01 13:38:20 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> InternationalizationView  列表视图模型 </summary>

IRaCIS.Core.Application/Service/Common/DTO/PublishLogViewModel.cs

@@ -3,9 +3,6 @@
 //	   生成时间 2023-06-27 15:47:02 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> PublishLogView  列表视图模型 </summary>

IRaCIS.Core.Application/Service/Common/DTO/SysMessageModel.cs

@@ -1,6 +1,4 @@
-using System;
+namespace IRaCIS.Application.Contracts
-
-namespace IRaCIS.Application.Contracts
 {
     public class SysMessageDTO
     {

IRaCIS.Core.Application/Service/Common/DTO/SystemBasicDataViewModel.cs

@@ -3,10 +3,6 @@
 //	   生成时间 2022-02-15 15:46:00 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using IRaCIS.Core.Domain.Share;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.Contracts
 {
     /// <summary> SystemBasicDataView  列表视图模型 </summary>

IRaCIS.Core.Application/Service/Common/DTO/SystemLogModel.cs

@@ -1,6 +1,4 @@
-using IRaCIS.Core.Infrastructure.Extention;
+namespace IRaCIS.Application.Contracts
-
-namespace IRaCIS.Application.Contracts
 {
     public class SystemLogDTO
     {

IRaCIS.Core.Application/Service/Common/DevelopService.cs

@@ -1,9 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Common
 {

IRaCIS.Core.Application/Service/Common/DictionaryService.cs

@@ -1,15 +1,11 @@
-using IRaCIS.Application.Interfaces;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore.Common;
-using IP2Region.Net.XDB;
-using System.Collections;
 using System.Text;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     /// <summary>
     /// 数据字典-基础数据维护

IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs

@@ -5,7 +5,6 @@
 //--------------------------------------------------------------------
 
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.RegularExpressions;
 

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1,29 +1,14 @@
-using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using IRaCIS.Application.Contracts;
-using DocumentFormat.OpenXml.Presentation;
-using DocumentFormat.OpenXml.Spreadsheet;
-using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
-using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using MiniExcelLibs;
-using MiniExcelLibs.OpenXml;
-using NPOI.HPSF;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.Formula.Functions;
 using NPOI.XSSF.UserModel;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Common
 {

IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs

@@ -4,11 +4,10 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 namespace IRaCIS.Core.Application.Service
 {
     /// <summary>

IRaCIS.Core.Application/Service/Common/FileService.cs

@@ -1,12 +1,10 @@
 using IRaCIS.Application.Interfaces;
-using System.Text;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
+using System.Text;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     public class FileService(
              IDoctorService _doctorService,

IRaCIS.Core.Application/Service/Common/Interface/IDictionaryService.cs

@@ -1,7 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using System.Collections.Generic;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Common/Interface/IFileService.cs

@@ -1,6 +1,4 @@
-using System;
+namespace IRaCIS.Application.Interfaces
-
-namespace IRaCIS.Application.Interfaces
 {
     public interface IFileService
     {

IRaCIS.Core.Application/Service/Common/Interface/ILogService.cs

@@ -1,7 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
-using System.Collections.Generic;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Common/Interface/IMessageService.cs

@@ -1,6 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -4,13 +4,11 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Microsoft.AspNetCore.Authorization;
-using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Domain.Share;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Service

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -1,29 +1,15 @@
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Application.Contracts;
-using MimeKit;
-using IRaCIS.Core.Application.Helper;
-using MailKit;
-using Microsoft.AspNetCore.Hosting;
 using IRaCIS.Core.Application.Auth;
-using AutoMapper;
+using IRaCIS.Core.Application.Helper;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Domain.Share;
-using Microsoft.Extensions.Options;
-using Medallion.Threading;
-using System.Text.RegularExpressions;
 using IRaCIS.Core.Infrastructure;
-using DocumentFormat.OpenXml.Spreadsheet;
+using MailKit;
-using IRaCIS.Core.Application.Service.Reading.Dto;
+using Medallion.Threading;
-using NPOI.SS.Formula.Functions;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Options;
-using IRaCIS.Core.Domain.Models;
+using MimeKit;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using IRaCIS.Core.Application.Contracts;
-using DocumentFormat.OpenXml.Vml;
-using System.Net.Mail;
-using IP2Region.Net.XDB;
-using NPOI.SS.Formula.Eval;
-using System.Linq;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     public interface IMailVerificationService
     {

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -4,12 +4,10 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Application.Contracts;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Common/SystemMonitor.cs

@@ -1,23 +1,7 @@
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Application.Helper;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration.Json;
-using IRaCIS.Core.Infrastructure.Extention;
-using SharpCompress.Common;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Encodings.Web;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
 using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 
 namespace IRaCIS.Core.Application.Service.Common
 {

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -2,8 +2,6 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs

@@ -1,12 +1,9 @@
-using IRaCIS.Application.Interfaces;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Panda.DynamicWebApi.Attributes;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     /// <summary>
     /// 医生文档关联关系维护

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorAccountRegisterModel.cs

@@ -1,6 +1,4 @@
-using System;
+namespace IRaCIS.Application.Contracts
-
-namespace IRaCIS.Application.Contracts
 {
     public class DoctorAccountRegisterModel : DoctorAccountLoginDTO
     {

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -1,10 +1,5 @@
-using System;
+using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-
-using IRaCIS.Core.Infrastructure.Extention;
-using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
-using System.Linq;
 
 namespace IRaCIS.Application.Contracts
 {

IRaCIS.Core.Application/Service/Doctor/DTO/EducationModel.cs

@@ -1,7 +1,4 @@
-using System;
+namespace IRaCIS.Application.Contracts
-using System.Collections.Generic;
-
-namespace IRaCIS.Application.Contracts
 {
     public class EducationCommand
     {

IRaCIS.Core.Application/Service/Doctor/DTO/HolidayModel.cs

@@ -1,6 +1,4 @@
-using System;
+namespace IRaCIS.Application.Contracts
-
-namespace IRaCIS.Application.Contracts
 {
     public class VacationCommand
     {

IRaCIS.Core.Application/Service/Doctor/DTO/ResearchPublicationModel.cs

@@ -1,6 +1,4 @@
-using System;
+namespace IRaCIS.Application.Contracts
-
-namespace IRaCIS.Application.Contracts
 {
     public class ResearchPublicationDTO
     {

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -1,11 +1,10 @@
-using IRaCIS.Application.Interfaces;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Domain.Share;
-using System.Linq.Dynamic.Core;
-using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
+using System.Linq.Dynamic.Core;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class DoctorListService(

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -1,12 +1,10 @@
-using IRaCIS.Application.Interfaces;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
-using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
-using System.Linq.Expressions;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class DoctorService(

IRaCIS.Core.Application/Service/Doctor/EducationService.cs

@@ -1,13 +1,10 @@
 
-using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Filter;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class EducationService(

IRaCIS.Core.Application/Service/Doctor/Interface/IAttachmentService.cs

@@ -1,9 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using System.Collections.Generic;
-
-using IRaCIS.Application.Contracts;
-
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/IDoctorAccountService.cs

@@ -1,7 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/IDoctorService.cs

@@ -1,7 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using System.Collections.Generic;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/IEducationService.cs

@@ -1,6 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/IResearchPublicationService.cs

@@ -1,6 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/ITrialExperienceService.cs

@@ -1,6 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/Interface/IVacationService.cs

@@ -1,9 +1,4 @@
-using System;
+using IRaCIS.Application.Contracts;
-using System.Collections.Generic;
-
-using IRaCIS.Application.Contracts;
-
-using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Application.Interfaces
 {

IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs

@@ -1,8 +1,8 @@
-using IRaCIS.Application.Interfaces;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IRaCIS.Application.Services
+namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class ResearchPublicationService(IRepository<ResearchPublication> _researchPublicationRepository) : BaseService, IResearchPublicationService