diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index 2ce890c..1818be8 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -323,20 +323,70 @@ class Article extends Controller {
      * 
      * @param name:article_id type:int require:1 desc:文章id
      * 
-     * @return icon:图片
-     * @return tradition_tag:封皮标签
-     * @return tradition:封皮简介
-     * @return doi:doi
-     * @return abstract:简介
-     * @return keywords:关键字
-     * @return fund:fund
-     * @return sort:权重
-     * @return pub_date:发表日期
+     * @return articleInfo:文章详情@
+     * @articleInfo icon:图片
+     * @articleInfo tradition_tag:封皮标签
+     * @articleInfo tradition:封皮简介
+     * @articleInfo doi:doi
+     * @articleInfo abstract:简介
+     * @articleInfo keywords:关键字
+     * @articleInfo fund:fund
+     * @articleInfo file_html:html文件
+     * @articleInfo sort:权重
+     * @articleInfo pub_date:发表日期
+     * 
+     * 
+     * @return files:文件列表#
+     * 
      */
     public function getArticleBase(){
         $data = $this->request->post();
-        $article = $this->article_obj->where('article_id',$data['article_id'])->find();
-        return json(['code'=>0,'msg'=>'success','data'=>$article]);
+        $article_info = $this->article_obj->where('article_id',$data['article_id'])->find();
+        $journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
+        $list = scandir(ROOT_PATH.'public/articleHTML/'.$journal_info['sx']);
+        $frag = [];
+        foreach ($list as $k => $v){
+            if($k>2){
+                $frag[] = $v;
+            }
+        }
+        
+        $re['articleInfo'] = $article_info;
+        $re['files'] = $frag;
+        return jsonSuccess($re);
+//        return json(['code'=>0,'msg'=>'success','data'=>$article_info]);
+    }
+    
+    /**
+     * @title 获取文章html文件列表
+     * @description 获取文章html文件列表
+     * @author wangjinleichang
+     * @url /master/Article/getHtmlFiles
+     * @method POST
+     * 
+     * @param name:article_id type:int require:1 desc:文章id
+     * 
+     * @return files:文件列表#
+     * 
+     */
+    public function getHtmlFiles(){
+        $data = $this->request->post();
+        $data['article_id'] = 1;
+        $article_info = $this->article_obj->where('article_id',$data['article_id'])->find();
+        $journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
+        $list = scandir(ROOT_PATH.'public/articleHTML/'.$journal_info['sx']);
+        $frag = [];
+        foreach ($list as $k => $v){
+            if($k>2){
+                $frag[] = $v;
+            }
+        }
+        return jsonSuccess($data);
+//        $list = scandir(ROOT_PATH.'public/articleHTML/TMR');
+//        echo '<pre>';
+//        var_dump($list);
+//        echo '</pre>';
+//        die;
     }
     
     /**
@@ -363,6 +413,7 @@ class Article extends Controller {
      * @param name:cited type:int require:1 desc:引用数
      * @param name:abbr type:string require:0 desc:作者简称
      * @param name:sort type:int require:1 desc:权重
+     * @param name:file_html type:string require:0 desc:html文件
      * @param name:fund type:string require:1 desc:fund
      * @param name:pub_date type:string require:1 desc:发表日期
      * 
@@ -385,6 +436,7 @@ class Article extends Controller {
         $updata['cited'] = $data['cited'];
         $updata['abbr'] = $data['abbr'];
         $updata['fund'] = $data['fund'];
+        $updata['file_html'] = $data['file_html'];
         $updata['sort'] = $data['sort'];
         $updata['pub_date'] = $data['pub_date'];
         $res = $this->article_obj->where('article_id',$data['article_id'])->update($updata);