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

fix (插件管理): 上传插件错误提示处理 

--bug=1006930 --user=赵勇 上传插件初始化脚本异常后，前端仍提示上传成功没有报错 https://www.tapd.cn/55049933/s/1053797
This commit is contained in:
fit2-zhao 2021-10-08 17:05:33 +08:00 committed by fit2-zhao
parent 08241cb34a
commit 9374b38035
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/service/PluginService.java
View File

@ -4,6 +4,7 @@ import io.metersphere.base.domain.Plugin;
import io.metersphere.base.domain.PluginExample;
import io.metersphere.base.domain.PluginWithBLOBs;
import io.metersphere.base.mapper.PluginMapper;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.FileUtils;
import io.metersphere.commons.utils.LogUtil;
@ -88,10 +89,9 @@ public class PluginService {
private List<PluginResourceDTO> getMethod(String path, String fileName) {
List<PluginResourceDTO> resources = new LinkedList<>();
this.loadJar(path);
List<Class<?>> classes = CommonUtil.getSubClass(fileName);
try {
// classLoader.unloadJarFile(path);
this.loadJar(path);
List<Class<?>> classes = CommonUtil.getSubClass(fileName);
for (Class<?> aClass : classes) {
Object instance = aClass.newInstance();
Object pluginObj = aClass.getDeclaredMethod("init").invoke(instance);
@ -104,6 +104,7 @@ public class PluginService {
}
} catch (Exception e) {
LogUtil.error("初始化脚本异常：" + e.getMessage());
MSException.throwException("调用插件初始化脚本失败");
}
return resources;
}

41
backend/src/main/java/io/metersphere/service/utils/CommonUtil.java
View File

@ -1,14 +1,14 @@
package io.metersphere.service.utils;
import com.github.pagehelper.util.StringUtil;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.plugin.core.api.UiScriptApi;
import org.reflections8.Reflections;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import java.io.File;
import java.net.URL;
import java.util.*;
@ -51,28 +51,29 @@ public class CommonUtil {
return classes;
}
public static List<Class<?>> getSubClass(String fileName) throws Exception {
public static List<Class<?>> getSubClass(String fileName) {
List<Class<?>> classes = new LinkedList<>();
if (StringUtil.isNotEmpty(fileName) && fileName.endsWith(".jar")) {
fileName = fileName.substring(0, fileName.length() - 4);
}
LogUtil.info("获取到文件路径：" + fileName);
Resource resource = new ClassPathResource(fileName);
Properties inPro = PropertiesLoaderUtils.loadProperties(resource);
if (inPro != null) {
LogUtil.info("开始读取文件内容进行反射处理");
Set<String> entryObj = inPro.stringPropertyNames();
if (entryObj != null) {
for (String entry : entryObj) {
try {
try {
if (StringUtil.isNotEmpty(fileName) && fileName.endsWith(".jar")) {
fileName = fileName.substring(0, fileName.length() - 4);
}
LogUtil.info("获取到文件路径：" + fileName);
Resource resource = new ClassPathResource(fileName);
Properties inPro = PropertiesLoaderUtils.loadProperties(resource);
if (inPro != null) {
LogUtil.info("开始读取文件内容进行反射处理");
Set<String> entryObj = inPro.stringPropertyNames();
if (entryObj != null) {
for (String entry : entryObj) {
Class<?> clazz = Class.forName(entry);
classes.add(clazz);
} catch (Exception e) {
LogUtil.error("反射类【" + entry + " 】失败：" + e.getMessage());
e.printStackTrace();
}
}
}
} catch (Exception e) {
MSException.throwException("解析插件失败，未找到入口配置");
}
return classes;
}