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

Conflicts: ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/online/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/system/user/profile/resetPwd.vue ruoyi-ui/src/views/system/user/profile/userAvatar.vue ruoyi-ui/src/views/system/user/profile/userInfo.vue ruoyi-ui/src/views/tool/gen/index.vue
2020-10-12 09:54:59 +08:00 · 2020-10-12 09:54:59 +08:00 · 8ca53c7666
parent bd39b971cf b0965653bf
commit 8ca53c7666
21 changed files with 126 additions and 187 deletions
--- a/pom.xml
+++ b/pom.xml
@ -18,12 +18,11 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <mybatis.boot.version>1.3.2</mybatis.boot.version>
        <druid.version>1.2.1</druid.version>
        <bitwalker.version>1.19</bitwalker.version>
        <swagger.version>2.9.2</swagger.version>
 		<kaptcha.version>2.3.2</kaptcha.version>
-        <pagehelper.boot.version>1.2.5</pagehelper.boot.version>
+        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
        <fastjson.version>1.2.74</fastjson.version>
        <oshi.version>5.2.5</oshi.version>
        <jna.version>5.5.0</jna.version>
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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("清理成功");
      });
    }
  }
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@ -62,16 +62,16 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button size="mini"
-            type="text"
-            icon="el-icon-edit"
+          <el-button size="mini" 
+            type="text" 
+            icon="el-icon-edit" 
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:menu:edit']"
          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
+          <el-button 
+            size="mini" 
+            type="text" 
+            icon="el-icon-plus" 
            @click="handleAdd(scope.row)"
            v-hasPermi="['system:menu:add']"
          >新增</el-button>
@ -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,8 +392,8 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
    }
  }
 };
-</script>
+</script>
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {});
+        })
    }
  }
 };
--- 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() {
--- 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("修改成功");
            }
          );
        }
--- 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;
        });
      });
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@ -2,7 +2,7 @@
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="用户昵称" prop="nickName">
      <el-input v-model="user.nickName" />
-    </el-form-item>
+    </el-form-item> 
    <el-form-item label="手机号码" prop="phonenumber">
      <el-input v-model="user.phonenumber" maxlength="11" />
    </el-form-item>
@ -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("修改成功");
          });
        }
      });
--- 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() {});
+      })
    }
  }
 };