From c2db7691d16b29e874e11a4145541395b923640a Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 30 Nov 2020 22:20:59 +0800
Subject: [PATCH] =?UTF-8?q?JeecgBoot=202.4=20=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=EF=BC=8C?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8ESpringBoot=E7=9A=84=E4=BD=8E=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jeecg/JImageUpload.vue              | 10 ++++++----
 .../src/views/examples/list/CardList.vue               |  7 +++----
 .../src/views/system/modules/GateWayRouteModal.vue     |  3 ---
 .../modules/system/controller/SysUploadController.java |  3 +++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
index 88094f43..d06aa9e5 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
@@ -15,10 +15,12 @@
       @change="handleChange"
       @preview="handlePreview"
       :class="!isMultiple?'imgupload':''">
-      <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
-      <div v-else class="iconp">
-        <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
-        <div class="ant-upload-text">{{ text }}</div>
+      <div style="width:104px;height:104px">
+        <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
+        <div v-else class="iconp">
+          <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
+          <div class="ant-upload-text">{{ text }}</div>
+        </div>
       </div>
       <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
         <img alt="example" style="width: 100%" :src="previewImage"/>
diff --git a/ant-design-vue-jeecg/src/views/examples/list/CardList.vue b/ant-design-vue-jeecg/src/views/examples/list/CardList.vue
index 7c5a588a..4208017e 100644
--- a/ant-design-vue-jeecg/src/views/examples/list/CardList.vue
+++ b/ant-design-vue-jeecg/src/views/examples/list/CardList.vue
@@ -5,7 +5,7 @@
       :dataSource="dataSource"
     >
       <a-list-item slot="renderItem" slot-scope="item, index">
-        <template v-if="item === null">
+        <template v-if="index === 0">
           <a-button class="new-btn" type="dashed">
             <a-icon type="plus"/>
             新增产品
@@ -32,8 +32,7 @@
 <script>
 
   const dataSource = []
-  dataSource.push(null)
-  for (let i = 0; i < 11; i++) {
+  for (let i = 0; i < 12; i++) {
     dataSource.push({
       title: 'Alipay',
       avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
@@ -95,7 +94,7 @@
     background-color: #fff;
     border-radius: 2px;
     width: 100%;
-    height: 188px;
+    height: 186px;
   }
 
   .meta-content {
diff --git a/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue b/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue
index 66333132..2a9b9d48 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue
@@ -174,9 +174,6 @@
       showInput(item, index) {
         this.inputVisible = true
         this.currentNameIndex = index
-        this.$nextTick(function() {
-          this.$refs.input.focus()
-        })
       },
       //路由选项输入框失去焦点事件
       handleInputChange(e) {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
index f96af310..bf185739 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
@@ -42,6 +42,9 @@ public class SysUploadController {
         String orgName = file.getOriginalFilename();// 获取文件名
         orgName = CommonUtils.getFileName(orgName);
         String file_url =  MinioUtil.upload(file,bizPath);
+        if(oConvertUtils.isEmpty(file_url)){
+            return Result.error("上传失败,请检查配置信息是否正确!");
+        }
         //保存文件信息
         OSSFile minioFile = new OSSFile();
         minioFile.setFileName(orgName);
-- 
GitLab