up SpringBootVFS

mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/SpringBootVFS.java

@@ -20,11 +20,16 @@ import org.apache.ibatis.io.VFS;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.ClassUtils;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.text.Normalizer;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -35,10 +40,17 @@ import java.util.stream.Stream;
  */
 public class SpringBootVFS extends VFS {
 
+    private static Charset urlDecodingCharset;
+    private static Supplier<ClassLoader> classLoaderSupplier;
     private final ResourcePatternResolver resourceResolver;
 
+    static {
+        setUrlDecodingCharset(Charset.defaultCharset());
+        setClassLoaderSupplier(ClassUtils::getDefaultClassLoader);
+    }
+
     public SpringBootVFS() {
-        this.resourceResolver = new PathMatchingResourcePatternResolver(getClass().getClassLoader());
+        this.resourceResolver = new PathMatchingResourcePatternResolver(classLoaderSupplier.get());
     }
 
     @Override
@@ -46,22 +58,49 @@ public class SpringBootVFS extends VFS {
         return true;
     }
 
-    private static String preserveSubpackageName(final String baseUrlString, final Resource resource,
-                                                 final String rootPath) {
-        try {
-            return rootPath + (rootPath.endsWith("/") ? "" : "/")
-                + resource.getURL().toString().substring(baseUrlString.length());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     @Override
     protected List<String> list(URL url, String path) throws IOException {
-        String urlString = url.toString();
+        String urlString = URLDecoder.decode(url.toString(), urlDecodingCharset.name());
         String baseUrlString = urlString.endsWith("/") ? urlString : urlString.concat("/");
         Resource[] resources = resourceResolver.getResources(baseUrlString + "**/*.class");
         return Stream.of(resources).map(resource -> preserveSubpackageName(baseUrlString, resource, path))
             .collect(Collectors.toList());
     }
+
+    /**
+     * Set the charset for decoding an encoded URL string.
+     * <p>
+     * Default is system default charset.
+     * </p>
+     *
+     * @param charset the charset for decoding an encoded URL string
+     * @since 2.3.0
+     */
+    public static void setUrlDecodingCharset(Charset charset) {
+        urlDecodingCharset = charset;
+    }
+
+    /**
+     * Set the supplier for providing {@link ClassLoader} to used.
+     * <p>
+     * Default is a returned instance from {@link ClassUtils#getDefaultClassLoader()}.
+     * </p>
+     *
+     * @param supplier the supplier for providing {@link ClassLoader} to used
+     * @since 3.0.2
+     */
+    public static void setClassLoaderSupplier(Supplier<ClassLoader> supplier) {
+        classLoaderSupplier = supplier;
+    }
+
+    private static String preserveSubpackageName(final String baseUrlString, final Resource resource,
+                                                 final String rootPath) {
+        try {
+            return rootPath + (rootPath.endsWith("/") ? "" : "/") + Normalizer
+                .normalize(URLDecoder.decode(resource.getURL().toString(), urlDecodingCharset.name()), Normalizer.Form.NFC)
+                .substring(baseUrlString.length());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/SQLServer2005Dialect.java

@@ -19,6 +19,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * SQLServer 2005 数据库分页方言
  *