From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index a18cb45..27c5703 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/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,32 +32,39 @@
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" };
+ /** BO瀵硅薄 涓嶉渶瑕佹坊鍔犲瓧娈� */
+ public static final String[] COLUMNNAME_NOT_ADD = { "create_by", "create_time", "del_flag", "update_by",
+ "update_time", "version" };
- /** 椤甸潰涓嶉渶瑕佹樉绀虹殑鍒楄〃瀛楁 */
- public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
- "update_time" };
+ /** BO瀵硅薄 涓嶉渶瑕佺紪杈戝瓧娈� */
+ public static final String[] COLUMNNAME_NOT_EDIT = { "create_by", "create_time", "del_flag", "update_by",
+ "update_time", "version" };
- /** 椤甸潰涓嶉渶瑕佹煡璇㈠瓧娈� */
+ /** VO瀵硅薄 涓嶉渶瑕佽繑鍥炲瓧娈� */
+ public static final String[] COLUMNNAME_NOT_LIST = { "create_by", "create_time", "del_flag", "update_by",
+ "update_time", "version" };
+
+ /** BO瀵硅薄 涓嶉渶瑕佹煡璇㈠瓧娈� */
public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "remark" };
+ "update_time", "remark", "version" };
/** Entity鍩虹被瀛楁 */
- public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+ public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime" };
/** Tree鍩虹被瀛楁 */
- public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+ public static final String[] TREE_ENTITY = { "parentName", "parentId", "children" };
/** 鏂囨湰妗� */
public static final String HTML_INPUT = "input";
@@ -74,6 +84,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