默认加载 mybatis-default.xml,可通过 mybatis.configLocation 参数指定 mybatis-config.xml 文件
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
*/
|
||||
package com.jeesite.common.io;
|
||||
|
||||
import com.jeesite.common.codec.EncodeUtils;
|
||||
import com.jeesite.common.lang.ExceptionUtils;
|
||||
import org.springframework.core.io.DefaultResourceLoader;
|
||||
import org.springframework.core.io.Resource;
|
||||
@@ -14,6 +13,7 @@ import org.springframework.core.io.support.ResourcePatternResolver;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
/**
|
||||
* 资源供给类
|
||||
@@ -66,7 +66,7 @@ public class ResourceUtils extends org.springframework.util.ResourceUtils {
|
||||
*/
|
||||
public static String getResourceFileContent(String location){
|
||||
try(InputStream is = ResourceUtils.getResourceFileStream(location)){
|
||||
return IOUtils.toString(is, EncodeUtils.UTF_8);
|
||||
return IOUtils.toString(is, StandardCharsets.UTF_8);
|
||||
}catch (IOException e) {
|
||||
throw ExceptionUtils.unchecked(e);
|
||||
}
|
||||
@@ -78,8 +78,7 @@ public class ResourceUtils extends org.springframework.util.ResourceUtils {
|
||||
*/
|
||||
public static Resource[] getResources(String locationPattern){
|
||||
try {
|
||||
Resource[] resources = resourceResolver.getResources(locationPattern);
|
||||
return resources;
|
||||
return resourceResolver.getResources(locationPattern);
|
||||
} catch (IOException e) {
|
||||
throw ExceptionUtils.unchecked(e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user