From e472f625232db301d806b9a59308571b90ff054f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 10 Oct 2020 16:39:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7pagehelper=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=881.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9cadb77..a90ef5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,12 +18,11 @@ UTF-8 1.8 3.1.1 - 1.3.2 1.2.1 1.19 2.9.2 2.3.2 - 1.2.5 + 1.3.0 1.2.74 5.2.5 5.5.0 From b0965653bf43ba99a13f925fa7314f4ad891ccab Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 10 Oct 2020 17:54:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 18 +++++------- .../src/main/resources/vm/vue/index.vue.vm | 20 ++++++------- ruoyi-ui/src/views/monitor/job/index.vue | 22 ++++++--------- ruoyi-ui/src/views/monitor/job/log.vue | 6 ++-- .../src/views/monitor/logininfor/index.vue | 6 ++-- ruoyi-ui/src/views/monitor/online/index.vue | 2 +- ruoyi-ui/src/views/monitor/operlog/index.vue | 6 ++-- ruoyi-ui/src/views/system/config/index.vue | 24 ++++++---------- ruoyi-ui/src/views/system/dept/index.vue | 18 +++++------- ruoyi-ui/src/views/system/dict/data.vue | 20 ++++++------- ruoyi-ui/src/views/system/dict/index.vue | 20 ++++++------- ruoyi-ui/src/views/system/menu/index.vue | 18 +++++------- ruoyi-ui/src/views/system/notice/index.vue | 18 +++++------- ruoyi-ui/src/views/system/post/index.vue | 20 ++++++------- ruoyi-ui/src/views/system/role/index.vue | 28 ++++++++----------- ruoyi-ui/src/views/system/user/index.vue | 24 ++++++---------- .../views/system/user/profile/resetPwd.vue | 4 +-- .../views/system/user/profile/userAvatar.vue | 10 +++---- .../views/system/user/profile/userInfo.vue | 4 +-- ruoyi-ui/src/views/tool/gen/index.vue | 4 +-- 20 files changed, 116 insertions(+), 176 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 10a98625..e139a135 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -420,19 +420,15 @@ export default { #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { add${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -449,7 +445,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index e37e1125..23decc63 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -436,19 +436,15 @@ export default { #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { add${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -466,7 +462,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -479,7 +475,7 @@ export default { return export${BusinessName}(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index ed3bbfa5..17237487 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -402,7 +402,7 @@ export default { return runJob(row.jobId, row.jobGroup); }).then(() => { this.msgSuccess("执行成功"); - }).catch(function() {}); + }) }, /** 任务详细信息 */ handleView(row) { @@ -437,19 +437,15 @@ export default { if (valid) { if (this.form.jobId != undefined) { updateJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -467,7 +463,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -480,7 +476,7 @@ export default { return exportJob(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 10299dde..4be23988 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -263,7 +263,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 清空按钮操作 */ handleClean() { @@ -276,7 +276,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("清空成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -289,7 +289,7 @@ export default { return exportJobLog(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 8b0cdc47..90d321f3 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -196,7 +196,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 清空按钮操作 */ handleClean() { @@ -209,7 +209,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("清空成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -222,7 +222,7 @@ export default { return exportLogininfor(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index cdee7ee9..0dc6e98c 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -120,7 +120,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("强退成功"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 1371cdf9..3a44cfcd 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -284,7 +284,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 清空按钮操作 */ handleClean() { @@ -297,7 +297,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("清空成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -310,7 +310,7 @@ export default { return exportOperlog(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index 0d88b00d..4a6850e7 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -304,19 +304,15 @@ export default { if (valid) { if (this.form.configId != undefined) { updateConfig(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addConfig(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -334,7 +330,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -347,14 +343,12 @@ export default { return exportConfig(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 清理缓存按钮操作 */ handleClearCache() { clearCache().then(response => { - if (response.code === 200) { - this.msgSuccess("清理成功"); - } + this.msgSuccess("清理成功"); }); } } diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index ae2aaaa8..1a2b506e 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -284,19 +284,15 @@ export default { if (valid) { if (this.form.deptId != undefined) { updateDept(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addDept(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -313,7 +309,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index b86d2452..900d7ce9 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -304,19 +304,15 @@ export default { if (valid) { if (this.form.dictCode != undefined) { updateData(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addData(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -334,7 +330,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -347,7 +343,7 @@ export default { return exportData(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 7b831daf..7c90814b 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -308,19 +308,15 @@ export default { if (valid) { if (this.form.dictId != undefined) { updateType(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addType(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -338,7 +334,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -351,7 +347,7 @@ export default { return exportType(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 清理缓存按钮操作 */ handleClearCache() { diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index f8ce2f0c..dcbff6b9 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -367,19 +367,15 @@ export default { if (valid) { if (this.form.menuId != undefined) { updateMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -396,7 +392,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 4039ed75..86ca769d 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -307,19 +307,15 @@ export default { if (valid) { if (this.form.noticeId != undefined) { updateNotice(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addNotice(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -337,7 +333,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index b66060d0..93dc8c2f 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -276,19 +276,15 @@ export default { if (valid) { if (this.form.postId != undefined) { updatePost(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addPost(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -306,7 +302,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -319,7 +315,7 @@ export default { return exportPost(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index f54a7e75..bdaa90da 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -537,20 +537,16 @@ export default { if (this.form.roleId != undefined) { this.form.menuIds = this.getMenuAllCheckedKeys(); updateRole(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { this.form.menuIds = this.getMenuAllCheckedKeys(); addRole(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -561,11 +557,9 @@ export default { if (this.form.roleId != undefined) { this.form.deptIds = this.getDeptAllCheckedKeys(); dataScope(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.openDataScope = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.openDataScope = false; + this.getList(); }); } }, @@ -581,7 +575,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -594,7 +588,7 @@ export default { return exportRole(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 9a9abc57..ebc6d2a9 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -582,9 +582,7 @@ export default { cancelButtonText: "取消" }).then(({ value }) => { resetUserPwd(row.userId, value).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功，新密码是：" + value); - } + this.msgSuccess("修改成功，新密码是：" + value); }); }).catch(() => {}); }, @@ -594,19 +592,15 @@ export default { if (valid) { if (this.form.userId != undefined) { updateUser(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addUser(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -624,7 +618,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) }, /** 导出按钮操作 */ handleExport() { @@ -637,7 +631,7 @@ export default { return exportUser(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 导入按钮操作 */ handleImport() { diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue index e39948e3..13597170 100644 --- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue +++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue @@ -57,9 +57,7 @@ export default { if (valid) { updateUserPwd(this.user.oldPassword, this.user.newPassword).then( response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - } + this.msgSuccess("修改成功"); } ); } diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue index 8f60085d..ef0c213b 100644 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue @@ -125,12 +125,10 @@ export default { let formData = new FormData(); formData.append("avatarfile", data); uploadAvatar(formData).then(response => { - if (response.code === 200) { - this.open = false; - this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; - store.commit('SET_AVATAR', this.options.img); - this.msgSuccess("修改成功"); - } + this.open = false; + this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; + store.commit('SET_AVATAR', this.options.img); + this.msgSuccess("修改成功"); this.visible = false; }); }); diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue index 0b1780d9..d52137dc 100644 --- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue +++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue @@ -62,9 +62,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { updateUserProfile(this.user).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - } + this.msgSuccess("修改成功"); }); } }); diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index beebfe2d..824148e3 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -270,7 +270,7 @@ export default { return synchDb(tableName); }).then(() => { this.msgSuccess("同步成功"); - }).catch(function() {}); + }) }, /** 打开导入表弹窗 */ openImportTable() { @@ -313,7 +313,7 @@ export default { }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } };