From d05810b93f4468ed349083640a8aab33d19fd996 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 13 May 2019 15:51:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=A8=E5=9F=9F?= =?UTF-8?q?=E5=A4=B4=E9=83=A8?= 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, 6 insertions(+) diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php index 078bf373..8f7e05a0 100644 --- a/application/third_party/trainsystem/controllers/returnorders.php +++ b/application/third_party/trainsystem/controllers/returnorders.php @@ -10,6 +10,7 @@ class returnorders extends CI_Controller{ $this->load->model("train_system_model"); $this->load->model("Sendmail_model"); $this->load->model('BIZ_train_model'); + } public function index(){ @@ -17,6 +18,11 @@ class returnorders extends CI_Controller{ } public function returntickets(){ + header('Access-Control-Allow-Origin:*'); + header('Access-Control-Allow-Methods:POST, GET'); + header('Access-Control-Max-Age:0'); + header('Access-Control-Allow-Headers:x-requested-with, Content-Type'); + header('Access-Control-Allow-Credentials:true'); //第三方订单号(为了避免一个子订单乘客分开出票而产生错误) $ordernumber = $this->input->get_post('ordernumber'); //护照姓名 From 22c6858d63110bb25b39504360cc3a59ad67c699 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 13 May 2019 15:53:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index cac198b1..9de4109c 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -554,7 +554,7 @@ class Information extends CI_Controller case 'ru': case 'jp': $information = $this->Information_model->Detail($url); - if ($delete_only || $information->ic_ht_area_type === 'q') { + if ($delete_only || !$information || $information->ic_ht_area_type === 'q') { //只删除操作，在url修改和不发布信息的时候使用 $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; } else { From 075cd9635f26dce5723b1ae133de9681f67cdde9 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 13 May 2019 16:15:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/dingmail/controllers/index.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webht/third_party/dingmail/controllers/index.php b/webht/third_party/dingmail/controllers/index.php index e64b2b6b..b11f4bda 100644 --- a/webht/third_party/dingmail/controllers/index.php +++ b/webht/third_party/dingmail/controllers/index.php @@ -254,7 +254,13 @@ class Index extends CI_Controller { $mail->CharSet = "utf-8"; $mail->Encoding = "base64"; $mail->IsHTML(true); - + $mail->SMTPOptions = array( + 'ssl' => array( + 'verify_peer' => false, + 'verify_peer_name' => false, + 'allow_self_signed' => true + ) + ); $mail->FromName = $fromuser; //收件人昵称 $mail->From = 'admin@hainatravel.com'; //发件人 From 62f13bca2a6e747c2b17c1a62f9231d9c9ba7710 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 13 May 2019 16:41:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/dingmail/controllers/index.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/webht/third_party/dingmail/controllers/index.php b/webht/third_party/dingmail/controllers/index.php index b11f4bda..b09ddda8 100644 --- a/webht/third_party/dingmail/controllers/index.php +++ b/webht/third_party/dingmail/controllers/index.php @@ -246,21 +246,16 @@ class Index extends CI_Controller { $mail = new PHPMailer(); $mail->IsSMTP(); $mail->Host = 'smtp.mxhichina.com';//smtp.sendgrid.net - $mail->Port = 25; + $mail->Port = 465; $mail->SMTPAuth = true; + $mail->SMTPSecure = false; $mail->Username = 'admin@hainatravel.com'; $mail->Password = "Hainatravel123";//Hainatravel1234 - $mail->SMTPSecure = 'tls'; + $mail->SMTPSecure = 'ssl'; $mail->CharSet = "utf-8"; $mail->Encoding = "base64"; $mail->IsHTML(true); - $mail->SMTPOptions = array( - 'ssl' => array( - 'verify_peer' => false, - 'verify_peer_name' => false, - 'allow_self_signed' => true - ) - ); + //$mail->SMTPDebug = 2; $mail->FromName = $fromuser; //收件人昵称 $mail->From = 'admin@hainatravel.com'; //发件人 From 3506581a546a29ad1a994532eecdb6d2c3db3e7b Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 14 May 2019 09:52:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9value=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dingmail/controllers/index.php | 29 +++++++++++++++++-- webht/third_party/dingmail/views/mail.php | 6 ++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/webht/third_party/dingmail/controllers/index.php b/webht/third_party/dingmail/controllers/index.php index b09ddda8..fa62d011 100644 --- a/webht/third_party/dingmail/controllers/index.php +++ b/webht/third_party/dingmail/controllers/index.php @@ -73,12 +73,13 @@ class Index extends CI_Controller { //value邮件页面 public function mail_index(){ - if($this->session->userdata('dingding_user_info') === false){ + /*if($this->session->userdata('dingding_user_info') === false){ $this->load->view('login'); }else{ //print_r($this->session->userdata('dingding_user_info')); $this->load->view('mail'); - } + }*/ + $this->load->view('mail'); } //发送邮件 @@ -231,7 +232,7 @@ class Index extends CI_Controller { $tolist_array = array(); $tolist_array['0'] = new stdClass(); - $tolist_array['0']->ddu_Email = 'cyc@hainatravel.com'; + $tolist_array['0']->ddu_Email = 'hr@chinahighlights.net'; if($this->do_sendmail('cyc',$tolist_array,'','应聘简历',$mailnody)){ echo '{"status":1}'; @@ -575,6 +576,28 @@ class Index extends CI_Controller { return; } + public function upload_photos() { + $save_path = date('Y-m-d'); + $jsfunction = 'get_photo_url'; + $upload_id = 'Profile_file'; + $config['upload_path'] = APPPATH . 'upload/' . $save_path; + if (!is_dir($config['upload_path'])) { + @mkdir($config['upload_path'], 0777, true); + } + $config['allowed_types'] = 'gif|jpg|png'; + $config['encrypt_name'] = true; + + $this->load->library('upload', $config); + if (!$this->upload->do_upload($upload_id)) { + $error = array('error' => $this->upload->display_errors()); + var_dump($error); + } else { + $data = array('upload_data' => $this->upload->data()); + $file_name = 'http://' . $_SERVER['HTTP_HOST'] . '/' . $config['upload_path'] . '/' . $data['upload_data']['file_name']; + echo ""; + } + } + //退出 public function logout(){ $this->session->unset_userdata('dingding_user_info'); diff --git a/webht/third_party/dingmail/views/mail.php b/webht/third_party/dingmail/views/mail.php index cbcbdef3..de104df7 100644 --- a/webht/third_party/dingmail/views/mail.php +++ b/webht/third_party/dingmail/views/mail.php @@ -7,7 +7,7 @@ HT在线平台 - + @@ -287,7 +287,7 @@
-