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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangjinlei
2025-11-13 13:15:55 +08:00
parent e65359433d 501edb9ca2
commit 32c071aea4
9 changed files with 1206 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,7 +481,8 @@ class Production extends Base
'acknowledgment' => 'require',
'keywords' => 'require',
'author_contribution' => 'require',
'abbr' => 'require'
'abbr' => 'require',
'abstract' => 'require'
]);
if (!$rule->check($data)) {
return jsonError($rule->getError());
@@ -521,7 +522,7 @@ class Production extends Base
// $update['doi'] = $doi;
$update['abstract'] = isset($data['abstract']) ? trim($data['abstract']) : '';
$this->production_article_obj->where('p_article_id', $data['p_article_id'])->update($update);
return jsonSuccess($update);
}
@@ -664,14 +665,16 @@ class Production extends Base
$data = $this->request->post();
$rule = new Validate([
'p_article_id' => 'require|number',
'abstract' => 'require',
// 'abstract' => 'require',
'doi' => 'require',
'pub_date' => 'require'
]);
if (!$rule->check($data)) {
return jsonError($rule->getError());
}
$updata['abstract'] = trim($data['abstract']);
if(isset($data['abstract'])){
$updata['abstract'] = trim($data['abstract']);
}
$updata['doi'] = $data['doi'];
$updata['pub_date'] = $data['pub_date'];
$this->production_article_obj->where('p_article_id', $data['p_article_id'])->update($updata);
@@ -1807,8 +1810,8 @@ private function escapeLatexText($text)
$typesetInfo['images'] = null;
$typesetInfo['tables'] = null;
// $url = $this->ts_base_url."api/typeset/createDocx";
$url = "http://192.168.110.110:8081/typeset/createDocx";
$url = $this->ts_base_url."api/typeset/createDocx";
// $url = "http://192.168.110.110:8081/typeset/createDocx";
// $url = "http://192.168.110.110:8081/typeset/testqt";
$res = object_to_array(json_decode(myPost1($url, $typesetInfo)));