From 8cf196f992950a8f20b849a1824b406869a8a3a7 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 21 May 2025 11:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Email.php | 20 ++++++++++---------- application/api/controller/Preaccept.php | 9 ++++++--- application/api/controller/Production.php | 2 ++ application/api/controller/Publish.php | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/application/api/controller/Email.php b/application/api/controller/Email.php index 6466b29..4adb267 100644 --- a/application/api/controller/Email.php +++ b/application/api/controller/Email.php @@ -252,37 +252,37 @@ class Email extends Base public function ntaPushEmail(){ - $journal_info = $this->journal_obj->where("journal_id",16)->find(); -// $ids = $this->board_to_journal_obj->where("journal_id",16)->where("state",0)->column("user_id"); -// $ids = $this->user_to_yboard_obj->where("journal_id",16)->where("end_date",">",1747380505)->column("user_id"); - $ids = $this->reviewer_to_journal_obj->where("journal_id",16)->where("state",0)->column("reviewer_id"); + $journal_info = $this->journal_obj->where("journal_id",6)->find(); +// $ids = $this->board_to_journal_obj->where("journal_id",6)->where("state",0)->column("user_id"); + $ids = $this->user_to_yboard_obj->where("journal_id",6)->where("end_date",">",1747380505)->column("user_id"); +// $ids = $this->reviewer_to_journal_obj->where("journal_id",6)->where("state",0)->column("reviewer_id"); $list = $this->user_obj->whereIn("user_id",$ids)->select(); -// $list[] = "751475802@qq.com"; -// $list[] = "924627193@qq.com"; +// $list[] = ["realname"=>"wangjinlei","email"=>"751475802@qq.com"]; +// $list[] = ["realname"=>"zhuwenjing","email"=>"1300364247@qq.com"]; foreach ($list as $v){ $content = "Dear Dr. ".$v['realname'].",

"; - $content .= "We hereby inform you that Natural Therapy Advances will be merged into Integrative Medicine Discovery as of 19th May, 2025. We sincerely appreciate your long-term support and contributions for Natural Therapy Advances. If you are willing to continue serving as a Young Editorial Board Member/Editorial Board Member/Reviewer for the merged journal Integrative Medicine Discovery, please kindly confirm by replying to this email.

"; + $content .= "We hereby inform you that Food and health will be merged into Integrative Medicine Discovery as of 23th May, 2025. We sincerely appreciate your long-term support and contributions for Food and health, lf you are wiling to continue serving as a Young Editorial Board Member/EditoriaBoard Member/Reviewer for the merged journal Integrative Medicine Discovery, please kindly confirm by replying to this email.

"; $content .= "Thank you for your consideration.
"; $content .= "Look forward for your reply.

"; - $content .= "Sincerely,
Editorial Office
Natural Therapy Advances
Email: nta@tmrjournals.com
Website: https://www.tmrjournals.com/nta/
"; + $content .= "Sincerely,
Editorial Office
Food and health
Email: foodhealth@tmrjournals.com
Website: https://www.tmrjournals.com/fh/
"; $pre = Env::get('emailtemplete.pre'); $net = Env::get('emailtemplete.net'); $net1 = str_replace("{{email}}",$v['email'],$net); $mailbody=$pre.$content.$net1; $edata['email'] = $v['email']; - $edata['title'] = "Notice: Merger of Natural Therapy Advances into Integrative Medicine Discovery"; + $edata['title'] = "Notice: Merger of Food and health journal into Integrative Medicine Discovery"; $edata['content'] = $mailbody; $edata['tmail'] = $journal_info['email']; $edata['tpassword'] = $journal_info['epassword']; -// Queue::push('app\api\job\mail@fire', $edata, "tmail"); + Queue::push('app\api\job\mail@fire', $edata, "tmail"); } return jsonSuccess($list); diff --git a/application/api/controller/Preaccept.php b/application/api/controller/Preaccept.php index 84d1141..b1af7e6 100644 --- a/application/api/controller/Preaccept.php +++ b/application/api/controller/Preaccept.php @@ -1087,6 +1087,9 @@ class Preaccept extends Base if(isset($data['note'])){ $insert['note'] = $data['note']; } + if(isset($data['title'])){ + $insert['title'] = $data['title']; + } $insert['ctime'] = time(); $this->article_main_image_obj->insert($insert); $re['url'] = $data['url']; @@ -1099,14 +1102,14 @@ class Preaccept extends Base $data = $this->request->post(); $rule = new Validate([ "ami_id"=>"require", - "url"=>"require", - "note"=>"require" + "url"=>"require" ]); if(!$rule->check($data)){ return jsonError($rule->getError()); } $update['url'] = $data['url']; - $update['note'] = $data['note']; + $update['note'] = isset($data['note'])?$data['note']:""; + $update['title'] = isset($data['title'])?$data['title']:""; $this->article_main_image_obj->where("ami_id",$data['ami_id'])->update($update); return jsonSuccess([]); } diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php index f80c601..5da3ed1 100644 --- a/application/api/controller/Production.php +++ b/application/api/controller/Production.php @@ -333,6 +333,7 @@ class Production extends Base } $insert['content'] = $data['content']; $insert['width'] = $data['width']; + $insert['title'] = $data['title']; $insert['note'] = $data['note']; $this->production_article_main_img_obj->insert($insert); return jsonSuccess([]); @@ -378,6 +379,7 @@ class Production extends Base } $update['width']=$data['width']; $update['content']=$data['content']; + $update['title'] = $data['title']; $update['note'] = $data['note']; $this->production_article_main_img_obj->where('p_main_img_id',$data['p_main_img_id'])->update($update); return jsonSuccess([]); diff --git a/application/api/controller/Publish.php b/application/api/controller/Publish.php index dfe95c0..1bde006 100644 --- a/application/api/controller/Publish.php +++ b/application/api/controller/Publish.php @@ -187,6 +187,7 @@ class Publish extends Base $product = $this->production_article_obj->where("w_article_id",$data['article_id'])->find(); $check = $this->article_main_obj->where("article_id",$product['article_id'])->find(); $detail['has_html'] = $check?1:0; + $detail['tg_article_id'] = $product['article_id']; } $re['detail'] = $detail;