升级bootstrap-fileinput到最新版本5.2.3

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.controller.common;
 
-import java.util.LinkedList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17,7 +16,6 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.config.ServerConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.FileInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
@@ -35,6 +33,8 @@ public class CommonController
     @Autowired
     private ServerConfig serverConfig;
 
+    private static final String FILE_DELIMETER = ",";
+
     /**
      * 通用下载请求
      * 
@@ -101,17 +101,22 @@ public class CommonController
     {
         try
         {
-            // 上传文件路径
+         // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
-            List<FileInfo> fileInfos = new LinkedList<FileInfo>();
+            String fileNames = "";
+            String urls = "";
             for (MultipartFile file : files)
             {
                 // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, file);
                 String url = serverConfig.getUrl() + fileName;
-                fileInfos.add(new FileInfo(fileName, url));
+                fileNames += fileName + FILE_DELIMETER;
+                urls += url + FILE_DELIMETER;
             }
-            return AjaxResult.success(fileInfos);
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileNames", StringUtils.lastStringDel(fileNames, FILE_DELIMETER));
+            ajax.put("urls", StringUtils.lastStringDel(urls, FILE_DELIMETER));
+            return ajax;
         }
         catch (Exception e)
         {

ruoyi-admin/src/main/resources/templates/demo/form/upload.html

@@ -60,11 +60,8 @@
             uploadAsync: false
         }).on('filebatchuploadsuccess', function (event, data, previewId, index) {
         	var rsp = data.response;
-        	var fileJson = rsp.data;
-        	for (var i in fileJson) {
-        	    log.info("return data.url：" + fileJson[i].url) 
-        	    log.info("reutrn data.name：" + fileJson[i].name)
-        	}
+        	log.info("return urls：" + rsp.urls)
+            log.info("reutrn fileNames：" + rsp.fileNames)
         }).on('fileremoved', function (event, id, index) {
             $("input[name='" + event.currentTarget.id + "']").val('')
         })

ruoyi-admin/src/main/resources/templates/include.html

@@ -108,10 +108,10 @@
 
 <!-- fileinput文件上传插件 -->
 <div th:fragment="bootstrap-fileinput-css">
-    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=20201202}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=202108081}" rel="stylesheet"/>
 </div>
 <div th:fragment="bootstrap-fileinput-js">
-    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=20201202}"></script>
+    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=202108081}"></script>
 </div>
 
 <!-- duallistbox双列表框插件 -->

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/FileInfo.java

@@ -1,61 +0,0 @@
-package com.ruoyi.common.core.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 文件信息
- * 
- * @author ruoyi
- */
-public class FileInfo
-{
-    /**
-     * 文件名称
-     */
-     private String name;
-
-     /**
-     * 文件地址
-     */
-    private String url;
-
-    public FileInfo()
-    {
-
-    }
-
-    public FileInfo(String name, String url)
-    {
-        this.name = name;
-        this.url = url;
-    }
-
-    public String getName()
-     {
-         return name;
-     }
-
-     public void setName(String name)
-     {
-         this.name = name;
-     }
-
-     public String getUrl()
-     {
-         return url;
-     }
-
-     public void setUrl(String url)
-     {
-         this.url = url;
-     }
-
-     @Override
-     public String toString() {
-         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-             .append("name", getName())
-             .append("url", getUrl())
-             .toString();
-     }
- }

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -419,6 +419,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     }
 
     /**
+     * 删除最后一个字符串
+     *
+     * @param str 输入字符串
+     * @param spit 以什么类型结尾的
+     * @return 截取后的字符串
+     */
+    public static String lastStringDel(String str, String spit)
+    {
+        if (!StringUtils.isEmpty(str) && str.endsWith(spit))
+        {
+            return str.subSequence(0, str.length() - 1).toString();
+        }
+        return str;
+    }
+
+    /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
      * 
      * @param name 转换前的下划线大写方式命名的字符串