Merge remote-tracking branch 'origin/master'

.gitattributes

@@ -0,0 +1 @@
+*.sql linguist-language=GO

QMPlusServer/controller/api/fileUploadAndDownload.go

@@ -62,7 +62,7 @@ func DeleteFile(c *gin.Context) {
 		if err != nil {
 			servers.ReportFormat(c, false, fmt.Sprintf("删除失败，%v", err), gin.H{})
 		} else {
-			err = file.DeleteFile()
+			err = f.DeleteFile()
 			if err != nil {
 				servers.ReportFormat(c, false, fmt.Sprintf("删除失败，%v", err), gin.H{})
 			} else {
@@ -70,7 +70,6 @@ func DeleteFile(c *gin.Context) {
 			}
 		}
 	}
-
 }
 
 // @Tags FileUploadAndDownload

QMPlusServer/docs/docs.go

@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2019-11-20 16:37:42.2606856 +0800 CST m=+0.064825001
+// 2019-11-20 16:59:15.3568689 +0800 CST m=+0.056920101
 
 package docs
 
@@ -1290,6 +1290,9 @@ var doc = `{
         "dbModel.FileUploadAndDownload": {
             "type": "object",
             "properties": {
+                "key": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },

QMPlusServer/docs/swagger.json

@@ -1273,6 +1273,9 @@
         "dbModel.FileUploadAndDownload": {
             "type": "object",
             "properties": {
+                "key": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },

QMPlusServer/docs/swagger.yaml

@@ -114,6 +114,8 @@ definitions:
     type: object
   dbModel.FileUploadAndDownload:
     properties:
+      key:
+        type: string
       name:
         type: string
       tag:

QMPlusVuePage/src/api/fileUploadAndDownload.js

@@ -13,4 +13,19 @@ export const getFileList = (data) => {
         method: "post",
         data
     })
+}
+
+// @Tags FileUploadAndDownload
+// @Summary 删除文件
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body dbModel.FileUploadAndDownload true "传入文件里面id即可"
+// @Success 200 {string} json "{"success":true,"data":{},"msg":"返回成功"}"
+// @Router /fileUploadAndDownload/deleteFile [post]
+export const deleteFile = (data) => {
+    return service({
+        url: "/fileUploadAndDownload/deleteFile",
+        method: "post",
+        data
+    })
 }

QMPlusVuePage/src/utils/data.js

@@ -0,0 +1,30 @@
+// 对Date的扩展，将 Date 转化为指定格式的String
+// 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
+// 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
+// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423
+// (new Date()).Format("yyyy-M-d h:m:s.S")      ==> 2006-7-2 8:9:4.18
+Date.prototype.Format = function(fmt) {
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt))
+        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt))
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+
+export function formatTimeToStr(times, pattern) {
+    var d = new Date(times).Format("yyyy-MM-dd hh:mm:ss");
+    if (pattern) {
+        d = new Date(times).Format(pattern);
+    }
+    return d.toLocaleString();
+}

QMPlusVuePage/src/view/example/upload/upload.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-upload
-      :headers="{'x-token':token}"
-      :show-file-list="false"
       :before-upload="checkFile"
+      :headers="{'x-token':token}"
       :on-error="uploadError"
       :on-success="uploadSuccess"
+      :show-file-list="false"
       action="/api/fileUploadAndDownload/upload"
     >
       <el-button size="small" type="primary">点击上传</el-button>
@@ -17,7 +17,13 @@
           <img :alt="scope.row.alt" :src="scope.row.url" height="80" width="80" />
         </template>
       </el-table-column>
-      <el-table-column label="日期" prop="UpdatedAt" width="180"></el-table-column>
+      <el-table-column label="日期" prop="UpdatedAt" width="180">
+        <template slot-scope="scope">
+          <div>
+            {{scope.row.UpdatedAt|formatDate}}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="文件名" prop="name" width="180"></el-table-column>
       <el-table-column label="链接" prop="url"></el-table-column>
       <el-table-column label="标签" prop="tag" width="100">
@@ -31,6 +37,7 @@
       <el-table-column label="操作" width="100">
         <template slot-scope="scope">
           <el-button @click="downloadFile(scope.row)" size="small" type="text">下载</el-button>
+          <el-button @click="deleteFile(scope.row)" size="small" type="text">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,8 +57,9 @@
 <script>
 import { mapGetters } from 'vuex'
 import infoList from '@/components/mixins/infoList'
-import { getFileList } from '@/api/fileUploadAndDownload'
+import { getFileList, deleteFile } from '@/api/fileUploadAndDownload'
 import { downloadImage } from '@/utils/downloadImg'
+import { formatTimeToStr } from '@/utils/data'
 export default {
   name: 'Upload',
   mixins: [infoList],
@@ -78,12 +86,45 @@ export default {
   computed: {
     ...mapGetters('user', ['userInfo', 'token'])
   },
+  filters: {
+    formatDate: function(time) {
+      if (time != null && time != '') {
+        var date = new Date(time)
+        return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss')
+      } else {
+        return ''
+      }
+    }
+  },
   methods: {
+    async deleteFile(row) {
+      this.$confirm('此操作将永久删除所有角色下该菜单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteFile(row)
+          if (res.success) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
     checkFile(file) {
       const isJPG = file.type === 'image/jpeg'
       const isPng = file.type === 'image/png'
       const isLt2M = file.size / 1024 / 1024 < 2
-      if (!isJPG&&!isPng) {
+      if (!isJPG && !isPng) {
         this.$message.error('上传头像图片只能是 JPG或png 格式!')
       }
       if (!isLt2M) {
@@ -96,7 +137,7 @@ export default {
         type: 'success',
         message: '上传成功'
       })
-      if(res.success){
+      if (res.success) {
         this.getTableData()
       }
     },