From 5322f5f707cb9cd1ca11ceeadc299b698e862ef3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 十二月 2021 14:18:20 +0800
Subject: [PATCH] update 常量类 接口化

---
 ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java  |   82 ++++++++++----------
 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java     |   53 ++++++------
 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java |   48 ++++++------
 3 files changed, 92 insertions(+), 91 deletions(-)

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 88a3c3b..0c5a92c 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
@@ -6,130 +6,131 @@
  *
  * @author ruoyi
  */
-public class Constants {
+public interface Constants {
+
     /**
      * UTF-8 瀛楃闆�
      */
-    public static final String UTF8 = "UTF-8";
+    String UTF8 = "UTF-8";
 
     /**
      * GBK 瀛楃闆�
      */
-    public static final String GBK = "GBK";
+    String GBK = "GBK";
 
     /**
      * http璇锋眰
      */
-    public static final String HTTP = "http://";
+    String HTTP = "http://";
 
     /**
      * https璇锋眰
      */
-    public static final String HTTPS = "https://";
+    String HTTPS = "https://";
 
     /**
      * 閫氱敤鎴愬姛鏍囪瘑
      */
-    public static final String SUCCESS = "0";
+    String SUCCESS = "0";
 
     /**
      * 閫氱敤澶辫触鏍囪瘑
      */
-    public static final String FAIL = "1";
+    String FAIL = "1";
 
     /**
      * 鐧诲綍鎴愬姛
      */
-    public static final String LOGIN_SUCCESS = "Success";
+    String LOGIN_SUCCESS = "Success";
 
     /**
      * 娉ㄩ攢
      */
-    public static final String LOGOUT = "Logout";
+    String LOGOUT = "Logout";
 
     /**
      * 娉ㄥ唽
      */
-    public static final String REGISTER = "Register";
+    String REGISTER = "Register";
 
     /**
      * 鐧诲綍澶辫触
      */
-    public static final String LOGIN_FAIL = "Error";
+    String LOGIN_FAIL = "Error";
 
     /**
      * 楠岃瘉鐮� redis key
      */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+    String CAPTCHA_CODE_KEY = "captcha_codes:";
 
     /**
      * 鐧诲綍鐢ㄦ埛 redis key
      */
-    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+    String LOGIN_TOKEN_KEY = "login_tokens:";
 
     /**
      * 闃查噸鎻愪氦 redis key
      */
-    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+    String REPEAT_SUBMIT_KEY = "repeat_submit:";
 
     /**
      * 闄愭祦 redis key
      */
-    public static final String RATE_LIMIT_KEY = "rate_limit:";
+    String RATE_LIMIT_KEY = "rate_limit:";
 
     /**
      * 楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級
      */
-    public static final Integer CAPTCHA_EXPIRATION = 2;
+    Integer CAPTCHA_EXPIRATION = 2;
 
     /**
      * 浠ょ墝
      */
-    public static final String TOKEN = "token";
+    String TOKEN = "token";
 
     /**
      * 浠ょ墝鍓嶇紑
      */
-    public static final String TOKEN_PREFIX = "Bearer ";
+    String TOKEN_PREFIX = "Bearer ";
 
     /**
      * 浠ょ墝鍓嶇紑
      */
-    public static final String LOGIN_USER_KEY = "login_user_key";
+    String LOGIN_USER_KEY = "login_user_key";
 
     /**
      * 鐢ㄦ埛ID
      */
-    public static final String JWT_USERID = "userid";
+    String JWT_USERID = "userid";
 
     /**
      * 鐢ㄦ埛鍚嶇О
      */
-    public static final String JWT_USERNAME = "sub";
+    String JWT_USERNAME = "sub";
 
     /**
      * 鐢ㄦ埛澶村儚
      */
-    public static final String JWT_AVATAR = "avatar";
+    String JWT_AVATAR = "avatar";
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    public static final String JWT_CREATED = "created";
+    String JWT_CREATED = "created";
 
     /**
      * 鐢ㄦ埛鏉冮檺
      */
-    public static final String JWT_AUTHORITIES = "authorities";
+    String JWT_AUTHORITIES = "authorities";
 
     /**
      * 鍙傛暟绠$悊 cache key
      */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
+    String SYS_CONFIG_KEY = "sys_config:";
 
     /**
      * 瀛楀吀绠$悊 cache key
      */
-    public static final String SYS_DICT_KEY = "sys_dict:";
+    String SYS_DICT_KEY = "sys_dict:";
 
 }
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 4d0a4e8..60bf881 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
@@ -5,184 +5,184 @@
  *
  * @author ruoyi
  */
-public class GenConstants {
+public interface GenConstants {
     /**
      * 鍗曡〃锛堝鍒犳敼鏌ワ級
      */
-    public static final String TPL_CRUD = "crud";
+    String TPL_CRUD = "crud";
 
     /**
      * 鏍戣〃锛堝鍒犳敼鏌ワ級
      */
-    public static final String TPL_TREE = "tree";
+    String TPL_TREE = "tree";
 
     /**
      * 涓诲瓙琛紙澧炲垹鏀规煡锛�
      */
-    public static final String TPL_SUB = "sub";
+    String TPL_SUB = "sub";
 
     /**
      * 鏍戠紪鐮佸瓧娈�
      */
-    public static final String TREE_CODE = "treeCode";
+    String TREE_CODE = "treeCode";
 
     /**
      * 鏍戠埗缂栫爜瀛楁
      */
-    public static final String TREE_PARENT_CODE = "treeParentCode";
+    String TREE_PARENT_CODE = "treeParentCode";
 
     /**
      * 鏍戝悕绉板瓧娈�
      */
-    public static final String TREE_NAME = "treeName";
+    String TREE_NAME = "treeName";
 
     /**
      * 涓婄骇鑿滃崟ID瀛楁
      */
-    public static final String PARENT_MENU_ID = "parentMenuId";
+    String PARENT_MENU_ID = "parentMenuId";
 
     /**
      * 涓婄骇鑿滃崟鍚嶇О瀛楁
      */
-    public static final String PARENT_MENU_NAME = "parentMenuName";
+    String PARENT_MENU_NAME = "parentMenuName";
 
     /**
      * 鏁版嵁搴撳瓧绗︿覆绫诲瀷
      */
-    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
 
     /**
      * 鏁版嵁搴撴枃鏈被鍨�
      */
-    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
     /**
      * 鏁版嵁搴撴椂闂寸被鍨�
      */
-    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
     /**
      * 鏁版嵁搴撴暟瀛楃被鍨�
      */
-    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "double", "decimal"};
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+        "bit", "bigint", "float", "double", "decimal"};
 
     /**
      * BO瀵硅薄 涓嶉渶瑕佹坊鍔犲瓧娈�
      */
-    public static final String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
-            "update_time", "version"};
+    String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
+        "update_time", "version"};
 
     /**
      * BO瀵硅薄 涓嶉渶瑕佺紪杈戝瓧娈�
      */
-    public static final String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
-            "update_time", "version"};
+    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"};
+    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", "version"};
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+        "update_time", "remark", "version"};
 
     /**
      * Entity鍩虹被瀛楁
      */
-    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
+    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
 
     /**
      * Tree鍩虹被瀛楁
      */
-    public static final String[] TREE_ENTITY = {"parentName", "parentId", "children"};
+    String[] TREE_ENTITY = {"parentName", "parentId", "children"};
 
     /**
      * 鏂囨湰妗�
      */
-    public static final String HTML_INPUT = "input";
+    String HTML_INPUT = "input";
 
     /**
      * 鏂囨湰鍩�
      */
-    public static final String HTML_TEXTAREA = "textarea";
+    String HTML_TEXTAREA = "textarea";
 
     /**
      * 涓嬫媺妗�
      */
-    public static final String HTML_SELECT = "select";
+    String HTML_SELECT = "select";
 
     /**
      * 鍗曢�夋
      */
-    public static final String HTML_RADIO = "radio";
+    String HTML_RADIO = "radio";
 
     /**
      * 澶嶉�夋
      */
-    public static final String HTML_CHECKBOX = "checkbox";
+    String HTML_CHECKBOX = "checkbox";
 
     /**
      * 鏃ユ湡鎺т欢
      */
-    public static final String HTML_DATETIME = "datetime";
+    String HTML_DATETIME = "datetime";
 
     /**
      * 鍥剧墖涓婁紶鎺т欢
      */
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+    String HTML_IMAGE_UPLOAD = "imageUpload";
 
     /**
      * 鏂囦欢涓婁紶鎺т欢
      */
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
+    String HTML_FILE_UPLOAD = "fileUpload";
 
     /**
      * 瀵屾枃鏈帶浠�
      */
-    public static final String HTML_EDITOR = "editor";
+    String HTML_EDITOR = "editor";
 
     /**
      * 瀛楃涓茬被鍨�
      */
-    public static final String TYPE_STRING = "String";
+    String TYPE_STRING = "String";
 
     /**
      * 鏁村瀷
      */
-    public static final String TYPE_INTEGER = "Integer";
+    String TYPE_INTEGER = "Integer";
 
     /**
      * 闀挎暣鍨�
      */
-    public static final String TYPE_LONG = "Long";
+    String TYPE_LONG = "Long";
 
     /**
      * 娴偣鍨�
      */
-    public static final String TYPE_DOUBLE = "Double";
+    String TYPE_DOUBLE = "Double";
 
     /**
      * 楂樼簿搴﹁绠楃被鍨�
      */
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+    String TYPE_BIGDECIMAL = "BigDecimal";
 
     /**
      * 鏃堕棿绫诲瀷
      */
-    public static final String TYPE_DATE = "Date";
+    String TYPE_DATE = "Date";
 
     /**
      * 妯$硦鏌ヨ
      */
-    public static final String QUERY_LIKE = "LIKE";
+    String QUERY_LIKE = "LIKE";
 
     /**
      * 闇�瑕�
      */
-    public static final String REQUIRE = "1";
+    String REQUIRE = "1";
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index fa88e7c..eebbb4b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -5,108 +5,108 @@
  *
  * @author ruoyi
  */
-public class UserConstants {
+public interface UserConstants {
 
     /**
      * 骞冲彴鍐呯郴缁熺敤鎴风殑鍞竴鏍囧織
      */
-    public static final String SYS_USER = "SYS_USER";
+    String SYS_USER = "SYS_USER";
 
     /**
      * 姝e父鐘舵��
      */
-    public static final String NORMAL = "0";
+    String NORMAL = "0";
 
     /**
      * 寮傚父鐘舵��
      */
-    public static final String EXCEPTION = "1";
+    String EXCEPTION = "1";
 
     /**
      * 鐢ㄦ埛灏佺鐘舵��
      */
-    public static final String USER_DISABLE = "1";
+    String USER_DISABLE = "1";
 
     /**
      * 瑙掕壊灏佺鐘舵��
      */
-    public static final String ROLE_DISABLE = "1";
+    String ROLE_DISABLE = "1";
 
     /**
      * 閮ㄩ棬姝e父鐘舵��
      */
-    public static final String DEPT_NORMAL = "0";
+    String DEPT_NORMAL = "0";
 
     /**
      * 閮ㄩ棬鍋滅敤鐘舵��
      */
-    public static final String DEPT_DISABLE = "1";
+    String DEPT_DISABLE = "1";
 
     /**
      * 瀛楀吀姝e父鐘舵��
      */
-    public static final String DICT_NORMAL = "0";
+    String DICT_NORMAL = "0";
 
     /**
      * 鏄惁涓虹郴缁熼粯璁わ紙鏄級
      */
-    public static final String YES = "Y";
+    String YES = "Y";
 
     /**
      * 鏄惁鑿滃崟澶栭摼锛堟槸锛�
      */
-    public static final String YES_FRAME = "0";
+    String YES_FRAME = "0";
 
     /**
      * 鏄惁鑿滃崟澶栭摼锛堝惁锛�
      */
-    public static final String NO_FRAME = "1";
+    String NO_FRAME = "1";
 
     /**
      * 鑿滃崟绫诲瀷锛堢洰褰曪級
      */
-    public static final String TYPE_DIR = "M";
+    String TYPE_DIR = "M";
 
     /**
      * 鑿滃崟绫诲瀷锛堣彍鍗曪級
      */
-    public static final String TYPE_MENU = "C";
+    String TYPE_MENU = "C";
 
     /**
      * 鑿滃崟绫诲瀷锛堟寜閽級
      */
-    public static final String TYPE_BUTTON = "F";
+    String TYPE_BUTTON = "F";
 
     /**
      * Layout缁勪欢鏍囪瘑
      */
-    public final static String LAYOUT = "Layout";
+    String LAYOUT = "Layout";
 
     /**
      * ParentView缁勪欢鏍囪瘑
      */
-    public final static String PARENT_VIEW = "ParentView";
+    String PARENT_VIEW = "ParentView";
 
     /**
      * InnerLink缁勪欢鏍囪瘑
      */
-    public final static String INNER_LINK = "InnerLink";
+    String INNER_LINK = "InnerLink";
 
     /**
      * 鏍¢獙杩斿洖缁撴灉鐮�
      */
-    public final static String UNIQUE = "0";
-    public final static String NOT_UNIQUE = "1";
+    String UNIQUE = "0";
+    String NOT_UNIQUE = "1";
 
     /**
      * 鐢ㄦ埛鍚嶉暱搴﹂檺鍒�
      */
-    public static final int USERNAME_MIN_LENGTH = 2;
-    public static final int USERNAME_MAX_LENGTH = 20;
+    int USERNAME_MIN_LENGTH = 2;
+    int USERNAME_MAX_LENGTH = 20;
 
     /**
      * 瀵嗙爜闀垮害闄愬埗
      */
-    public static final int PASSWORD_MIN_LENGTH = 5;
-    public static final int PASSWORD_MAX_LENGTH = 20;
+    int PASSWORD_MIN_LENGTH = 5;
+    int PASSWORD_MAX_LENGTH = 20;
 }

--
Gitblit v1.9.3