fix ci

manager/src/main/java/org/apache/hertzbeat/manager/controller/PluginController.java

@@ -88,14 +88,14 @@ public ResponseEntity<Message<Void>> updatePluginStatus(@RequestBody PluginMetad
         return ResponseEntity.ok(Message.success("Update success"));
     }
 
-    @GetMapping("/getParamDefine")
+    @GetMapping("/params/define")
     @Operation(summary = "get param define", description = "get param define by jar path")
     public ResponseEntity<Message<PluginParametersVO>> getParamDefine(@RequestParam Long pluginMetadataId) {
         PluginParametersVO plugins = pluginService.getParamDefine(pluginMetadataId);
         return ResponseEntity.ok(Message.success(plugins));
     }
 
-    @PostMapping("/saveParams")
+    @PostMapping("/params")
     @Operation(summary = "get param define", description = "get param define by jar path")
     public ResponseEntity<Message<Boolean>> saveParams(@RequestBody List<PluginParam> pluginParams) {
         pluginService.savePluginParam(pluginParams);

manager/src/main/java/org/apache/hertzbeat/manager/service/impl/PluginServiceImpl.java

@@ -70,6 +70,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;
 
 /**
  * plugin service
@@ -95,7 +96,7 @@ public class PluginServiceImpl implements PluginService {
     /**
      * plugin param define
      */
-    private static final Map<Long, List<ParamDefine>> PARAMS_Define_MAP = new ConcurrentHashMap<>();
+    private static final Map<Long, List<ParamDefine>> PARAMS_DEFINE_MAP = new ConcurrentHashMap<>();
 
     /**
      * plugin params
@@ -172,8 +173,8 @@ public void updateStatus(PluginMetadata plugin) {
     public PluginParametersVO getParamDefine(Long pluginMetadataId) {
 
         PluginParametersVO pluginParametersVO = new PluginParametersVO();
-        if (PARAMS_Define_MAP.containsKey(pluginMetadataId)) {
-            List<ParamDefine> paramDefines = PARAMS_Define_MAP.get(pluginMetadataId);
+        if (PARAMS_DEFINE_MAP.containsKey(pluginMetadataId)) {
+            List<ParamDefine> paramDefines = PARAMS_DEFINE_MAP.get(pluginMetadataId);
             List<PluginParam> paramsByPluginMetadataId = pluginParamDao.findParamsByPluginMetadataId(pluginMetadataId);
             pluginParametersVO.setParamDefines(paramDefines);
             pluginParametersVO.setPluginParams(paramsByPluginMetadataId);
@@ -217,8 +218,9 @@ public List<PluginItem> validateJarFile(File jarFile) {
         try {
             URL jarUrl = new URL("file:" + jarFile.getAbsolutePath());
             try (URLClassLoader classLoader = new URLClassLoader(new URL[]{jarUrl}, this.getClass().getClassLoader());
-                JarFile jar = new JarFile(jarFile)) {
+                 JarFile jar = new JarFile(jarFile)) {
                 Enumeration<JarEntry> entries = jar.entries();
+                Yaml yaml = new Yaml();
                 while (entries.hasMoreElements()) {
                     JarEntry entry = entries.nextElement();
                     if (entry.getName().endsWith(".class")) {
@@ -236,6 +238,11 @@ public List<PluginItem> validateJarFile(File jarFile) {
                             System.err.println("Failed to load class: " + className);
                         }
                     }
+                    if ((entry.getName().contains("define")) && (entry.getName().endsWith(".yml") || entry.getName().endsWith(".yaml"))) {
+                        try (InputStream ymlInputStream = jar.getInputStream(entry)) {
+                            yaml.loadAs(ymlInputStream, List.class);
+                        }
+                    }
                 }
                 if (pluginItems.isEmpty()) {
                     throw new CommonException("Illegal plug-ins, please refer to https://hertzbeat.apache.org/docs/help/plugin/");
@@ -247,6 +254,8 @@ public List<PluginItem> validateJarFile(File jarFile) {
         } catch (MalformedURLException e) {
             log.error("Invalid JAR file URL: {}", jarFile.getAbsoluteFile(), e);
             throw new CommonException("Invalid JAR file URL: " + jarFile.getAbsolutePath());
+        } catch (YAMLException e) {
+            throw new CommonException("YAML the file format is incorrect");
         }
         return pluginItems;
     }
@@ -259,6 +268,7 @@ private void validateMetadata(PluginMetadata metadata) {
 
     @Override
     @SneakyThrows
+    @Transactional
     public void savePlugin(PluginUpload pluginUpload) {
         String jarPath = new File(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getAbsolutePath();
         Path extLibPath = Paths.get(new File(jarPath).getParent(), "plugin-lib");
@@ -376,7 +386,7 @@ private void loadJarToClassLoader() {
                 pluginClassLoaders.clear();
                 System.gc();
             }
-            PARAMS_Define_MAP.clear();
+            PARAMS_DEFINE_MAP.clear();
             List<PluginMetadata> plugins = metadataDao.findPluginMetadataByEnableStatusTrue();
             for (PluginMetadata metadata : plugins) {
                 List<URL> urls = loadLibInPlugin(metadata.getJarFilePath(), metadata.getId());
@@ -431,7 +441,7 @@ private List<URL> loadLibInPlugin(String pluginJarPath, Long pluginMetadataId) {
                 if ((entry.getName().contains("define")) && (entry.getName().endsWith(".yml") || entry.getName().endsWith(".yaml"))) {
                     try (InputStream ymlInputStream = jarFile.getInputStream(entry)) {
                         List<ParamDefine> params = yaml.loadAs(ymlInputStream, List.class);
-                        PARAMS_Define_MAP.putIfAbsent(pluginMetadataId, params);
+                        PARAMS_DEFINE_MAP.put(pluginMetadataId, params);
                     }
                 }
             }

web-app/src/app/service/plugin.service.ts

@@ -79,10 +79,10 @@ export class PluginService {
       pluginMetadataId: pluginId
     });
     const options = { params: httpParams };
-    return this.http.get<Message<any>>(`${plugin_uri}/getParamDefine`, options);
+    return this.http.get<Message<any>>(`${plugin_uri}/params/define`, options);
   }
 
   public savePluginParamDefine(body: any): Observable<Message<any>> {
-    return this.http.post<Message<any>>(`${plugin_uri}/saveParams`, body);
+    return this.http.post<Message<any>>(`${plugin_uri}/params`, body);
   }
 }