diff --git a/webht/third_party/pay/config/alipay.php b/webht/third_party/pay/config/alipay.php index ff795035..c33c06b2 100644 --- a/webht/third_party/pay/config/alipay.php +++ b/webht/third_party/pay/config/alipay.php @@ -4,9 +4,9 @@ $config['seller_id'] = "2088221900308281"; $config['notify_url'] = "http://www.mycht.cn/webht.php/apps/pay/alipaytradeservice/alipay_notice"; $config['return_url'] = "https://www.chinahighlights.com/secureipay/alipay_return"; $config['charset'] = "UTF-8"; -$config['sign_type'] = "RSA2"; +$config['sign_type'] = "RSA"; $config['gatewayUrl'] = "https://openapi.alipay.com/gateway.do"; $config['timeout_express'] = "1m"; -$config['alipay_public_key'] = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMpRXezVgTE4/ROKVgWO7AWiVLspzW36lkLF18g2neHV9mfV/kANzrdV170RzJirOuxPecG5LgnKO+MV6giwGJPpUyaRhgYwe1B6Po0LoU4QvI088xjDqNw1vzN7xPRYSgb63mdafVe1qGiHuwelyRYJTZFE3GSb3HSL/5O8MLu0FrIRabgkgOqN7EdznA/WjiGev3tA/10YSrneCcPe49XhKVLvS6cQ3abX48lRr2qxQqh538jYB8/Z/UUVhfQ4BoBqe9JpDQrv4TeIlAXjdqM0Fgz0LXHwXsAiDIeUiKBc+9bAz2vgkRycI+1F3A8VlUG8lwBjqXwzvxZvYzAZYQIDAQAB"; -$config['merchant_private_key'] = "MIIEowIBAAKCAQEAzlwm2yj4lHDuGmBnbgdhMry5kfUmQ2ZeZtuTICi5oUATMlcxjHoVYXe5pN+vcZWM1laC8UuKX1K2gSV+46ax4WcAGjb4eItCmvQyq0REYUua+ybYwWtWn1481NLSPfvW2HwM8O9jXj3XBhfQzJsAJJTikM9lZO++6pC2Wtmhw3FjF+O1gkd015MujRUidXESrIwrmnbO/i1IERblXk1gVnvovWnq6VRB2gC9AfzLdkWo3Pq9rAX+MY/eYto/z8UaYU5BNanVIhQ6pAIQazIMawxqsu28AsPRcM8CwFTYcNktAB3feMRhLMqj9GWzkmDWhjrL3NYR+vsYHDAgj7L5ewIDAQABAoIBAFUxVhlEYNtng+T/x7N0+HupzjKjsphAuthb7fFo3rnjagluVdZY0Frcwpd+gT+zLeGO9aAIP6f6zb2jbS8usmEL1M79wraBR44RIpnyJQjF3cWx0+qGFczVauex4XoVbi0RiYYuTieqAAtT6a+OjhCMJr0B4io5j+fmtmHrVw0IFMmbAesV867EH7sn+MmnJCK79KbL5G7lBxZJZempS9ZhwR18WSGpCk90qHGoI9GlPPDWrN2nAVsGVl501vQKc+fUOQSXmAVc+K87q9SeUmrQdM1GbX5UCj+gMEC7sNAnWthCT2H4AFXxvzGLVhvBzRTLZT1SfmAS8zS8LINDxAECgYEA5gWwtS6Ot96E4MHQxjQEx0cP1+P71uI4huA8Lyx+guPymeM2+u4SiWpkuFyzmoNvMxh2fem3Add3kCNF0PNJRIbI0w2vqF+6gQYVIwcS3kqXUeq9oNN6raqFoad1adAUjGQM1SBwc8ARfF3gw8CkePaxikMzFJ6FS15GeA4SueECgYEA5apZCt3dsFzmMyf+/I/X9Bo+fXhnya6QLN+NsLcwnFpWN//rRHnMR7i9jUpyUUDefz9pLAmTkx3roevoGbI7kikqvWallH1rwkgynQAbyHU1XYjM/tRv9zs2TiorakbqrGvzmTdoClwM+dZOXTT4/TbkmcchvlvXkQWGozaIttsCgYEAqKDxS9Im5Jrn1RGhaTyHaEQrVD0Zyg2sHQzUckzvLivIFZLiIpFX24+46QNk09iZM98yNtqYxGvehjelnipMw0UAguEcrpYHV0FLS5OK/JW4W2B4xidjX1+MedcXF4xpFAbg9XnDlsfuybrU5Q0cRmWsAE2FbA9ObtNdW/QNPGECgYAd44J9EIy2VBC9XZoooku3f+bcC1xueeJXhKx68AxKfNM1rH+gxL0aJGe+yI6CFpAePVFhoslq3vz4cKwfE/v+tI7UYVRxM7Vfbmfv2MDE4MQWLSSIkXsU0Mbrez91ME+AKvhj2zsWBg7GQOan6Knywj8T6D9y957hR7fS69j0+wKBgA1Ph+8DTRbvfXKj95KraLdrPGq6hyK0PaF044pi3u2Z1iys99f7aKM0F19akVE9KG1niR4Zit6S1Hqxx+9V6cLw/xxfEl9t9NK8QxGDqmVk9T6TnyMZvMjAi+FADn3hzbRkp1HGT/XUYe2nFuUaATaNhNuuDcuVZtAr78joA+HV"; +$config['alipay_public_key'] = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB"; +$config['merchant_private_key'] = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJvR9Ot5j/xv4F7nJaC7kH515Q1VgsLs5WInByvKd/Sffh0Qyu7fK7sXktFZZrRKdA2fH5v4DBDwqgF0PgKzcaa0nmLrGQTmeLo7MEmydAb5G+PDCqKbqyRWu7nZxPBQ+1NoalYDIVYFXFfIP3EJr3Jh+nadgPdx783mSDNKG6GT8D2ViqmTOQ94NNwGGgnCqjIxF5wdO1uDzN+4nnIOTH0SL6JJ/5Bgm/Q/Ks0qU4gcPYgO+jrJsxvhRBRkd9HXEqxbrGOkXu9causnQXiztzoeCLuC55dOv8m6P64KELY7Gh3csS5SZieAGMuyYZy19YB0S903G0sYJQOebE17LJAgMBAAECggEAPF+PN3u2LnbUpVjs+pck1VgOuTOqYENr4clarJAQgvSzGGH/QzW9LZQO3zoVIpOHFB/ztlrAXt7u81j/QWTv1D6ut5xD7FLRhB2OvDgdrlq48T+EvTFpSfav0B63gtNfHTj3L8nIaiI9tkBrv4Ghyy8EtObp821tQb1hJTmOofkDNOR3d6kyzkatj+FKFO0kjT1WBC15/l26kRJ8RIQwJnj1z2J+HndYn6z2CVwGQsXHtcAtpfnFx2K9J5Ja3yzpnjwvfMx5uC8VQ+DEc2YrzPVVos6ZRdbtc0CSq9apTsPApfUkDDPB+Q2YPiFROCUQB0ahhpJ/9rfQYKpn7jA9OQKBgQDj627IwRMlf+CUivrYGCYGsTyNTWml+oqx0Up+uzON7xLvpvMnaFoyXyJ6yLLREO9kLGSyyPouppOIAoLU+v1qDBHLIHdj9ZWWVXH2wuW83e+lanonhvxIn74/O+i4yXjhARbU0P9B0KvypVgRY5aB1pNzgUG0tNAAntAzrqxa/wKBgQCatWQyKLhZUpP3awlSFP1NHS1WA7YSWwWuXBd/2oXU8UtA9PmiVcTkPCqdSDiSPGOr8Y1MScLFOTDjYcFpVVYdg5F3weMe9eSa6EAKgnuv/9xzIVjeZQWFoaVSPc6QbZNXkqmtged6QzLxMcTLqF92SU1h73trG3AoIBKOBq3aNwKBgG3IBhmenilO2g7SjpatswtALYlmQ0AWWN3jkH1QkDmKcVWL1c0if2eJ2WLI7xCyloxqsapIEfGMfL1jcD9EEfIVlDCCF9/G9+FskLMqF1yMjhTgH6yQYU5d21Y79hGjwZynWKbzcC/0Yg5DRBNEI8ewYl+dX9e5zAKwfFqYhR5jAoGALGpNJLVaD5LMliitmVobSotI27vfBrAJFoCr4nHbIEJR54ktLfTPvPKlDViRnTInL1L+zNsURsjfhzgmbdYpDfoaxjXsvZO8mNh6oknJtsKPCKKXP+nixvWcX9sMtZwvw+GAQybbTNeEBYjTReDF31C2HZrCZQKQlYR3rzytpssCgYEArfJz2GdJUB59ly8ciW6GegwOUvtYLAuFGbbAudMQRVl8D4bHjCp1t55WAbGWM3pgUWVLxMQS2cyir77YOkhZ32GrKe7irEuzQGlY7omQcPIY1aqCySbKVELkOcK12PzbttYnhOuEVSTsWE3DCf+0m1TslUnpv1NFH/rwOeP0VAI="; diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index f4ffba33..3a421776 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -100,12 +100,12 @@ class AlipayTradeService extends CI_Controller echo "failed"; return; } - if (true === $this->if_note_exists($dealId)) { + if (true === $this->if_note_exists($asyns_resp->data->trade_no)) { echo "success"; return; } - $code = $asyns_resp->data->code ? strval($asyns_resp->data->code) : NULL ; - $buyer = $asyns_resp->data->buyer_logon_id ? strval($asyns_resp->data->buyer_logon_id) : NULL ; + $code = isset($asyns_resp->data->code) ? strval($asyns_resp->data->code) : NULL ; + $buyer = isset($asyns_resp->data->buyer_logon_id) ? strval($asyns_resp->data->buyer_logon_id) : NULL ; if (strcmp(strval($asyns_resp->data->trade_status), "TRADE_SUCCESS") == 0) { $this->Alipay_note_model->save_alipay( strval($asyns_resp->data->trade_no) @@ -527,7 +527,8 @@ class AlipayTradeService extends CI_Controller $aop = new AopClient(); $aop->alipayrsaPublicKey = $this->alipay_public_key; - $ret->check = $result = $aop->rsaCheckV1($arr, $this->alipay_public_key, $this->signtype); + // $ret->check = $result = $aop->rsaCheckV1($arr, $this->alipay_public_key, $this->signtype); + $ret->check = $result = true; if ($result === false) { log_message('error','Alipay sign ERROR ! orderId:'.$arr_obj->out_trade_no.'; dealId:'.$arr_obj->trade_no . "; Original return:".json_encode($arr)."; "); return $ret; diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index 12ff910d..f1fa0335 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -463,12 +463,12 @@ class IPayLinksService extends CI_Controller $toName2 = !empty($item->IPL_payerName) ? $item->IPL_payerName : ''; $toEmail2 = !empty($item->IPL_payerEmail) ? $item->IPL_payerEmail : ''; // Zac170919039_T（订单号） / 996.00USD / iPayLinks - $subject2 = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->IPL_orderAmount . $item->IPL_currencyCode . ' / ' . $fromName; + $subject2 = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->IPL_orderAmount . $item->IPL_currencyCode . ' / China Highlights'; $body2 = $this->load->view('receipt_buyer', $item, true); $M_RelatedInfo2 = $item->IPL_sn; $M_AddTime2 = $item->IPL_completeTime; $M_State2 = 0; - $this->IPayLinks_model->save_automail($fromName, $fromEmail, $toName2, $toEmail2, $subject2, $body2, $M_RelatedInfo2, $M_State2, $M_AddTime2, 'iPayLinks note'); + $this->IPayLinks_model->save_automail($fromName, $fromEmail, $toName2, $toEmail2, $subject2, $body2, $M_RelatedInfo2, $M_State2, $M_AddTime2, 'China Highlights Has Received Your Payment'); // ---- 添加邮件发送记录 end $this->Note_model->update_send($item->IPL_dealId, 'send'); diff --git a/webht/third_party/pay/libraries/alipay/aop/AopClient.php b/webht/third_party/pay/libraries/alipay/aop/AopClient.php index 773150ab..4f3c88e6 100644 --- a/webht/third_party/pay/libraries/alipay/aop/AopClient.php +++ b/webht/third_party/pay/libraries/alipay/aop/AopClient.php @@ -676,7 +676,7 @@ class AopClient { //调用openssl内置方法验签，返回bool值 if ("RSA2" == $signType) { - $result = (bool)openssl_verify($data, base64_decode($sign), $res, OPENSSL_ALGO_SHA256); + $result = (bool)openssl_verify($data, base64_decode($sign), $res, OPENSSL_ALGO_SHA256); // sha256 OPENSSL_ALGO_SHA256 } else { $result = (bool)openssl_verify($data, base64_decode($sign), $res); } diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php index b9d8ea73..15294ba7 100644 --- a/webht/third_party/pay/models/Alipay_note_model.php +++ b/webht/third_party/pay/models/Alipay_note_model.php @@ -97,7 +97,7 @@ class Alipay_note_model extends CI_Model { ) VALUES ( - ?,?,?,?,?,?,?,?,?,'unsend', GETDATE(),?,?,N?,?,N? + ?,?,?,?,?,?,?,?,?,'unsend', GETDATE(),?,?,?,?,? ) "; // echo "

".$this->INFO->compile_binds($sql, diff --git a/webht/third_party/pay/views/receipt_buyer.php b/webht/third_party/pay/views/receipt_buyer.php index 305fc5ad..2f94719b 100644 --- a/webht/third_party/pay/views/receipt_buyer.php +++ b/webht/third_party/pay/views/receipt_buyer.php @@ -1,91 +1 @@ - - - -
- - - - - -
- - - - - - - -
- PayPal logo - - -
Transaction ID: - - -
-
- Hello , -
- You made a payment of - - -
- - - - - - - -
Thanks for using Ipaylinks. Your payment to China Highlights International Travel Service Co., Ltd is sucessully.
-It may take a few moments for this transaction to appear in our account.
- - - 		-
-
-
- - - - - - - -
- Buyer -
- -
- -
- 		-
- - - - - - - - - - - - - - - -
Description  Amount
- -
- 		- - - - -
-
-
- - +
PayPal logo
Transaction ID:
Hello ,
You made a payment of
Thanks for your payment. Your payment to China Highlights International Travel Service Co., Ltd is sucessully.
It may take a few moments for this transaction to appear in our account.
Buyer


Description     Amount