Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaResources.java

@@ -1,15 +1,14 @@
 package com.izouma.nineth.domain;
 
 import com.izouma.nineth.annotations.Searchable;
-import com.izouma.nineth.converter.FileObjectListConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 
 @Data
 @AllArgsConstructor
@@ -22,8 +21,7 @@ public class MetaResources extends BaseEntity {
     @Searchable
     private String name;
 
-    @ApiModelProperty("图片")
+    @ApiModelProperty("文件")
     @Column(columnDefinition = "TEXT")
-    @Convert(converter = FileObjectListConverter.class)
-    private List<FileObject> pic;
+    private String value;
 }

src/main/java/com/izouma/nineth/web/MetaResourcesController.java

@@ -9,6 +9,7 @@ import com.izouma.nineth.service.MetaResourcesService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
@@ -69,10 +70,10 @@ public class MetaResourcesController extends BaseController {
         if (Objects.isNull(metaResources)) {
             return MetaRestResult.returnError("不存在该名称的资源");
         }
-        if (Objects.isNull(metaResources.getPic())) {
+        if (StringUtils.isBlank(metaResources.getValue())) {
             return MetaRestResult.returnError("该名称的资源文件为空");
         }
-        return MetaRestResult.returnSuccess("查询成功", metaResources.getPic().get(0).getUrl());
+        return MetaRestResult.returnSuccess("查询成功", metaResources.getValue());
     }
 }
 

src/main/vue/src/views/MetaResourcesEdit.vue

@@ -14,9 +14,8 @@
 					<el-form-item prop="name" label="文件名称">
 						<el-input v-model="formData.name"></el-input>
 					</el-form-item>
-					<el-form-item prop="pic" label="文件">
-						<object-upload v-model="formData.pic[0]" compress width="3000" height="3000"></object-upload>
-						<div class="tip">支持JPG、PNG、GIF、MP4，推荐长宽比1:1</div>
+					<el-form-item prop="value" label="文件">
+                        <file-upload v-model="formData.value" :limit="1"></file-upload>
 					</el-form-item>
 					<el-form-item class="form-submit">
 						<el-button @click="onSave" :loading="saving" type="primary">
@@ -51,9 +50,7 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {
-                pic: []
-            },
+            formData: {},
             rules: {
                 name: [
                     {
@@ -62,7 +59,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                pic: [
+                value: [
                     {
                         required: true,
                         message: '请上传文件',

src/main/vue/src/views/MetaResourcesList.vue

@@ -21,13 +21,9 @@
 			:height="tableHeight" v-loading="fetchingData">
 			<el-table-column v-if="multipleMode" align="center" type="selection" width="50">
 			</el-table-column>
-			<el-table-column prop="name" label="文件名称" width="250" align="center">
+			<el-table-column prop="name" label="文件名称" width="300" align="center">
 			</el-table-column>
-			<el-table-column prop="pic" label="文件" align="center">
-				<template slot-scope="{ row }">
-					<el-image style="width: 30px; height: 30px" :src="row.pic[0].thumb || row.pic[0].url" fit="cover"
-						:preview-src-list="row.pic.map(i => i.thumb || i.url)"></el-image>
-				</template>
+            <el-table-column prop="value" label="文件地址" align="center">
 			</el-table-column>
 			<el-table-column label="操作" align="center" fixed="right" width="150">
 				<template slot-scope="{row}">