Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev-lhz
fanshuai 1 year ago
parent
commit
c6b69ede64
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java

+ 2
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java View File

@@ -4,6 +4,7 @@ import org.yaml.snakeyaml.DumperOptions;
//import org.yaml.snakeyaml.Yaml;

import java.io.*;
import java.util.HashMap;
import java.util.Map;


@@ -71,7 +72,7 @@ public class YamlUtils {
public static Map<String, Object> loadYamlFile(String filePath) {
Yaml yaml = new Yaml();
try (InputStream inputStream = new FileInputStream(new File(filePath))) {
Map<String, Object> load = (Map<String, Object>) yaml.load(inputStream);
HashMap<String, Object> load = (HashMap<String, Object>) yaml.load(inputStream);
return load;
} catch (IOException e) {
e.printStackTrace();


Loading…
Cancel
Save