From d24e551894e04a557adbcfffddd5cf0966f38e2f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 18 九月 2021 18:49:41 +0800
Subject: [PATCH] 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格

---
 src/main/java/com/ruoyi/common/constant/GenConstants.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 04b6b7d..1d5d884 100644
--- a/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -13,6 +13,9 @@
     /** 鏍戣〃锛堝鍒犳敼鏌ワ級 */
     public static final String TPL_TREE = "tree";
 
+    /** 涓诲瓙琛紙澧炲垹鏀规煡锛� */
+    public static final String TPL_SUB = "sub";
+
     /** 鏍戠紪鐮佸瓧娈� */
     public static final String TREE_CODE = "treeCode";
 
@@ -29,15 +32,17 @@
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
     /** 鏁版嵁搴撳瓧绗︿覆绫诲瀷 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
-            "mediumtext", "longtext" };
+    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+
+    /** 鏁版嵁搴撴枃鏈被鍨� */
+    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
 
     /** 鏁版嵁搴撴椂闂寸被鍨� */
     public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
 
     /** 鏁版嵁搴撴暟瀛楃被鍨� */
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "float", "double", "decimal" };
+            "bit", "bigint", "float", "double", "decimal" };
 
     /** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈� */
     public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
@@ -74,6 +79,15 @@
     /** 鏃ユ湡鎺т欢 */
     public static final String HTML_DATETIME = "datetime";
 
+    /** 鍥剧墖涓婁紶鎺т欢 */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /** 鏂囦欢涓婁紶鎺т欢 */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
+
+    /** 瀵屾枃鏈帶浠� */
+    public static final String HTML_EDITOR = "editor";
+
     /** 瀛楃涓茬被鍨� */
     public static final String TYPE_STRING = "String";
 

--
Gitblit v1.9.3