From b7107a4dba6ba04149a4107a99760fdda5f1cd56 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 18 二月 2020 11:15:08 +0800
Subject: [PATCH] 用户手机邮箱必填&密码参数修改
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 4 ++--
ruoyi-ui/src/views/system/user/index.vue | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index d2cdb84..8d290b8 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -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: {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 1a875f4..88a80c3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -7,7 +7,7 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
@@ -197,7 +197,7 @@
this.avatar = avatar;
}
- @JsonIgnore
+ @JsonProperty
public String getPassword()
{
return password;
--
Gitblit v1.9.2