From 5da96c4884ee3c0576790228abe16ce2990c9c03 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 15 May 2019 14:13:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=80=80=E7=A5=A8=E9=82=AE=E4=BB=B6=E7=BB=99=E5=AE=A2=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/controllers/returnorders.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php index d2903963..749cbd67 100644 --- a/application/third_party/trainsystem/controllers/returnorders.php +++ b/application/third_party/trainsystem/controllers/returnorders.php @@ -102,10 +102,10 @@ class returnorders extends CI_Controller{ $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); //发送邮件给客人 $customer_subject = 'China Train Ticket(s) Cancelation'; - $customer_body = '

Dear '.$data->tst_realname.',

Your tickets (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.',train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.',email address:'.$toEmail.',phone number '.$Mobile.') will contact you with the refund details via email within 24 hours.'; + $customer_body = '

Dear '.$data->tst_realname.',

Your tickets (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.', train No. '.$back_detail_data->result->checi.') have been cancelled online successfully. Your travel advisor ('.$toName.', email address: '.$toEmail.', phone number '.$Mobile.') will contact you with the refund details via email within 24 hours.'; $customer_email = $this->BIZ_train_model->get_guest_info($coli_id); $customer_email = $customer_email[0]->GUT_Email; - $this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'Phoebe@chinahighlights.net',$customer_subject,$customer_body); + $this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body); echo '{"reason":"退票成功","status":"200"}'; }else{ //退票失败后发送邮件 @@ -117,7 +117,7 @@ class returnorders extends CI_Controller{ $customer_body = '

Dear '.$data->tst_realname.',

Your application for online ticket cancellation (ticket number '.$back_detail_data->result->ordernumber.', for name '.$data->tst_realname.', train No.'.$back_detail_data->result->checi.') has failed.Your travel advisor('.$toName.', email address: '.$toEmail.', phone number '.Mobile.') will contact you via email within 24 hours. Please call us if you need to contact us urgently.

'; $customer_email = $this->BIZ_train_model->get_guest_info($coli_id); $customer_email = $customer_email[0]->GUT_Email; - $this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,'Phoebe@chinahighlights.net',$customer_subject,$customer_body); + $this->Sendmail_model->SendMailToTable($toName,$toEmail,$data->tst_realname,$customer_email,$customer_subject,$customer_body); header("HTTP/1.1 404 Not Found"); echo '{"reason":"退票失败","status":"404"}'; } From dea7dd8f30b553e29c8a3211a78436eb422030cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 15 May 2019 14:15:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=AA=92?= =?UTF-8?q?=E4=BD=93=E4=B8=AD=E5=BF=83=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media/popselectpicture.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/media/popselectpicture.php b/media/popselectpicture.php index 9f476067..a1a4ef5f 100644 --- a/media/popselectpicture.php +++ b/media/popselectpicture.php @@ -106,6 +106,24 @@ function is_remote_ip() return true; } +//CDN分发之后，源站和前端域名不一致在这里修正，否则程序生成的链接是源站的域名 +$base_url=''; +switch ($_SERVER['SERVER_NAME']){ + case 'origin-ct.mycht.cn': + $base_url='https://ct.mycht.cn'; + break; + case 'origin-gm.mycht.cn': + $base_url='https://gm.mycht.cn'; + break; + case 'origin-cht.mycht.cn': + $base_url='https://cht.mycht.cn'; + break; + case 'origin-int.mycht.cn': + $base_url='https://int.mycht.cn'; + break; + default:$base_url='https://'.$_SERVER['HTTP_HOST']; +} + ?> - +