From 4d3a431b4247a47f44cd0993d6222ffab2343a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E4=BC=9A=E9=B9=8F?= <1571360448@qq.com>
Date: Sat, 28 Oct 2017 09:33:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=9E=E6=98=BE=20=20--=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99,=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controller/ext/attachment/adminfile.js    |  8 +++++++
 .../attachment/view/pc/hooks_adminUpFile.html | 22 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/controller/ext/attachment/adminfile.js b/src/controller/ext/attachment/adminfile.js
index d627e695..b669b6a9 100644
--- a/src/controller/ext/attachment/adminfile.js
+++ b/src/controller/ext/attachment/adminfile.js
@@ -207,4 +207,12 @@ module.exports = class extends think.Controller {
       return this.fail('删除文件失败!');
     }
   }
+  // 文件信息
+  async fileinfoAction(){
+    const res = await this.fdb.find(this.get('id'));
+    if(!think.isEmpty(res)){
+      res.time = this.moment(res.create_time).format('lll');
+    }
+    return this.json(res);
+  }
 };
diff --git a/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html b/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
index 62b1fc97..d9ac0bde 100644
--- a/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
+++ b/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
@@ -49,10 +49,13 @@
     {%else%}
 <link rel="stylesheet" href="/static/admin/js/webuploader/webuploader.css" type="text/css">
     <div id="thelist_{{name}}" class="uploader-list"></div>
-    <div class="btns">
+    <div class="btns" id="file_list_hine">
         <div id="picker_{{name}}" class="picker">选择文件</div>
         <a id="ctlBtn_{{name}}" class="btn btn-default">开始上传</a>
     </div>
+    <div class="hidden alert alert-success" id="file_list_show">
+        <button data-dismiss="alert" id="file_list_show_close" class="close" type="button">×</button>
+    </div>
 <script src="/static/admin/js/webuploader/webuploader.js" type="text/javascript"></script>
     <script type="text/javascript">
         jQuery(function() {
@@ -61,7 +64,22 @@
                 $btn_{{name}} = $('#ctlBtn_{{name}}'),
                 state = 'pending',
                 uploader_{{name}};
-
+            var file_id = $("input[name="+{{name}}+"]").val();
+            if(file_id!=""){
+              $.get('/ext/attachment/adminfile/fileinfo',{id:file_id},function (data) {
+                if(data!=null){
+                  $('#file_list_hine').hide();
+                  $('#file_list_show').removeClass('hidden').append(
+                    `<p>文件名称:&nbsp${data.name}</p>`+
+                    `<p>文件大小:&nbsp${data.size}</p>`+
+                    `<p>上传时间:&nbsp${data.time}</p>`);
+                  $('#file_list_show_close').click(function () {
+                    $('#file_list_hine').show();
+                    $('#file_list_show').addClass('hidden')
+                  });
+                }
+              });
+            }
             uploader_{{name}} = WebUploader.create({
 
                 // 不压缩image
-- 
Gitee


From ab2eab7566bd88ed2e8c00255730fabb411fa531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E4=BC=9A=E9=B9=8F?= <1571360448@qq.com>
Date: Sat, 28 Oct 2017 11:33:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=9A=84=E6=96=B9=E5=BC=8F=20=20=E4=BB=A5?=
 =?UTF-8?q?=E5=89=8D=E5=9C=A8=E5=A6=82=E6=9E=9C=E6=98=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?,=E7=82=B9=E5=87=BB=E4=B8=8B=E8=BD=BD=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=AF=E6=96=B0=E5=BB=BA=E7=AA=97=E5=8F=A3=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.js                               |  1 +
 .../ext/attachment/view/pc/hooks_adminUpFile.html  |  5 +++--
 src/controller/home/detail.js                      | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/config/router.js b/src/config/router.js
index 0c62ae08..9c1268e2 100644
--- a/src/config/router.js
+++ b/src/config/router.js
@@ -13,6 +13,7 @@ module.exports = [
   ['/admin/mod/:cate_id', 'cmswing/modadminbase/index', 'get'],
   ['/q/:id', 'mod/question/index/detail', 'get'],
   [/\/api\/(\w+)(?:\/(\d+))?/, 'api/:1?id=:2', 'rest'],
+  ['/download/:id/:name', 'home/detail/download', 'get'],
   // [/^(?!\/admin\/|\/home\/|\/center\/|\/api\/|\/uxxx\/):id/i, '/home/route/index/:1/', 'get'],
   ['/:category', 'cmswing/route/index', 'get']
 ];
diff --git a/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html b/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
index d9ac0bde..a62e0c06 100644
--- a/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
+++ b/src/controller/ext/attachment/view/pc/hooks_adminUpFile.html
@@ -64,8 +64,9 @@
                 $btn_{{name}} = $('#ctlBtn_{{name}}'),
                 state = 'pending',
                 uploader_{{name}};
-            var file_id = $("input[name="+{{name}}+"]").val();
-            if(file_id!=""){
+            // 使用异步请求的方式
+            var file_id = $("input[name={{name}}]").val();
+            if(file_id!=0){
               $.get('/ext/attachment/adminfile/fileinfo',{id:file_id},function (data) {
                 if(data!=null){
                   $('#file_list_hine').hide();
diff --git a/src/controller/home/detail.js b/src/controller/home/detail.js
index 34c0534a..9988235c 100644
--- a/src/controller/home/detail.js
+++ b/src/controller/home/detail.js
@@ -5,6 +5,7 @@
 // +----------------------------------------------------------------------
 // | Author: arterli <arterli@qq.com>
 // +----------------------------------------------------------------------
+const fs = require('fs');
 module.exports = class extends think.cmswing.center {
   // 详情页[核心]
   async indexAction() {
@@ -217,17 +218,17 @@ module.exports = class extends think.cmswing.center {
     // console.log(file_id);
     let dlink;
     if (Number(id[1]) === 1) {
-      const location = await this.model('file').where({id: file_id}).getField('location', true);
+      // const location = await this.model('file').where({id: file_id}).getField('location', true);
       // console.log(location);
       const d = await get_file(file_id);
-      if (Number(this.config('ext.qiniu.is')) === 1 && Number(location) === 1) {
+      if (Number(this.config('ext.qiniu.is')) === 1) {
         // 七牛下载
         // dlink = await get_file(file_id,"savename",true);
         const qiniu = this.extService('qiniu', 'qiniu');
         dlink = await qiniu.download(d.savename);
       } else {
         // 本地下载
-        dlink = d.savepath + d.savename + '?attname=';
+        dlink = `http://${this.ctx.host}/download/${d.id}/${d.name}`;
       }
       // console.log(dlink);
       // 访问统计
@@ -267,4 +268,11 @@ module.exports = class extends think.cmswing.center {
       }
     }
   }
+  // 下载文件
+  async downloadAction(){
+    const file = await get_file(this.get('id'));
+    this.header('Content-Disposition', `attachment; filename=${file.name}`);
+    const filePath = `${think.ROOT_PATH}/www${file.savename}`;
+    this.body = fs.readFileSync(filePath);
+  }
 };
-- 
Gitee