Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3695,7 +3695,7 @@ namespace OASystem.API.Controllers
             {
                 x.FileName,
                 x.Id,
-                Url = AppSettingsHelper.Get("GrpFileBaseUrl") +  System.Web.HttpUtility.UrlEncode(x.FilePath.Replace(AppSettingsHelper.Get("GrpFileBasePath"),AppSettingsHelper.Get("GrpFileFtpPath")), System.Text.Encoding.UTF8),
+                Url = AppSettingsHelper.Get("GrpFileBaseUrl") + x.FilePath.Replace(AppSettingsHelper.Get("GrpFileBasePath"), AppSettingsHelper.Get("GrpFileFtpPath")),
             })));
         }
 

OASystem/OASystem.Api/OAMethodLib/File/AsposeHelper.cs

@@ -80,7 +80,7 @@ namespace OASystem.API.OAMethodLib.File
 
                 //保存合并后的文档
                 doc.Save(saveFilePath);
-                saveFilePath = saveFilePath.Replace("C:/Server/File/OA2023/", AppSettingsHelper.Get("OfficeBaseUrl")); //返回下载地址
+                saveFilePath = saveFilePath.Replace("D:/FTP/File/OA2023/", AppSettingsHelper.Get("OfficeBaseUrl")); //返回下载地址
                 return saveFilePath; //返回下载地址
             }
             catch (Exception ex)

OASystem/OASystem.Api/appsettings.json

@@ -109,28 +109,28 @@
     }
   ],
   "ExcelBaseUrl": "http://132.232.92.186:24/",
-  "ExcelBasePath": "C:/Server/File/OA2023/Office/Excel/",
+  "ExcelBasePath": "D:/FTP/File/OA2023/Office/Excel/",
   "ExcelFtpPath": "Office/Excel/",
   "OfficeBaseUrl": "http://132.232.92.186:24/",
-  "OfficeTempBasePath": "C:/Server/File/OA2023/Office/",
+  "OfficeTempBasePath": "D:/FTP/File/OA2023/Office/",
 
   "WordBaseUrl": "http://132.232.92.186:24/",
-  "WordBasePath": "C:/Server/File/OA2023/Office/Word/",
+  "WordBasePath": "D:/FTP/File/OA2023/Office/Word/",
   "WordFtpPath": "Office/Word/",
 
   "GrpFileBaseUrl": "http://132.232.92.186:24/",
-  "GrpFileBasePath": "C:/Server/File/OA2023/Office/GrpFile/",
+  "GrpFileBasePath": "D:/FTP/File/OA2023/Office/GrpFile/",
   "GrpFileFtpPath": "Office/GrpFile/",
 
   "VisaProgressImageBaseUrl": "http://132.232.92.186:24/",
-  "VisaProgressImageBasePath": "C:/Server/File/OA2023/Image/Visa/",
+  "VisaProgressImageBasePath": "D:/FTP/File/OA2023/Image/Visa/",
   "VisaProgressImageFtpPath": "Image/Visa/",
 
   "WageSheetExcelBaseUrl": "http://132.232.92.186:24/",
-  "WageSheetExcelFptPath": "C:/Server/File/OA2023/Office/WageSheetFile/",
+  "WageSheetExcelFptPath": "D:/FTP/File/OA2023/Office/WageSheetFile/",
 
   "WageSheetTaxExcelBaseUrl": "http://132.232.92.186:24/",
-  "WageSheetTaxExcelFptPath": "C:/Server/File/OA2023/Office/Excel/WageSheetTaxFile/",
+  "WageSheetTaxExcelFptPath": "D:/FTP/File/OA2023/Office/Excel/WageSheetTaxFile/",
 
   "CTableCorrelationPageDatas": [
     {