Skip to content

Commit

Permalink
#127705 修正當OrderResultURL有-號會無法建立訂單的問題
Browse files Browse the repository at this point in the history
  • Loading branch information
AllennChang committed Sep 11, 2021
1 parent 2429f4a commit e8ad43d
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 6 deletions.
Binary file modified ECPay.Payment.Integration.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public PaymentMethod ChoosePayment
/// <summary>
/// 用戶端回傳付款結果的網址(※設定了此參數值,會使設定的ClientBackURL失效)。
/// </summary>
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string OrderResultURL { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class SendExtendArguments
/// <summary>
/// 此網址為訂單建立完成後(非付款完成後),綠界科技會將付款相關資訊以Client端方式回傳給特約商店(※有設定此參數ClientBackURL參數將會失去作用)。
/// </summary>
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string ClientRedirectURL { get; set; }
/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public abstract class SendArguments
/// <summary>
/// 商品銷售的網址(ReadOnly)。
/// </summary>
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string ItemURL { get; set; }
/// <summary>
Expand All @@ -72,13 +72,13 @@ public abstract class SendArguments
/// 付款完成通知的回傳網址。
/// </summary>
[Required(ErrorMessage = "{0} is required.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string ReturnURL { get; set; }
/// <summary>
/// 用戶端返回廠商站台的網址(※頁面導回的時候,不會帶付款結果到此網址,只是將頁面導回而已)。
/// </summary>
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string ClientBackURL { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion ECPay.Payment.Integration/Metadata/CommonMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public abstract partial class CommonMetadata
/// 介接服務的網址。
/// </summary>
[Required(ErrorMessage = "{0} is required.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[RegularExpression(@"^(?:http|https|ftp)://[a-zA-Z0-9\.\-]+(?:\:\d{1,5})?(?:[A-Za-z0-9\.\;\:\@\&\=\+\-\$\,\?/_]|%u[0-9A-Fa-f]{4}|%[0-9A-Fa-f]{2})*$", ErrorMessage = "{0} is not correct URL.")]
[StringLength(200, ErrorMessage = "{0} max langth as {1}.")]
public string ServiceURL { get; set; }
/// <summary>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit e8ad43d

Please sign in to comment.