From c813046594b82230cd2cb61622d68a4981096e08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 19:28:41 +0800
Subject: [PATCH] update 日常校验 统一重构到 StringUtils 便于维护扩展

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index ded1587..01afce0 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -1,16 +1,17 @@
 package com.ruoyi.generator.util;
 
-import java.util.Arrays;
-import org.apache.commons.lang3.RegExUtils;
-import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.generator.config.GenConfig;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
 
 /**
  * 浠ｇ爜鐢熸垚鍣� 宸ュ叿绫�
- * 
+ *
  * @author ruoyi
  */
 public class GenUtils
@@ -112,10 +113,15 @@
         {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
-        // 鏂囦欢瀛楁璁剧疆涓婁紶鎺т欢
+        // 鍥剧墖瀛楁璁剧疆鍥剧墖涓婁紶鎺т欢
         else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
         {
-            column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE);
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 鏂囦欢瀛楁璁剧疆鏂囦欢涓婁紶鎺т欢
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
         }
         // 鍐呭瀛楁璁剧疆瀵屾枃鏈帶浠�
         else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
@@ -126,7 +132,7 @@
 
     /**
      * 鏍￠獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊�
-     * 
+     *
      * @param arr 鏁扮粍
      * @param targetValue 鍊�
      * @return 鏄惁鍖呭惈
@@ -138,7 +144,7 @@
 
     /**
      * 鑾峰彇妯″潡鍚�
-     * 
+     *
      * @param packageName 鍖呭悕
      * @return 妯″潡鍚�
      */
@@ -152,7 +158,7 @@
 
     /**
      * 鑾峰彇涓氬姟鍚�
-     * 
+     *
      * @param tableName 琛ㄥ悕
      * @return 涓氬姟鍚�
      */
@@ -166,7 +172,7 @@
 
     /**
      * 琛ㄥ悕杞崲鎴怞ava绫诲悕
-     * 
+     *
      * @param tableName 琛ㄥ悕绉�
      * @return 绫诲悕
      */
@@ -184,7 +190,7 @@
 
     /**
      * 鎵归噺鏇挎崲鍓嶇紑
-     * 
+     *
      * @param replacementm 鏇挎崲鍊�
      * @param searchList 鏇挎崲鍒楄〃
      * @return
@@ -205,7 +211,7 @@
 
     /**
      * 鍏抽敭瀛楁浛鎹�
-     * 
+     *
      * @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
      * @return 鏇挎崲鍚庣殑鍚嶅瓧
      */
@@ -216,13 +222,13 @@
 
     /**
      * 鑾峰彇鏁版嵁搴撶被鍨嬪瓧娈�
-     * 
+     *
      * @param columnType 鍒楃被鍨�
      * @return 鎴彇鍚庣殑鍒楃被鍨�
      */
     public static String getDbType(String columnType)
     {
-        if (StringUtils.indexOf(columnType, "(") > 0)
+        if (StringUtils.indexOf(columnType, '(') > 0)
         {
             return StringUtils.substringBefore(columnType, "(");
         }
@@ -234,13 +240,13 @@
 
     /**
      * 鑾峰彇瀛楁闀垮害
-     * 
+     *
      * @param columnType 鍒楃被鍨�
      * @return 鎴彇鍚庣殑鍒楃被鍨�
      */
     public static Integer getColumnLength(String columnType)
     {
-        if (StringUtils.indexOf(columnType, "(") > 0)
+        if (StringUtils.indexOf(columnType, '(') > 0)
         {
             String length = StringUtils.substringBetween(columnType, "(", ")");
             return Integer.valueOf(length);

--
Gitblit v1.9.3