From 06cb92b7e060037ba76216534738ce8b4d892c86 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 22 Oct 2024 15:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/IRaCIS.Core.API.csproj        |  13 +++++++++++
 .../Resources/en-US.json                      |   0
 .../Resources/ip2region.xdb                   | Bin
 .../Resources/zh-CN.json                      |   0
 .../{ => Email}/IRCEmailPasswordHelper.cs     |   0
 .../Helper/{ => Email}/SendEmailHelper.cs     |   0
 .../Attribute/DictionaryTranslateAttribute.cs |   0
 .../{ => FileDocProcess}/ExcelExportHelper.cs |   0
 .../{ => FileDocProcess}/FileConvertHelper.cs |   0
 .../{ => FileDocProcess}/FileStoreHelper.cs   |   0
 .../WordTempleteHelper.cs                     |   0
 .../Helper/{ => OtherTool}/HolidayHelper.cs   |   0
 .../Helper/{ => OtherTool}/ImageHelper.cs     |   0
 .../IRaCIS.Core.Application.csproj            |  21 ------------------
 .../IRaCIS.Core.Application.xml               |  12 +++++-----
 15 files changed, 19 insertions(+), 27 deletions(-)
 rename {IRaCIS.Core.Application => IRaCIS.Core.API}/Resources/en-US.json (100%)
 rename {IRaCIS.Core.Application => IRaCIS.Core.API}/Resources/ip2region.xdb (100%)
 rename {IRaCIS.Core.Application => IRaCIS.Core.API}/Resources/zh-CN.json (100%)
 rename IRaCIS.Core.Application/Helper/{ => Email}/IRCEmailPasswordHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => Email}/SendEmailHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => FileDocProcess}/Attribute/DictionaryTranslateAttribute.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => FileDocProcess}/ExcelExportHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => FileDocProcess}/FileConvertHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => FileDocProcess}/FileStoreHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => FileDocProcess}/WordTempleteHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => OtherTool}/HolidayHelper.cs (100%)
 rename IRaCIS.Core.Application/Helper/{ => OtherTool}/ImageHelper.cs (100%)

diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index 598b50dde..8ddb0f03d 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -38,11 +38,18 @@
 		<None Remove="GrpcToken.proto" />
 		<None Remove="IRaCIS.Core.API.xml" />
 		<None Remove="Protos\GrpcToken.proto" />
+		<None Remove="Resources\ip2region.xdb" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ApplicationDefinition Include="GrpcToken.proto" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="Resources\ip2region.xdb">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
 	<ItemGroup>
 		<EmbeddedResource Include="wwwroot\swagger\ui\abp.js">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -99,6 +106,12 @@
 	  <Content Update="appsettings.json">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Resources\en-US.json">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Resources\zh-CN.json">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	</ItemGroup>
 
 	<ProjectExtensions>
diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.API/Resources/en-US.json
similarity index 100%
rename from IRaCIS.Core.Application/Resources/en-US.json
rename to IRaCIS.Core.API/Resources/en-US.json
diff --git a/IRaCIS.Core.Application/Resources/ip2region.xdb b/IRaCIS.Core.API/Resources/ip2region.xdb
similarity index 100%
rename from IRaCIS.Core.Application/Resources/ip2region.xdb
rename to IRaCIS.Core.API/Resources/ip2region.xdb
diff --git a/IRaCIS.Core.Application/Resources/zh-CN.json b/IRaCIS.Core.API/Resources/zh-CN.json
similarity index 100%
rename from IRaCIS.Core.Application/Resources/zh-CN.json
rename to IRaCIS.Core.API/Resources/zh-CN.json
diff --git a/IRaCIS.Core.Application/Helper/IRCEmailPasswordHelper.cs b/IRaCIS.Core.Application/Helper/Email/IRCEmailPasswordHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/IRCEmailPasswordHelper.cs
rename to IRaCIS.Core.Application/Helper/Email/IRCEmailPasswordHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs b/IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/SendEmailHelper.cs
rename to IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/Attribute/DictionaryTranslateAttribute.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/Attribute/DictionaryTranslateAttribute.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/Attribute/DictionaryTranslateAttribute.cs
rename to IRaCIS.Core.Application/Helper/FileDocProcess/Attribute/DictionaryTranslateAttribute.cs
diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
rename to IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/FileConvertHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/FileConvertHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/FileConvertHelper.cs
rename to IRaCIS.Core.Application/Helper/FileDocProcess/FileConvertHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/FileStoreHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/FileStoreHelper.cs
rename to IRaCIS.Core.Application/Helper/FileDocProcess/FileStoreHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/WordTempleteHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/WordTempleteHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/WordTempleteHelper.cs
rename to IRaCIS.Core.Application/Helper/FileDocProcess/WordTempleteHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/HolidayHelper.cs b/IRaCIS.Core.Application/Helper/OtherTool/HolidayHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/HolidayHelper.cs
rename to IRaCIS.Core.Application/Helper/OtherTool/HolidayHelper.cs
diff --git a/IRaCIS.Core.Application/Helper/ImageHelper.cs b/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs
similarity index 100%
rename from IRaCIS.Core.Application/Helper/ImageHelper.cs
rename to IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 99a2cfcf6..95ba61119 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -26,26 +26,11 @@
 
 	<ItemGroup>
 		<None Remove="IRaCIS.Core.Application.xml" />
-		<None Remove="Resources\en-US.json" />
-		<None Remove="Resources\zh-CN.json" />
-		<None Remove="Resources\zh_ch.json" />
 		<None Remove="Service\Allocation\TaskConsistentRuleService.cs~RF1603d47.TMP" />
 		<None Remove="Service\Reading\ReadingImageTask\ReadingImageTaskService.cs~RF2f9323.TMP" />
 		<None Remove="Service\Reading\ReadingImageTask\ReadingJudgeTaskService.cs~RF198afd23.TMP" />
 	</ItemGroup>
 
-
-	<ItemGroup>
-	  <Content Include="Resources\en-US.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-	    <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-	  </Content>
-	  <Content Include="Resources\zh-CN.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
 		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
@@ -84,12 +69,6 @@
 		<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <None Update="Resources\ip2region.xdb">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
-
 	<ItemGroup>
 	  <Folder Include="Triggers\TempAbandon\" />
 	</ItemGroup>
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index be4fd3de5..e75b4e985 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -12825,6 +12825,7 @@
             <param name="userId"></param>
             <returns></returns>
         </member>
+        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Helper.IRCEmailPasswordHelper.GenerateRandomPassword(System.Int32)" -->
         <member name="M:IRaCIS.Core.Application.Helper.FileConvertHelper.ConvertWordToPdf(System.String,System.String)">
             <summary>
             镜像里面打入libreoffice 的方案
@@ -12848,13 +12849,11 @@
             <param name="path">文件保存路径</param>
             <returns></returns>
         </member>
-        <member name="P:IRaCIS.Core.Application.Helper.HolidayHelper._client">
+        <member name="T:IRaCIS.Core.Application.Helper.WordTempleteHelper">
             <summary>
-            github 链接：https://github.com/lanceliao/china-holiday-calender?tab=readme-ov-file 
-            接口请求参考文档：https://www.koudingke.cn/docs/zh-Hans/net-lib-docs/latest/RestSharp/Usage/Usage
+            利用DocX 库 处理word国际化模板
             </summary>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Helper.IRCEmailPasswordHelper.GenerateRandomPassword(System.Int32)" -->
         <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSSAsync(System.IO.Stream,System.String,System.String,System.Boolean)">
             <summary>
              oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
@@ -12882,9 +12881,10 @@
             <param name="prefix"></param>
             <returns></returns>
         </member>
-        <member name="T:IRaCIS.Core.Application.Helper.WordTempleteHelper">
+        <member name="P:IRaCIS.Core.Application.Helper.HolidayHelper._client">
             <summary>
-            利用DocX 库 处理word国际化模板
+            github 链接：https://github.com/lanceliao/china-holiday-calender?tab=readme-ov-file 
+            接口请求参考文档：https://www.koudingke.cn/docs/zh-Hans/net-lib-docs/latest/RestSharp/Usage/Usage
             </summary>
         </member>
         <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CommonEmailHelper.TranslationDictionary(IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto)">