개정판 06f13e11
한글 파일명 다운로드 에러 수정
멀티 서비스 수정
Change-Id: I1a7eb48f1c758d32c805eb0394c66b92f9d27330
| ConvertService/ServiceBase/Markus.Service.Convert/ConvertService.cs | ||
|---|---|---|
| 10 | 10 |
using System.ServiceModel; |
| 11 | 11 |
using System.Text; |
| 12 | 12 |
using Markus.Service.Extensions; |
| 13 |
using Markus.Service.WcfClient.StationServiceAsync; |
|
| 13 | 14 |
|
| 14 | 15 |
using System.Threading.Tasks; |
| 15 | 16 |
using System.Web; |
| ... | ... | |
| 27 | 28 |
private Markus.MarkusPDF gMarkusPDF; |
| 28 | 29 |
|
| 29 | 30 |
|
| 30 |
private StationService.StationServiceClient StationServiceClient;
|
|
| 31 |
private StationServiceClient StationServiceClient; |
|
| 31 | 32 |
|
| 32 | 33 |
/// <summary> |
| 33 | 34 |
/// 프로세스 초기화 |
| ... | ... | |
| 41 | 42 |
|
| 42 | 43 |
BasicHttpBinding myBinding = new BasicHttpBinding(); |
| 43 | 44 |
EndpointAddress myEndpoint = new EndpointAddress(UriHelper.UriCreate(ConvertProcessContext.ServiceStationUri)); |
| 44 |
StationServiceClient = new StationService.StationServiceClient(myBinding, myEndpoint);
|
|
| 45 |
StationServiceClient = new StationServiceClient(myBinding, myEndpoint); |
|
| 45 | 46 |
|
| 46 | 47 |
gMarkusPDF = new MarkusPDF(); |
| 47 | 48 |
gSaveTask = new SaveTask(); |
| ... | ... | |
| 299 | 300 |
//} |
| 300 | 301 |
|
| 301 | 302 |
saveItem.PdfFilePath = HttpUtility.UrlDecode(saveItem.PdfFilePath); //PDF 전체 경로 |
| 302 |
string FileName = string.Empty;
|
|
| 303 |
string FileName = DownloadUri.GetFileName(saveItem.PdfFilePath);
|
|
| 303 | 304 |
|
| 304 |
if (saveItem.PdfFilePath.Contains("VPCS_DOCLIB") || !saveItem.PdfFilePath.Contains("fileName"))
|
|
| 305 |
{
|
|
| 306 |
if (!Path.IsPathRooted(saveItem.PdfFilePath)) |
|
| 307 |
{
|
|
| 308 |
FileName = saveItem.PdfFilePath.Remove(0, saveItem.PdfFilePath.LastIndexOf("/") + 1);
|
|
| 309 |
} |
|
| 310 |
else |
|
| 311 |
{
|
|
| 312 |
FileName = saveItem.PdfFilePath.Remove(0, saveItem.PdfFilePath.LastIndexOf("\\") + 1);
|
|
| 313 |
} |
|
| 314 |
} |
|
| 315 |
else |
|
| 316 |
{
|
|
| 317 |
FileName = HttpUtility.ParseQueryString(new Uri(saveItem.PdfFilePath).Query).Get("fileName");
|
|
| 318 |
} |
|
| 319 |
|
|
| 320 | 305 |
string downloadFilePath = System.IO.Path.Combine(saveItem.SavePath, FileName); |
| 321 | 306 |
|
| 322 | 307 |
// 드라이브 경로가 포함되었는지 판단. |
| ... | ... | |
| 374 | 359 |
|
| 375 | 360 |
} |
| 376 | 361 |
} |
| 377 |
catch (Exception ex)
|
|
| 362 |
catch (Exception) |
|
| 378 | 363 |
{
|
| 379 | 364 |
result = false; |
| 380 | 365 |
} |
내보내기 Unified diff
