Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud

Conflicts: ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/FileUpload/index.vue ruoyi-ui/src/router/index.js
2025-09-06 20:38:35 +00:00 · 2022-02-14 14:55:55 +08:00
parent 24a8719d4c 0e13296752
commit 4827f9217b
36 changed files with 477 additions and 473 deletions
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -1,181 +1,186 @@
-package com.ruoyi.common.core.constant;
-
-/**
- * 代码生成通用常量
- *
- * @author Lion Li
- */
-public interface GenConstants {
-    /**
-     * 单表（增删改查）
-     */
-    String TPL_CRUD = "crud";
-
-    /**
-     * 树表（增删改查）
-     */
-    String TPL_TREE = "tree";
-
-    /**
-     * 主子表（增删改查）
-     */
-    String TPL_SUB = "sub";
-
-    /**
-     * 树编码字段
-     */
-    String TREE_CODE = "treeCode";
-
-    /**
-     * 树父编码字段
-     */
-    String TREE_PARENT_CODE = "treeParentCode";
-
-    /**
-     * 树名称字段
-     */
-    String TREE_NAME = "treeName";
-
-    /**
-     * 上级菜单ID字段
-     */
-    String PARENT_MENU_ID = "parentMenuId";
-
-    /**
-     * 上级菜单名称字段
-     */
-    String PARENT_MENU_NAME = "parentMenuName";
-
-    /**
-     * 数据库字符串类型
-     */
-    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
-
-    /**
-     * 数据库文本类型
-     */
-    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
-
-    /**
-     * 数据库时间类型
-     */
-    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
-
-    /**
-     * 数据库数字类型
-     */
-    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "double", "decimal"};
-
-    /**
-     * 页面不需要编辑字段
-     */
-    String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
-
-    /**
-     * 页面不需要显示的列表字段
-     */
-    String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time"};
-
-    /**
-     * 页面不需要查询字段
-     */
-    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time", "remark"};
-
-    /**
-     * Entity基类字段
-     */
-    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
-
-    /**
-     * Tree基类字段
-     */
-    String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
-
-    /**
-     * 文本框
-     */
-    String HTML_INPUT = "input";
-
-    /**
-     * 文本域
-     */
-    String HTML_TEXTAREA = "textarea";
-
-    /**
-     * 下拉框
-     */
-    String HTML_SELECT = "select";
-
-    /**
-     * 单选框
-     */
-    String HTML_RADIO = "radio";
-
-    /**
-     * 复选框
-     */
-    String HTML_CHECKBOX = "checkbox";
-
-    /**
-     * 日期控件
-     */
-    String HTML_DATETIME = "datetime";
-
-    /**
-     * 图片上传控件
-     */
-    String HTML_IMAGE_UPLOAD = "imageUpload";
-
-    /**
-     * 文件上传控件
-     */
-    String HTML_FILE_UPLOAD = "fileUpload";
-
-    /**
-     * 富文本控件
-     */
-    String HTML_EDITOR = "editor";
-
-    /**
-     * 字符串类型
-     */
-    String TYPE_STRING = "String";
-
-    /**
-     * 整型
-     */
-    String TYPE_INTEGER = "Integer";
-
-    /**
-     * 长整型
-     */
-    String TYPE_LONG = "Long";
-
-    /**
-     * 浮点型
-     */
-    String TYPE_DOUBLE = "Double";
-
-    /**
-     * 高精度计算类型
-     */
-    String TYPE_BIGDECIMAL = "BigDecimal";
-
-    /**
-     * 时间类型
-     */
-    String TYPE_DATE = "Date";
-
-    /**
-     * 模糊查询
-     */
-    String QUERY_LIKE = "LIKE";
-
-    /**
-     * 需要
-     */
-    String REQUIRE = "1";
-}
+package com.ruoyi.common.core.constant;
+
+/**
+ * 代码生成通用常量
+ *
+ * @author Lion Li
+ */
+public interface GenConstants {
+    /**
+     * 单表（增删改查）
+     */
+    String TPL_CRUD = "crud";
+
+    /**
+     * 树表（增删改查）
+     */
+    String TPL_TREE = "tree";
+
+    /**
+     * 主子表（增删改查）
+     */
+    String TPL_SUB = "sub";
+
+    /**
+     * 树编码字段
+     */
+    String TREE_CODE = "treeCode";
+
+    /**
+     * 树父编码字段
+     */
+    String TREE_PARENT_CODE = "treeParentCode";
+
+    /**
+     * 树名称字段
+     */
+    String TREE_NAME = "treeName";
+
+    /**
+     * 上级菜单ID字段
+     */
+    String PARENT_MENU_ID = "parentMenuId";
+
+    /**
+     * 上级菜单名称字段
+     */
+    String PARENT_MENU_NAME = "parentMenuName";
+
+    /**
+     * 数据库字符串类型
+     */
+    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+
+    /**
+     * 数据库文本类型
+     */
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+
+    /**
+     * 数据库时间类型
+     */
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+
+    /**
+     * 数据库数字类型
+     */
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bigint", "float", "double", "decimal"};
+
+    /**
+     * 页面不需要编辑字段
+     */
+    String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
+
+    /**
+     * 页面不需要显示的列表字段
+     */
+    String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time"};
+
+    /**
+     * 页面不需要查询字段
+     */
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark"};
+
+    /**
+     * Entity基类字段
+     */
+    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
+
+    /**
+     * Tree基类字段
+     */
+    String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
+
+    /**
+     * 文本框
+     */
+    String HTML_INPUT = "input";
+
+    /**
+     * 文本域
+     */
+    String HTML_TEXTAREA = "textarea";
+
+    /**
+     * 下拉框
+     */
+    String HTML_SELECT = "select";
+
+    /**
+     * 单选框
+     */
+    String HTML_RADIO = "radio";
+
+    /**
+     * 复选框
+     */
+    String HTML_CHECKBOX = "checkbox";
+
+    /**
+     * 日期控件
+     */
+    String HTML_DATETIME = "datetime";
+
+    /**
+     * 图片上传控件
+     */
+    String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /**
+     * 文件上传控件
+     */
+    String HTML_FILE_UPLOAD = "fileUpload";
+
+    /**
+     * 富文本控件
+     */
+    String HTML_EDITOR = "editor";
+
+    /**
+     * 字符串类型
+     */
+    String TYPE_STRING = "String";
+
+    /**
+     * 整型
+     */
+    String TYPE_INTEGER = "Integer";
+
+    /**
+     * 长整型
+     */
+    String TYPE_LONG = "Long";
+
+    /**
+     * 浮点型
+     */
+    String TYPE_DOUBLE = "Double";
+
+    /**
+     * 高精度计算类型
+     */
+    String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /**
+     * 时间类型
+     */
+    String TYPE_DATE = "Date";
+
+    /**
+     * 模糊查询
+     */
+    String QUERY_LIKE = "LIKE";
+
+    /**
+     * 相等查询
+     */
+    String QUERY_EQ = "EQ";
+
+    /**
+     * 需要
+     */
+    String REQUIRE = "1";
+}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -137,9 +137,8 @@ public class ServletUtils extends ServletUtil {
     *
     * @param response 渲染对象
     * @param string   待渲染的字符串
-     * @return null
     */
-    public static String renderString(HttpServletResponse response, String string) {
+    public static void renderString(HttpServletResponse response, String string) {
        try {
            response.setStatus(HttpStatus.HTTP_OK);
            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -148,7 +147,6 @@ public class ServletUtils extends ServletUtil {
        } catch (IOException e) {
            e.printStackTrace();
        }
-        return null;
    }

    /**
@@ -159,12 +157,12 @@ public class ServletUtils extends ServletUtil {
    public static boolean isAjaxRequest(HttpServletRequest request) {

        String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1) {
+        if (accept != null && accept.contains("application/json")) {
            return true;
        }

        String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
            return true;
        }

@@ -174,10 +172,7 @@ public class ServletUtils extends ServletUtil {
        }

        String ajax = request.getParameter("__ajax");
-        if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
-            return true;
-        }
-        return false;
+        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
    }

    public static String getClientIP() {