개정판 06fc1405
issue #1182: wcf 수정
Change-Id: I29887e93b0e34bab61f83c1210fa74fe1cdb4adf
| ConvertService/ServiceBase/ConvertionWebService/Conversion.asmx.cs | ||
|---|---|---|
| 154 | 154 |
{
|
| 155 | 155 |
group_No = "0"; |
| 156 | 156 |
} |
| 157 |
if (!prj_No.Equals("150128"))
|
|
| 157 |
if (!document_Url.Contains("http%3a%2f%2f"))
|
|
| 158 | 158 |
{
|
| 159 |
//Omsk 는 웹서비스 호출 시 인코딩 |
|
| 160 |
//Omsk 제외는 Markus 에서 인코딩 |
|
| 161 |
if(!document_Url.Contains("http%3a%2f%2f"))
|
|
| 162 |
{
|
|
| 163 |
document_Url = Base64Decode(document_Url); |
|
| 164 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 165 |
} |
|
| 159 |
document_Url = Base64Decode(document_Url); |
|
| 160 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 166 | 161 |
} |
| 162 |
document_Name = Base64DecodeFromStr(document_Name); |
|
| 167 | 163 |
var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault(); |
| 168 | 164 |
if (doc != null) |
| 169 | 165 |
{
|
| ... | ... | |
| 326 | 322 |
} |
| 327 | 323 |
return _result; |
| 328 | 324 |
} |
| 325 |
public string Base64DecodeFromStr(string data) |
|
| 326 |
{
|
|
| 327 |
try |
|
| 328 |
{
|
|
| 329 |
System.Text.UTF8Encoding encoder = new System.Text.UTF8Encoding(); |
|
| 330 |
System.Text.Decoder utf8Decode = encoder.GetDecoder(); |
|
| 331 |
|
|
| 332 |
byte[] todecode_byte = Convert.FromBase64String(data); |
|
| 333 |
|
|
| 334 |
int charCount = utf8Decode.GetCharCount(todecode_byte, 0, todecode_byte.Length); |
|
| 335 |
|
|
| 336 |
char[] decoded_char = new char[charCount]; |
|
| 337 |
|
|
| 338 |
utf8Decode.GetChars(todecode_byte, 0, todecode_byte.Length, decoded_char, 0); |
|
| 339 |
|
|
| 340 |
string result = new String(decoded_char); |
|
| 341 |
|
|
| 342 |
return result; |
|
| 343 |
} |
|
| 344 |
catch (Exception) |
|
| 345 |
{
|
|
| 346 |
return data; |
|
| 347 |
} |
|
| 348 |
} |
|
| 329 | 349 |
public string Base64Decode(string data) |
| 330 | 350 |
{
|
| 331 | 351 |
try |
| ... | ... | |
| 564 | 584 |
{
|
| 565 | 585 |
group_No = "0"; |
| 566 | 586 |
} |
| 567 |
if (!prj_No.Equals("150128"))
|
|
| 587 |
if (!document_Url.Contains("http%3a%2f%2f"))
|
|
| 568 | 588 |
{
|
| 569 |
//Omsk 는 웹서비스 호출 시 인코딩 |
|
| 570 |
//Omsk 제외는 Markus 에서 인코딩 |
|
| 571 |
if (!document_Url.Contains("http%3a%2f%2f"))
|
|
| 572 |
{
|
|
| 573 |
document_Url = Base64Decode(document_Url); |
|
| 574 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 575 |
} |
|
| 589 |
document_Url = Base64Decode(document_Url); |
|
| 590 |
document_Url = HttpUtility.UrlEncodeUnicode(document_Url); |
|
| 576 | 591 |
} |
| 592 |
document_Name = Base64DecodeFromStr(document_Name); |
|
| 593 |
|
|
| 577 | 594 |
var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault(); |
| 578 | 595 |
if(doc != null) |
| 579 | 596 |
{
|
내보내기 Unified diff
