From 870ec33031008ab9067d8dda0e772775add33acc Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 30 Nov 2020 22:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B32.4=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84bug?=
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 +--
 .../system/modules/GateWayRouteModal.vue      |  3 -
 .../controller/SysUploadController.java       |  3 +
 .../src/main/resources/application-dev.yml    |  2 +-
 .../org/jeecg/JeecgSystemApplication.java     | 57 -------------------
 6 files changed, 13 insertions(+), 69 deletions(-)
 delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

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);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
index 43be798e..0c918119 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot-os-re?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
deleted file mode 100644
index c6250ddf..00000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jeecg;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.Context;
-import org.apache.tomcat.util.scan.StandardJarScanner;
-import org.jeecg.common.util.oConvertUtils;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.env.Environment;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-@Slf4j
-@SpringBootApplication
-@EnableFeignClients(basePackages = {"org.jeecg"})
-public class JeecgSystemApplication extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(JeecgSystemApplication.class);
-    }
-
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
-        Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-        log.info("\n----------------------------------------------------------\n\t" +
-                "Application Jeecg-Boot is running! Access URLs:\n\t" +
-                "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" +
-                "External: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-                "----------------------------------------------------------");
-
-    }
-
-    /**
-     * tomcat-embed-jasper引用后提示jar找不到的问题
-     */
-    @Bean
-    public TomcatServletWebServerFactory tomcatFactory() {
-        return new TomcatServletWebServerFactory() {
-            @Override
-            protected void postProcessContext(Context context) {
-                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
-            }
-        };
-    }
-}
\ No newline at end of file