疯狂的狮子li
2021-09-02 1a695159e3cd3010381b0dff8b3dcd6f73fa189a
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:
 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
 ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
 ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
 ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
 ruoyi-ui/src/api/login.js
 ruoyi-ui/src/views/system/dict/data.vue
 ruoyi-ui/src/views/system/dict/index.vue
 ruoyi-ui/src/views/system/role/index.vue
 ruoyi-ui/src/views/system/user/index.vue
 ruoyi-ui/src/views/tool/gen/index.vue
已修改15个文件
84 ■■■■■ 文件已修改
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/login.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/monitor/job/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/monitor/job/log.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/monitor/logininfor/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/config/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/dict/data.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/dict/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/notice/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/post/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/role/authUser.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/role/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/tool/gen/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -17,28 +17,6 @@
    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
    /**
     * 响应返回结果
     *
     * @param rows 影响行数
     * @return 操作结果
     */
    protected AjaxResult<Void> toAjax(int rows)
    {
        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
    }
    /**
     * 响应返回结果
     *
     * @param result 结果
     * @return 操作结果
     */
    protected AjaxResult<Void> toAjax(boolean result)
    {
        return result ? success() : error();
    }
    /**
     * 返回成功
     */
    public AjaxResult<Void> success()
@@ -71,6 +49,28 @@
    }
    /**
     * 响应返回结果
     *
     * @param rows 影响行数
     * @return 操作结果
     */
    protected AjaxResult<Void> toAjax(int rows)
    {
        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
    }
    /**
     * 响应返回结果
     *
     * @param result 结果
     * @return 操作结果
     */
    protected AjaxResult<Void> toAjax(boolean result)
    {
        return result ? success() : error();
    }
    /**
     * 页面跳转
     */
    public String redirect(String url)
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -48,12 +48,26 @@
        return Convert.toInt(getRequest().getParameter(name), defaultValue);
    }
    /**
     * 获取request
     */
    public static HttpServletRequest getRequest() {
        return getRequestAttributes().getRequest();
    }
    /**
     * 获取Boolean参数
     */
    public static Boolean getParameterToBool(String name) {
        return Convert.toBool(getRequest().getParameter(name));
    }
    /**
     * 获取Boolean参数
     */
    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
        return Convert.toBool(getRequest().getParameter(name), defaultValue);
    }
    /**
     * 获取request
     */
    public static HttpServletRequest getRequest() {
        return getRequestAttributes().getRequest();
    }
    /**
     * 获取response
ruoyi-ui/src/api/login.js
@@ -48,6 +48,6 @@
  return request({
    url: '/captchaImage',
    method: 'get',
    timeout: 20000
    timeout: 20000
  })
}
ruoyi-ui/src/views/monitor/job/index.vue
@@ -320,6 +320,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        jobName: undefined,
        jobGroup: undefined,
        status: undefined
ruoyi-ui/src/views/monitor/job/log.vue
@@ -220,6 +220,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        jobName: undefined,
        jobGroup: undefined,
        status: undefined
ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -153,6 +153,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        ipaddr: undefined,
        userName: undefined,
        status: undefined
ruoyi-ui/src/views/system/config/index.vue
@@ -219,6 +219,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        configName: undefined,
        configKey: undefined,
        configType: undefined
ruoyi-ui/src/views/system/dict/data.vue
@@ -247,6 +247,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        dictName: undefined,
        dictType: undefined,
        status: undefined
ruoyi-ui/src/views/system/dict/index.vue
@@ -227,6 +227,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        dictName: undefined,
        dictType: undefined,
        status: undefined
ruoyi-ui/src/views/system/notice/index.vue
@@ -204,6 +204,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        noticeTitle: undefined,
        createBy: undefined,
        status: undefined
ruoyi-ui/src/views/system/post/index.vue
@@ -192,6 +192,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        postCode: undefined,
        postName: undefined,
        status: undefined
ruoyi-ui/src/views/system/role/authUser.vue
@@ -128,6 +128,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        roleId: undefined,
        userName: undefined,
        phonenumber: undefined
ruoyi-ui/src/views/system/role/index.vue
@@ -328,6 +328,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        roleName: undefined,
        roleKey: undefined,
        status: undefined
ruoyi-ui/src/views/system/user/index.vue
@@ -418,6 +418,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        userName: undefined,
        phonenumber: undefined,
        status: undefined,
ruoyi-ui/src/views/tool/gen/index.vue
@@ -219,6 +219,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
        tableName: undefined,
        tableComment: undefined
      },