|
@@ -90,6 +90,7 @@ using static Pipelines.Sockets.Unofficial.SocketConnection;
|
|
|
using System.Diagnostics.PerformanceData;
|
|
|
using System.Drawing.Printing;
|
|
|
using OASystem.Domain.Dtos.FileDto;
|
|
|
+using Microsoft.VisualBasic;
|
|
|
|
|
|
namespace OASystem.API.Controllers
|
|
|
{
|
|
@@ -3545,7 +3546,7 @@ namespace OASystem.API.Controllers
|
|
|
return Ok(jw);
|
|
|
}
|
|
|
|
|
|
- var nameSp = dto.File.Name.Split(".");
|
|
|
+ var nameSp = dto.File.FileName.Split(".");
|
|
|
if (nameSp.Length < 2)
|
|
|
{
|
|
|
jw.Msg = "拓展名称有误!";
|
|
@@ -3573,6 +3574,11 @@ namespace OASystem.API.Controllers
|
|
|
return Ok(jw);
|
|
|
}
|
|
|
|
|
|
+ Ctable.Name = Regex.Replace(Ctable.Name, @"[^\w\.@-]", "",
|
|
|
+ RegexOptions.None, TimeSpan.FromSeconds(1.5));
|
|
|
+ groupInfo.TeamName = Regex.Replace(groupInfo.TeamName, @"[^\w\.@-]", "",
|
|
|
+ RegexOptions.None, TimeSpan.FromSeconds(1.5));
|
|
|
+
|
|
|
var path = "\\GroupModelFiles\\" + groupInfo.TeamName + "\\" + Ctable.Name;
|
|
|
var fileBase = AppSettingsHelper.Get("GrpFileBasePath") + path;
|
|
|
|
|
@@ -3583,7 +3589,7 @@ namespace OASystem.API.Controllers
|
|
|
Directory.CreateDirectory(fileBase);
|
|
|
}
|
|
|
|
|
|
- var saveFilePath = fileBase + dto.File.Name;
|
|
|
+ var saveFilePath = fileBase +"\\"+ dto.File.FileName;
|
|
|
|
|
|
Grp_GroupModelFile file = new Grp_GroupModelFile()
|
|
|
{
|
|
@@ -3606,8 +3612,8 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
jw = JsonView(true, "保存成功!", new
|
|
|
{
|
|
|
- url = AppSettingsHelper.Get("WordBaseUrl") + AppSettingsHelper.Get("GrpFileFtpPath") + path
|
|
|
- }) ;
|
|
|
+ url = AppSettingsHelper.Get("WordBaseUrl") + AppSettingsHelper.Get("GrpFileFtpPath") + path + "\\" + dto.File.FileName
|
|
|
+ });
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|