zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小bug调整

Browse Source
This commit is contained in:
wangjinlei
2025-05-21 11:30:36 +08:00
parent d47bc1819e
commit 8cf196f992
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/api/controller/Email.php
View File

@@ -252,37 +252,37 @@ class Email extends Base
public function ntaPushEmail(){ public function ntaPushEmail(){
$journal_info = $this->journal_obj->where("journal_id",16)->find(); $journal_info = $this->journal_obj->where("journal_id",6)->find();
// $ids = $this->board_to_journal_obj->where("journal_id",16)->where("state",0)->column("user_id"); // $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",16)->where("end_date",">",1747380505)->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",16)->where("state",0)->column("reviewer_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 = $this->user_obj->whereIn("user_id",$ids)->select();
// $list[] = "751475802@qq.com"; // $list[] = ["realname"=>"wangjinlei","email"=>"751475802@qq.com"];
// $list[] = "924627193@qq.com"; // $list[] = ["realname"=>"zhuwenjing","email"=>"1300364247@qq.com"];
foreach ($list as $v){ foreach ($list as $v){
$content = "Dear Dr. ".$v['realname'].",<br/><br/>"; $content = "Dear Dr. ".$v['realname'].",<br/><br/>";
$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.<br/><br/>"; $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.<br/><br/>";
$content .= "Thank you for your consideration.<br/>"; $content .= "Thank you for your consideration.<br/>";
$content .= "Look forward for your reply.<br/><br/>"; $content .= "Look forward for your reply.<br/><br/>";
$content .= "Sincerely,<br/>Editorial Office<br/>Natural Therapy Advances<br/>Email: nta@tmrjournals.com<br/>Website: https://www.tmrjournals.com/nta/<br/>"; $content .= "Sincerely,<br/>Editorial Office<br/>Food and health<br/>Email: foodhealth@tmrjournals.com<br/>Website: https://www.tmrjournals.com/fh/<br/>";
$pre = Env::get('emailtemplete.pre'); $pre = Env::get('emailtemplete.pre');
$net = Env::get('emailtemplete.net'); $net = Env::get('emailtemplete.net');
$net1 = str_replace("{{email}}",$v['email'],$net); $net1 = str_replace("{{email}}",$v['email'],$net);
$mailbody=$pre.$content.$net1; $mailbody=$pre.$content.$net1;
$edata['email'] = $v['email']; $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['content'] = $mailbody;
$edata['tmail'] = $journal_info['email']; $edata['tmail'] = $journal_info['email'];
$edata['tpassword'] = $journal_info['epassword']; $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); return jsonSuccess($list);

9
application/api/controller/Preaccept.php
View File

@@ -1087,6 +1087,9 @@ class Preaccept extends Base
if(isset($data['note'])){ if(isset($data['note'])){
$insert['note'] = $data['note']; $insert['note'] = $data['note'];
} }
if(isset($data['title'])){
$insert['title'] = $data['title'];
}
$insert['ctime'] = time(); $insert['ctime'] = time();
$this->article_main_image_obj->insert($insert); $this->article_main_image_obj->insert($insert);
$re['url'] = $data['url']; $re['url'] = $data['url'];
@@ -1099,14 +1102,14 @@ class Preaccept extends Base
$data = $this->request->post(); $data = $this->request->post();
$rule = new Validate([ $rule = new Validate([
"ami_id"=>"require", "ami_id"=>"require",
"url"=>"require", "url"=>"require"
"note"=>"require"
]); ]);
if(!$rule->check($data)){ if(!$rule->check($data)){
return jsonError($rule->getError()); return jsonError($rule->getError());
} }
$update['url'] = $data['url']; $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); $this->article_main_image_obj->where("ami_id",$data['ami_id'])->update($update);
return jsonSuccess([]); return jsonSuccess([]);
} }

2
application/api/controller/Production.php
View File

@@ -333,6 +333,7 @@ class Production extends Base
} }
$insert['content'] = $data['content']; $insert['content'] = $data['content'];
$insert['width'] = $data['width']; $insert['width'] = $data['width'];
$insert['title'] = $data['title'];
$insert['note'] = $data['note']; $insert['note'] = $data['note'];
$this->production_article_main_img_obj->insert($insert); $this->production_article_main_img_obj->insert($insert);
return jsonSuccess([]); return jsonSuccess([]);
@@ -378,6 +379,7 @@ class Production extends Base
} }
$update['width']=$data['width']; $update['width']=$data['width'];
$update['content']=$data['content']; $update['content']=$data['content'];
$update['title'] = $data['title'];
$update['note'] = $data['note']; $update['note'] = $data['note'];
$this->production_article_main_img_obj->where('p_main_img_id',$data['p_main_img_id'])->update($update); $this->production_article_main_img_obj->where('p_main_img_id',$data['p_main_img_id'])->update($update);
return jsonSuccess([]); return jsonSuccess([]);

1
application/api/controller/Publish.php
View File

@@ -187,6 +187,7 @@ class Publish extends Base
$product = $this->production_article_obj->where("w_article_id",$data['article_id'])->find(); $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(); $check = $this->article_main_obj->where("article_id",$product['article_id'])->find();
$detail['has_html'] = $check?1:0; $detail['has_html'] = $check?1:0;
$detail['tg_article_id'] = $product['article_id'];
} }
$re['detail'] = $detail; $re['detail'] = $detail;