ソースを参照

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

leiy 1 年間 前
コミット
6e39783c19
共有2 個のファイルを変更した7 個の追加1 個の削除を含む
  1. 6 0
      OASystem/OASystem.Api/Controllers/GroupsController.cs
  2. 1 1
      OASystem/OASystem.Api/appsettings.json

+ 6 - 0
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -26,6 +26,7 @@ using System.Diagnostics;
 using MathNet.Numerics.Statistics.Mcmc;
 using AlibabaCloud.OpenApiClient.Models;
 using System;
+using NPOI.HPSF;
 
 namespace OASystem.API.Controllers
 {
@@ -499,6 +500,9 @@ namespace OASystem.API.Controllers
 
             List<VisaProgressImageView> list = _delegationVisaRep.GetVisaProgressImageList(dto.visaProgressCustomerId, dto.picType);
 
+            string url = AppSettingsHelper.Get("VisaProgressImageBaseUrl") + AppSettingsHelper.Get("VisaProgressImageFtpPath");
+            list.ForEach(s => s.url = url);
+
             return Ok(JsonView(list));
         }
 
@@ -599,6 +603,8 @@ namespace OASystem.API.Controllers
             catch (Exception e)
             {
                 string massage = e.Message;
+                Logs("IOS图片上传Error:" + massage);
+                //filename = e.Message;
             }
             return filename;//返回相对路径
         }

+ 1 - 1
OASystem/OASystem.Api/appsettings.json

@@ -122,7 +122,7 @@
   "GrpFileBasePath": "C:/Server/File/OA2023/Office/GrpFile/",
 
   "VisaProgressImageBaseUrl": "http://132.232.92.186:24/",
-  "VisaProgressImageFtpPath": "C:/Server/File/OA2023/Image/Visa/",
+  "VisaProgressImageFtpPath": "Image/Visa/",
 
   "WageSheetExcelBaseUrl": "http://132.232.92.186:24/",
   "WageSheetExcelFptPath": "C:/Server/File/OA2023/Office/WageSheetFile/",