From df1c283335d6b104dd8d7e7f955710c7fa6f92b8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 3 Dec 2022 11:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=BF=9D?=
 =?UTF-8?q?=E8=A7=84=E7=9A=84=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/constant/Constants.java  |  2 +-
 .../java/com/ruoyi/common/utils/YamlUtil.java | 87 -------------------
 .../service/impl/GenTableServiceImpl.java     |  4 +-
 3 files changed, 3 insertions(+), 90 deletions(-)
 delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index 1595aa021..950916796 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -111,5 +111,5 @@ public class Constants
      * 定时任务违规的字符
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.ruoyi.common.utils.file" };
+            "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config" };
 }
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java
deleted file mode 100644
index bb8a4ed68..000000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 配置处理工具类
- * 
- * @author yml
- */
-public class YamlUtil
-{
-    public static Map<?, ?> loadYaml(String fileName) throws FileNotFoundException
-    {
-        InputStream in = YamlUtil.class.getClassLoader().getResourceAsStream(fileName);
-        return StringUtils.isNotEmpty(fileName) ? (LinkedHashMap<?, ?>) new Yaml().load(in) : null;
-    }
-
-    public static void dumpYaml(String fileName, Map<?, ?> map) throws IOException
-    {
-        if (StringUtils.isNotEmpty(fileName))
-        {
-            FileWriter fileWriter = new FileWriter(YamlUtil.class.getResource(fileName).getFile());
-            DumperOptions options = new DumperOptions();
-            options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            Yaml yaml = new Yaml(options);
-            yaml.dump(map, fileWriter);
-        }
-    }
-
-    public static Object getProperty(Map<?, ?> map, Object qualifiedKey)
-    {
-        if (map != null && !map.isEmpty() && qualifiedKey != null)
-        {
-            String input = String.valueOf(qualifiedKey);
-            if (!"".equals(input))
-            {
-                if (input.contains("."))
-                {
-                    int index = input.indexOf(".");
-                    String left = input.substring(0, index);
-                    String right = input.substring(index + 1, input.length());
-                    return getProperty((Map<?, ?>) map.get(left), right);
-                }
-                else if (map.containsKey(input))
-                {
-                    return map.get(input);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void setProperty(Map<?, ?> map, Object qualifiedKey, Object value)
-    {
-        if (map != null && !map.isEmpty() && qualifiedKey != null)
-        {
-            String input = String.valueOf(qualifiedKey);
-            if (!input.equals(""))
-            {
-                if (input.contains("."))
-                {
-                    int index = input.indexOf(".");
-                    String left = input.substring(0, index);
-                    String right = input.substring(index + 1, input.length());
-                    setProperty((Map<?, ?>) map.get(left), right, value);
-                }
-                else
-                {
-                    ((Map<Object, Object>) map).put(qualifiedKey, value);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java
index fca46c219..1f25c534f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java
@@ -130,9 +130,9 @@ public class GenTableServiceImpl implements IGenTableService
         int row = genTableMapper.updateGenTable(genTable);
         if (row > 0)
         {
-            for (GenTableColumn cenTableColumn : genTable.getColumns())
+            for (GenTableColumn genTableColumn : genTable.getColumns())
             {
-                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+                genTableColumnMapper.updateGenTableColumn(genTableColumn);
             }
         }
     }