diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index b1f7327..76f91bc 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -1000,7 +1000,7 @@ class Article extends Base $h_check = false; foreach ($authors as $v) { $cache_report = $this->user_obj->where('email', $v['email'])->find(); - if ($cache_report == null || $article_info['state'] != 0 || $cache_report['google_time'] != 0 || $cache_report['google_index'] != 0 || $data['state'] == 3) { + if ($cache_report == null || $article_info['state'] != 0 || $cache_report['google_time'] != 0 ||$cache_report['g_author']!=""|| $cache_report['google_index'] != 0 || $data['state'] == 3) { $h_check = true; break; } @@ -2466,7 +2466,7 @@ class Article extends Base //图表 $b_fen = 0; $p_num = 0; - $url = "http://ts.tmrjournals.com/api/typeset/readPic"; + $url = $this->ts_base_url."api/typeset/readPic"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); $wp = isset($res['data']['pic']) ? $res['data']['pic'] : 0; diff --git a/application/api/controller/Base.php b/application/api/controller/Base.php index fb7edb8..6f78e2b 100644 --- a/application/api/controller/Base.php +++ b/application/api/controller/Base.php @@ -9,6 +9,8 @@ use hashids\hashids; class Base extends Controller { + protected $ts_base_url = "http://ts.tmrjournals.cn/"; + protected $user_obj = ''; protected $captcha_obj = ''; protected $article_obj = ''; @@ -298,6 +300,7 @@ class Base extends Controller $this->addProductionEx($data['article_id']); } + public function addProductionEx($article_id) { $check = $this->production_article_obj->where('article_id', $article_id)->where('state', 0)->find(); @@ -316,7 +319,7 @@ class Base extends Controller return jsonError('No Manuscript'); } - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); $file_runs = $res['data']; @@ -578,7 +581,7 @@ class Base extends Controller if (count($files) == 0) { return jsonError('No Manuscript'); } - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); @@ -644,7 +647,7 @@ class Base extends Controller { $p_info = $this->production_article_obj->where('p_article_id', $p_article_id)->find(); $article_info = $this->article_obj->where('article_id', $p_info['article_id'])->find(); - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/completedManuscirpt/" . $file; // $program['fileRoute'] = "https://submission.tmrjournals.com/public/completedManuscirpt/20230706/87628e769c4ee8a8414219b05c72a028.docx" ; $res = object_to_array(json_decode(myPost($url, $program))); diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php index 5107ac9..20426ad 100644 --- a/application/api/controller/Production.php +++ b/application/api/controller/Production.php @@ -52,7 +52,7 @@ class Production extends Base return jsonError('No Manuscript'); } - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); $file_runs = $res['data']; @@ -1077,7 +1077,7 @@ class Production extends Base // $typesetInfo['refers'] = json_encode($refers); $typesetInfo['refers'] = json_encode($rs); - $url = "http://ts.tmrjournals.com/api/typeset/webGetDocx"; + $url = $this->ts_base_url."api/typeset/webGetDocx"; // $url = "http://localhost:8081/typeset/webGetDocx"; $res = object_to_array(json_decode(myPost1($url, $typesetInfo))); diff --git a/application/api/controller/Special.php b/application/api/controller/Special.php index 0e44295..fdc34c7 100644 --- a/application/api/controller/Special.php +++ b/application/api/controller/Special.php @@ -648,7 +648,7 @@ class Special extends Controller //图表 $b_fen = 0; $p_num = 0; - $url = "http://ts.tmrjournals.com/api/typeset/readPic"; + $url = $this->ts_base_url."api/typeset/readPic"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); $wp = isset($res['data']['pic'])?$res['data']['pic']:2; diff --git a/application/api/controller/Typeset.php b/application/api/controller/Typeset.php index 8340500..fbce065 100644 --- a/application/api/controller/Typeset.php +++ b/application/api/controller/Typeset.php @@ -772,7 +772,7 @@ class Typeset extends Base // $url = "http://localhost:8081/typeset/webGetDocx"; // $url = "http://192.168.110.100:8080/typeset/webGetDocx"; - $url = "http://ts.tmrjournals.com/api/typeset/webGetDocx"; + $url = $this->ts_base_url."api/typeset/webGetDocx"; // var_dump($typesetInfo);die; $res = object_to_array(json_decode(myPost1($url, $typesetInfo))); // return jsonSuccess($res); @@ -905,7 +905,7 @@ class Typeset extends Base //调用接口分解word, // $url = "http://localhost:8080/typeset/webReaddoc"; - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); @@ -1022,7 +1022,7 @@ class Typeset extends Base return jsonError('No Manuscript'); } //调用接口分解word, - $url = "http://ts.tmrjournals.com/api/typeset/webReaddoc"; + $url = $this->ts_base_url."api/typeset/webReaddoc"; $program['fileRoute'] = "https://submission.tmrjournals.com/public/" . $files[0]['file_url']; $res = object_to_array(json_decode(myPost($url, $program))); $file_runs = $res['data'];