🐛 修复多文件上传失败的问题，以及图片选择框翻页之后无法选择的问题

src/main/java/cc/ryanc/halo/config/FreeMarkerAutoConfiguration.java

@@ -21,7 +21,7 @@ import javax.annotation.PostConstruct;
  */
 @Slf4j
 @Configuration
-public class FreeMarkerConfig {
+public class FreeMarkerAutoConfiguration {
 
     @Autowired
     private freemarker.template.Configuration configuration;

src/main/java/cc/ryanc/halo/config/WebMvcAutoConfiguration.java

@@ -30,7 +30,7 @@ import java.util.Locale;
 @EnableWebMvc
 @ComponentScan(basePackages = "cc.ryanc.halo.web.controller")
 @PropertySource(value = "classpath:application.yaml", ignoreResourceNotFound = true, encoding = "UTF-8")
-public class MvcConfig implements WebMvcConfigurer {
+public class WebMvcAutoConfiguration implements WebMvcConfigurer {
 
     @Autowired
     private LoginInterceptor loginInterceptor;

src/main/java/cc/ryanc/halo/utils/SpringUtil.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SpringUtil implements ApplicationContextAware {
+
     private static ApplicationContext applicationContext;
 
     /**

src/main/resources/templates/admin/admin_attachment.ftl

@@ -65,12 +65,9 @@
                 maxFileCount: 100,
                 enctype : 'multipart/form-data',
                 showClose: false
-            }).on("fileuploaded",function (event,data,previewId,index) {
+            }).on("filebatchuploadcomplete",function (event, files, extra) {
-                var data = data.jqXHR.responseJSON;
-                if(data.success=="1"){
                 $("#uploadForm").hide(400);
-                    halo.showMsgAndReload(data.message,'success',1000);
+                halo.showMsgAndReload('上传成功！','success',1000);
-                }
             });
         }
         $(document).ready(function () {

src/main/resources/templates/admin/widget/_attachment-select-post.ftl

@@ -87,12 +87,9 @@
         maxFileCount: 10,
         enctype : 'multipart/form-data',
         showClose: false
-    }).on("fileuploaded",function (event,data,previewId,index) {
+    }).on("filebatchuploadcomplete",function (event, files, extra) {
-        var data = data.jqXHR.responseJSON;
-        if(data.success=="1"){
         $("#uploadForm").hide(400);
-            halo.showMsgAndReload(data.message,'success',1000);
+        halo.showMsgAndReload('上传成功！','success',1000);
-        }
     });
     $(document).ready(function(){
         var clipboard = new Clipboard('.thumbnail');

src/main/resources/templates/admin/widget/_attachment-select.ftl

@@ -36,16 +36,16 @@
                                 <@spring.message code='admin.pageinfo.text.no' />${attachments.number+1}/${attachments.totalPages}<@spring.message code='admin.pageinfo.text.page' />
                             </div>
                             <div class="btn-group pull-right btn-group-sm" role="group">
-                                <a class="btn btn-default <#if !attachments.hasPrevious()>disabled</#if>" href="/admin/attachments/select" >
+                                <a class="btn btn-default <#if !attachments.hasPrevious()>disabled</#if>" href="/admin/attachments/select?id=${id}" >
                                     <@spring.message code='admin.pageinfo.btn.first' />
                                 </a>
-                                <a class="btn btn-default <#if !attachments.hasPrevious()>disabled</#if>" href="/admin/attachments/select?page=${attachments.number-1}" >
+                                <a class="btn btn-default <#if !attachments.hasPrevious()>disabled</#if>" href="/admin/attachments/select?page=${attachments.number-1}&id=${id}" >
                                     <@spring.message code='admin.pageinfo.btn.pre' />
                                 </a>
-                                <a class="btn btn-default <#if !attachments.hasNext()>disabled</#if>" href="/admin/attachments/select?page=${attachments.number+1}">
+                                <a class="btn btn-default <#if !attachments.hasNext()>disabled</#if>" href="/admin/attachments/select?page=${attachments.number+1}&id=${id}">
                                     <@spring.message code='admin.pageinfo.btn.next' />
                                 </a>
-                                <a class="btn btn-default <#if !attachments.hasNext()>disabled</#if>" href="/admin/attachments/select?page=${attachments.totalPages-1}">
+                                <a class="btn btn-default <#if !attachments.hasNext()>disabled</#if>" href="/admin/attachments/select?page=${attachments.totalPages-1}&id=${id}">
                                     <@spring.message code='admin.pageinfo.btn.last' />
                                 </a>
                             </div>
@@ -86,12 +86,9 @@
         maxFileCount: 10,
         enctype : 'multipart/form-data',
         showClose: false
-    }).on("fileuploaded",function (event,data,previewId,index) {
+    }).on("filebatchuploadcomplete",function (event, files, extra) {
-        var data = data.jqXHR.responseJSON;
-        if(data.success=="1"){
         $("#uploadForm").hide(400);
-            halo.showMsgAndReload(data.message,'success',1000);
+        halo.showMsgAndReload('上传成功！','success',1000);
-        }
     });
     function doTransport(url) {
         parent.$('#${id}').val(url);

src/main/resources/templates/admin/widget/_attachment-upload.ftl

@@ -103,12 +103,9 @@
             maxFileCount: 100,
             enctype : 'multipart/form-data',
             showClose: false
-        }).on("fileuploaded",function (event,data,previewId,index) {
+        }).on("filebatchuploadcomplete",function (event, files, extra) {
-            var data = data.jqXHR.responseJSON;
-            if(data.success=="1"){
             $("#uploadForm").hide(400);
-                halo.showMsgAndParentRedirect(data.message,'success',1000,"/admin/attachments");
+            halo.showMsgAndReload('上传成功！','success',1000);
-            }
         });
     }