From 31b63bf14d66531e7c8ca14e712a9b9f947b1eb2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 01 Jun 2020 10:09:39 +0800
Subject: [PATCH] 升级fastjson到最新版1.2.70 修复高危安全漏洞
---
ruoyi-ui/src/views/system/user/index.vue | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index d2cdb84..94cd371 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -198,7 +198,7 @@
</el-row>
<!-- 添加或修改参数配置对话框 -->
- <el-dialog :title="title" :visible.sync="open" width="600px">
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -222,7 +222,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="用户名称" prop="userName">
+ <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
@@ -295,7 +295,7 @@
</el-dialog>
<!-- 用户导入对话框 -->
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
@@ -416,6 +416,7 @@
{ required: true, message: "用户密码不能为空", trigger: "blur" }
],
email: [
+ { required: true, message: "邮箱地址不能为空", trigger: "blur" },
{
type: "email",
message: "'请输入正确的邮箱地址",
@@ -423,6 +424,7 @@
}
],
phonenumber: [
+ { required: true, message: "手机号码不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
@@ -448,7 +450,7 @@
this.sexOptions = response.data;
});
this.getConfigKey("sys.user.initPassword").then(response => {
- this.initPassword = response.data;
+ this.initPassword = response.msg;
});
},
methods: {
@@ -570,8 +572,6 @@
resetUserPwd(row.userId, value).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功，新密码是：" + value);
- } else {
- this.msgError(response.msg);
}
});
}).catch(() => {});
@@ -586,8 +586,6 @@
this.msgSuccess("修改成功");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
} else {
@@ -596,8 +594,6 @@
this.msgSuccess("新增成功");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
}
--
Gitblit v1.9.2