test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 加载插件时没有关闭输入流

This commit is contained in:
AgAngle 2023-10-07 11:46:57 +08:00 committed by f2c-ci-robot[bot]
parent e84e3cc157
commit 91c6687b5d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/system-setting/src/main/java/io/metersphere/system/plugin/JdbcDriverPluginDescriptorFinder.java
View File

@ -44,9 +44,10 @@ public class JdbcDriverPluginDescriptorFinder extends ManifestPluginDescriptorFi
if (jarEntry == null) {
return false;
}
InputStream inputStream = jar.getInputStream(jarEntry);
// 获取SPI中定义的类名
driverClass = IOUtils.toString(inputStream);
try (InputStream inputStream = jar.getInputStream(jarEntry)) {
// 获取SPI中定义的类名
driverClass = IOUtils.toString(inputStream);
}
return true;
} catch (IOException e) {
throw new PluginRuntimeException(e, "Cannot read META-INF/services/java.sql.Driver from {}", jarPath);

14
backend/services/system-setting/src/main/java/io/metersphere/system/service/PluginLoadService.java
View File

@ -122,10 +122,9 @@ public class PluginLoadService {
public List<String> getFrontendScripts(String pluginId) {
MsPlugin msPluginInstance = (MsPlugin) msPluginManager.getPlugin(pluginId).getPlugin();
String scriptDir = msPluginInstance.getScriptDir();
try {
List<String> scripts = new ArrayList<>(10);
String jarPath = msPluginManager.getPlugin(pluginId).getPluginPath().toString();
JarFile jarFile = new JarFile(jarPath);
List<String> scripts = new ArrayList<>(10);
String jarPath = msPluginManager.getPlugin(pluginId).getPluginPath().toString();
try (JarFile jarFile = new JarFile(jarPath)) {
Enumeration<JarEntry> entries = jarFile.entries();
while (entries.hasMoreElements()) {
JarEntry jarEntry = entries.nextElement();
@ -133,9 +132,10 @@ public class PluginLoadService {
String innerPath = jarEntry.getName();
if (innerPath.startsWith(scriptDir) && !jarEntry.isDirectory()) {
//获取到文件流
InputStream inputStream = msPluginManager.getPluginClassLoader(pluginId).getResourceAsStream(innerPath);
if (inputStream != null) {
scripts.add(IOUtil.toString(inputStream));
try (InputStream inputStream = msPluginManager.getPluginClassLoader(pluginId).getResourceAsStream(innerPath)) {
if (inputStream != null) {
scripts.add(IOUtil.toString(inputStream));
}
}
}
}