diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 7869c20f..36d92637 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -2712,26 +2712,26 @@ group by m.uuid,m.title,m.description) md ON md.uuid=v.uuid $this->db->query($sql,array($u_id,$id)); //email to admin & author - $mail=new WestdcMailer($this->view->config->smtp); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); - $mailtp=new EmailText($this->db,"metadata-release",array( - 'user' => $user->username, - 'uuid' => $row['uuid'], - 'email'=> $user->email, - //元数据标题 - 'title'=> $row['title'], - 'changelog'=>$changelog, - )); - $mail->setBodyText($mailtp->getBody()); - $mail->setSubject($mailtp->getSubject()); - if($this->debug==0) - { - $mail->addTo($this->view->config->service->email); - $mail->addCc($this->view->config->service->email); - }else{ - $mail->addTo($this->debug_email); - } - @$mail->send(); +// $mail=new WestdcMailer($this->view->config->smtp); +// $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); +// $mailtp=new EmailText($this->db,"metadata-release",array( +// 'user' => $user->username, +// 'uuid' => $row['uuid'], +// 'email'=> $user->email, +// //元数据标题 +// 'title'=> $row['title'], +// 'changelog'=>$changelog, +// )); +// $mail->setBodyText($mailtp->getBody()); +// $mail->setSubject($mailtp->getSubject()); +// if($this->debug==0) +// { +// $mail->addTo($this->view->config->service->email); +// $mail->addCc($this->view->config->service->email); +// }else{ +// $mail->addTo($this->debug_email); +// } +// @$mail->send(); $data = array("commited"=>1,"error"=>'该版本已经成功发布!'); $this->jsonexit($data); diff --git a/application/models/Search.php b/application/models/Search.php index bb72881a..c82c9355 100644 --- a/application/models/Search.php +++ b/application/models/Search.php @@ -65,7 +65,7 @@ class Search } function __construct($text='') { - require_once '/home/wlx/xunsearch/sdk/php/lib/XS.php'; + $this->xs=new XS('westdc'); $this->search=$this->xs->search; $this->terms = array();