Merge remote-tracking branch 'origin/dev' into satoken

# Conflicts: # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java # ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java # ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java # ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java # ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java # ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java # ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java # ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
2025-09-24 07:19:46 +08:00 · 2021-10-27 13:16:19 +08:00
parent c9a3164a29 dbb2d8462b
commit 695cb6d76b
418 changed files with 43660 additions and 4512 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@ -5,8 +5,7 @@ package com.ruoyi.common.constant;
 *
 * @author ruoyi
 */
-public class Constants
-{
+public class Constants {
    /**
     * UTF-8 字符集
     */
@ -107,13 +106,13 @@ public class Constants
     */
    public static final String SYS_DICT_KEY = "sys_dict:";

-	/**
-	 * RMI 远程方法调用
-	 */
-	public static final String LOOKUP_RMI = "rmi://";
+    /**
+     * RMI 远程方法调用
+     */
+    public static final String LOOKUP_RMI = "rmi://";

-	/**
-	 * LDAP 远程方法调用
-	 */
-	public static final String LOOKUP_LDAP = "ldap://";
+    /**
+     * LDAP 远程方法调用
+     */
+    public static final String LOOKUP_LDAP = "ldap://";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@ -2,118 +2,187 @@ package com.ruoyi.common.constant;

 /**
 * 代码生成通用常量
- * 
+ *
 * @author ruoyi
 */
-public class GenConstants
-{
-    /** 单表（增删改查） */
+public class GenConstants {
+    /**
+     * 单表（增删改查）
+     */
    public static final String TPL_CRUD = "crud";

-    /** 树表（增删改查） */
+    /**
+     * 树表（增删改查）
+     */
    public static final String TPL_TREE = "tree";

-    /** 主子表（增删改查） */
+    /**
+     * 主子表（增删改查）
+     */
    public static final String TPL_SUB = "sub";

-    /** 树编码字段 */
+    /**
+     * 树编码字段
+     */
    public static final String TREE_CODE = "treeCode";

-    /** 树父编码字段 */
+    /**
+     * 树父编码字段
+     */
    public static final String TREE_PARENT_CODE = "treeParentCode";

-    /** 树名称字段 */
+    /**
+     * 树名称字段
+     */
    public static final String TREE_NAME = "treeName";

-    /** 上级菜单ID字段 */
+    /**
+     * 上级菜单ID字段
+     */
    public static final String PARENT_MENU_ID = "parentMenuId";

-    /** 上级菜单名称字段 */
+    /**
+     * 上级菜单名称字段
+     */
    public static final String PARENT_MENU_NAME = "parentMenuName";

-    /** 数据库字符串类型 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+    /**
+     * 数据库字符串类型
+     */
+    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_TEXT = {"tinytext", "text", "mediumtext", "longtext"};

-    /** 数据库时间类型 */
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+    /**
+     * 数据库时间类型
+     */
+    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};

-    /** 数据库数字类型 */
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "double", "decimal" };
+    /**
+     * 数据库数字类型
+     */
+    public static final 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" };
+    /**
+     * BO对象 不需要添加字段
+     */
+    public static final 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" };
+    /**
+     * 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" };
+    /**
+     * 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", "version" };
+    /**
+     * BO对象 不需要查询字段
+     */
+    public static final 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", "remark" };
+    /**
+     * Entity基类字段
+     */
+    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};

-    /** Tree基类字段 */
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+    /**
+     * Tree基类字段
+     */
+    public static final String[] TREE_ENTITY = {"parentName", "parentId", "children"};

-    /** 文本框 */
+    /**
+     * 文本框
+     */
    public static final String HTML_INPUT = "input";

-    /** 文本域 */
+    /**
+     * 文本域
+     */
    public static final String HTML_TEXTAREA = "textarea";

-    /** 下拉框 */
+    /**
+     * 下拉框
+     */
    public static final String HTML_SELECT = "select";

-    /** 单选框 */
+    /**
+     * 单选框
+     */
    public static final String HTML_RADIO = "radio";

-    /** 复选框 */
+    /**
+     * 复选框
+     */
    public static final String HTML_CHECKBOX = "checkbox";

-    /** 日期控件 */
+    /**
+     * 日期控件
+     */
    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";

-    /** 整型 */
+    /**
+     * 整型
+     */
    public static final String TYPE_INTEGER = "Integer";

-    /** 长整型 */
+    /**
+     * 长整型
+     */
    public static final String TYPE_LONG = "Long";

-    /** 浮点型 */
+    /**
+     * 浮点型
+     */
    public static final String TYPE_DOUBLE = "Double";

-    /** 高精度计算类型 */
+    /**
+     * 高精度计算类型
+     */
    public static final String TYPE_BIGDECIMAL = "BigDecimal";

-    /** 时间类型 */
+    /**
+     * 时间类型
+     */
    public static final String TYPE_DATE = "Date";

-    /** 模糊查询 */
+    /**
+     * 模糊查询
+     */
    public static final String QUERY_LIKE = "LIKE";

-    /** 需要 */
+    /**
+     * 需要
+     */
    public static final String REQUIRE = "1";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@ -2,7 +2,8 @@ package com.ruoyi.common.constant;

 /**
 * 任务调度通用常量
- * 
+ *
+ * @deprecated 3.4.0删除 迁移至xxl-job
 * @author ruoyi
 */
 public class ScheduleConstants
--- 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,62 +5,96 @@ package com.ruoyi.common.constant;
 *
 * @author ruoyi
 */
-public class UserConstants
-{
+public class UserConstants {
+
    /**
     * 平台内系统用户的唯一标志
     */
    public static final String SYS_USER = "SYS_USER";

-    /** 正常状态 */
+    /**
+     * 正常状态
+     */
    public static final String NORMAL = "0";

-    /** 异常状态 */
+    /**
+     * 异常状态
+     */
    public static final String EXCEPTION = "1";

-    /** 用户封禁状态 */
+    /**
+     * 用户封禁状态
+     */
    public static final String USER_DISABLE = "1";

-    /** 角色封禁状态 */
+    /**
+     * 角色封禁状态
+     */
    public static final String ROLE_DISABLE = "1";

-    /** 部门正常状态 */
+    /**
+     * 部门正常状态
+     */
    public static final String DEPT_NORMAL = "0";

-    /** 部门停用状态 */
+    /**
+     * 部门停用状态
+     */
    public static final String DEPT_DISABLE = "1";

-    /** 字典正常状态 */
+    /**
+     * 字典正常状态
+     */
    public static final String DICT_NORMAL = "0";

-    /** 是否为系统默认（是） */
+    /**
+     * 是否为系统默认（是）
+     */
    public static final String YES = "Y";

-    /** 是否菜单外链（是） */
+    /**
+     * 是否菜单外链（是）
+     */
    public static final String YES_FRAME = "0";

-    /** 是否菜单外链（否） */
+    /**
+     * 是否菜单外链（否）
+     */
    public static final String NO_FRAME = "1";

-    /** 菜单类型（目录） */
+    /**
+     * 菜单类型（目录）
+     */
    public static final String TYPE_DIR = "M";

-    /** 菜单类型（菜单） */
+    /**
+     * 菜单类型（菜单）
+     */
    public static final String TYPE_MENU = "C";

-    /** 菜单类型（按钮） */
+    /**
+     * 菜单类型（按钮）
+     */
    public static final String TYPE_BUTTON = "F";

-    /** Layout组件标识 */
+    /**
+     * Layout组件标识
+     */
    public final static String LAYOUT = "Layout";

-    /** ParentView组件标识 */
+    /**
+     * ParentView组件标识
+     */
    public final static String PARENT_VIEW = "ParentView";

-    /** InnerLink组件标识 */
+    /**
+     * InnerLink组件标识
+     */
    public final static String INNER_LINK = "InnerLink";

-    /** 校验返回结果码 */
+    /**
+     * 校验返回结果码
+     */
    public final static String UNIQUE = "0";
    public final static String NOT_UNIQUE = "1";