Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
b7107a4d
Commit
b7107a4d
authored
Feb 18, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户手机邮箱必填&密码参数修改
parent
c0cd2f61
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
index.vue
ruoyi-ui/src/views/system/user/index.vue
+3
-1
SysUser.java
...rc/main/java/com/ruoyi/project/system/domain/SysUser.java
+2
-2
No files found.
ruoyi-ui/src/views/system/user/index.vue
View file @
b7107a4d
...
@@ -416,6 +416,7 @@ export default {
...
@@ -416,6 +416,7 @@ export default {
{
required
:
true
,
message
:
"用户密码不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"用户密码不能为空"
,
trigger
:
"blur"
}
],
],
email
:
[
email
:
[
{
required
:
true
,
message
:
"邮箱地址不能为空"
,
trigger
:
"blur"
},
{
{
type
:
"email"
,
type
:
"email"
,
message
:
"'请输入正确的邮箱地址"
,
message
:
"'请输入正确的邮箱地址"
,
...
@@ -423,6 +424,7 @@ export default {
...
@@ -423,6 +424,7 @@ export default {
}
}
],
],
phonenumber
:
[
phonenumber
:
[
{
required
:
true
,
message
:
"手机号码不能为空"
,
trigger
:
"blur"
},
{
{
pattern
:
/^1
[
3|4|5|6|7|8|9
][
0-9
]\d{8}
$/
,
pattern
:
/^1
[
3|4|5|6|7|8|9
][
0-9
]\d{8}
$/
,
message
:
"请输入正确的手机号码"
,
message
:
"请输入正确的手机号码"
,
...
@@ -448,7 +450,7 @@ export default {
...
@@ -448,7 +450,7 @@ export default {
this
.
sexOptions
=
response
.
data
;
this
.
sexOptions
=
response
.
data
;
});
});
this
.
getConfigKey
(
"sys.user.initPassword"
).
then
(
response
=>
{
this
.
getConfigKey
(
"sys.user.initPassword"
).
then
(
response
=>
{
this
.
initPassword
=
response
.
data
;
this
.
initPassword
=
response
.
msg
;
});
});
},
},
methods
:
{
methods
:
{
...
...
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
View file @
b7107a4d
...
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
...
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.fasterxml.jackson.annotation.Json
Ignore
;
import
com.fasterxml.jackson.annotation.Json
Property
;
import
com.ruoyi.framework.aspectj.lang.annotation.Excel
;
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.ColumnType
;
import
com.ruoyi.framework.aspectj.lang.annotation.Excel.Type
;
import
com.ruoyi.framework.aspectj.lang.annotation.Excel.Type
;
...
@@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
...
@@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
this
.
avatar
=
avatar
;
this
.
avatar
=
avatar
;
}
}
@Json
Ignore
@Json
Property
public
String
getPassword
()
public
String
getPassword
()
{
{
return
password
;
return
password
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment