From 1a695159e3cd3010381b0dff8b3dcd6f73fa189a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 10:49:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/system/dict/data.vue | 1
ruoyi-ui/src/views/monitor/job/log.vue | 1
ruoyi-ui/src/views/tool/gen/index.vue | 1
ruoyi-ui/src/views/system/role/authUser.vue | 1
ruoyi-ui/src/views/system/notice/index.vue | 1
ruoyi-ui/src/views/system/role/index.vue | 1
ruoyi-ui/src/views/system/user/index.vue | 1
ruoyi-ui/src/views/monitor/job/index.vue | 1
ruoyi-ui/src/views/system/config/index.vue | 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 26 ++++++++++---
ruoyi-ui/src/views/system/dict/index.vue | 1
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 44 +++++++++++-----------
ruoyi-ui/src/api/login.js | 2
ruoyi-ui/src/views/monitor/logininfor/index.vue | 1
ruoyi-ui/src/views/system/post/index.vue | 1
15 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 3915867..04a21a7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/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)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index beaa26c..f611834 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/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
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index a10fbe6..abd49c7 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -48,6 +48,6 @@
return request({
url: '/captchaImage',
method: 'get',
- timeout: 20000
+ timeout: 20000
})
}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 6256804..f73cfc8 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 7e4dffe..561924b 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue
index 778492b..bba4553 100644
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index 04384bb..2c69ee4 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index 3b8ec4b..1aa61cc 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
index b4ac1da..02eabfb 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index b90168c..f2ae9bb 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue
index 735d616..7a68efa 100644
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue
index a65ccbf..51edd33 100644
--- a/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 59880bd..a479069 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/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
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index d06d500..22eaa4b 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/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,
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 1b69e21..30d9908 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -219,6 +219,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ reasonable: true,
tableName: undefined,
tableComment: undefined
},
--
Gitblit v1.9.3