From 9c671cac749d45ac37b81a1df732024f4016a238 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:56:15 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/common/utils/YamlUtils.java |   65 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 25d8046..4944201 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -18,16 +18,38 @@
 @Component
 public class YamlUtils {
 
+    private static final String src = "src/main/resources/application-prod.yml";
+    private final static String C = "#";
+    private final static String CHARSET = "UTF-8";
+    //璇诲彇鍚庣殑姣忚鏁版嵁
+    private static List<String> LINES = null;
     @Autowired
     private DataResourceService dataResourceService;
 
-    private static final String src = "src/main/resources/application-prod.yml";
+    public static void main(String[] args) {
+        Map<String, Integer> keyCountMap = new HashMap<>();
+        try {
+            List<String> lines = FileUtils.readLines(new File(src), CHARSET);
+            for (int i = 0; i < lines.size(); i++) {
+                String line = lines.get(i);
+                if (line.contains(C)) {
+                    String[] split = line.split(C);
+                    String tmp = split[0];
+                    String memo = split[1];//鑾峰彇娉ㄩ噴
 
-    private final static String C = "#";
-    private final static String CHARSET = "UTF-8";
+                    String[] split1 = tmp.split(":");
+                    String name = split1[0];
+                    String data = split1[1];
+                    System.out.println(memo);
+                    System.out.println(name);
+                    System.out.println(data);
+                }
+            }
 
-    //璇诲彇鍚庣殑姣忚鏁版嵁
-    private static List<String> LINES = null;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 
     public Map<String, Object> read() {
         Yaml yaml = new Yaml();
@@ -54,7 +76,7 @@
                 dataResource.setData(null);
             } else if (value instanceof Map) {
                 dataResource.setData(JSON.toJSONString(value));
-            }else {
+            } else {
                 dataResource.setData(value.toString());
             }
             dataResource.setCreateTime(new Date());
@@ -112,7 +134,8 @@
                 String[] split = trim.split(":");
                 String lineName = split[0];
                 if (lineName.equals(name)) {
-                    lines[idx] = line + " #" + dataResource.getMemo();
+                    String[] split1 = line.split("#");
+                    lines[idx] = split1[0] + " #" + dataResource.getMemo();
                 }
                 idx++;
             }
@@ -173,32 +196,10 @@
             }
         } else {
             String data = dataResource.getData();
-            map.put(dataResource.getName(), data);
-        }
-    }
-
-    public static void main(String[] args) {
-        Map<String, Integer> keyCountMap = new HashMap<>();
-        try {
-            List<String> lines = FileUtils.readLines(new File(src), CHARSET);
-            for (int i = 0; i < lines.size(); i++) {
-                String line = lines.get(i);
-                if (line.contains(C)) {
-                    String[] split = line.split(C);
-                    String tmp = split[0];
-                    String memo = split[1];//鑾峰彇娉ㄩ噴
-
-                    String[] split1 = tmp.split(":");
-                    String name = split1[0];
-                    String data = split1[1];
-                    System.out.println(memo);
-                    System.out.println(name);
-                    System.out.println(data);
-                }
+            if (data == null) {
+                data = "";
             }
-
-        } catch (IOException e) {
-            e.printStackTrace();
+            map.put(dataResource.getName(), data);
         }
     }
 

--
Gitblit v1.9.1