From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 23 九月 2021 19:13:58 +0800 Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架 --- ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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 40a4d63..072fb40 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"; @@ -41,16 +44,21 @@ public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", "bit", "bigint", "float", "double", "decimal" }; + /** 椤甸潰涓嶉渶瑕佹坊鍔犲瓧娈� */ + public static final String[] COLUMNNAME_NOT_ADD = { "create_by", "create_time", "del_flag", "update_by", + "update_time", "version" }; + /** 椤甸潰涓嶉渶瑕佺紪杈戝瓧娈� */ - public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; + public static final String[] COLUMNNAME_NOT_EDIT = { "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" }; + "update_time", "version" }; /** 椤甸潰涓嶉渶瑕佹煡璇㈠瓧娈� */ 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" }; @@ -76,8 +84,11 @@ /** 鏃ユ湡鎺т欢 */ public static final String HTML_DATETIME = "datetime"; - /** 涓婁紶鎺т欢 */ - public static final String HTML_UPLOAD_IMAGE = "uploadImage"; + /** 鍥剧墖涓婁紶鎺т欢 */ + public static final String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** 鏂囦欢涓婁紶鎺т欢 */ + public static final String HTML_FILE_UPLOAD = "fileUpload"; /** 瀵屾枃鏈帶浠� */ public static final String HTML_EDITOR = "editor"; -- Gitblit v1.9.3