Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
5dd4842d
Commit
5dd4842d
authored
Nov 29, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录:密码长度相关提示语
parent
2f1eed6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
SysLoginController.java
...ava/com/dsk/web/controller/system/SysLoginController.java
+0
-4
LoginBody.java
...main/java/com/dsk/common/core/domain/model/LoginBody.java
+1
-1
RegisterBody.java
...n/java/com/dsk/common/core/domain/model/RegisterBody.java
+13
-0
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/system/SysLoginController.java
View file @
5dd4842d
...
@@ -67,16 +67,12 @@ public class SysLoginController {
...
@@ -67,16 +67,12 @@ public class SysLoginController {
@SaIgnore
@SaIgnore
@PostMapping
(
"/login"
)
@PostMapping
(
"/login"
)
public
R
<
LoginVo
>
login
(
@Validated
@RequestBody
LoginBody
loginBody
,
HttpServletRequest
request
)
{
public
R
<
LoginVo
>
login
(
@Validated
@RequestBody
LoginBody
loginBody
,
HttpServletRequest
request
)
{
// Map<String, Object> ajax = new HashMap<>();
// Map<String, Object> ajax = new HashMap<>();
// 生成令牌
// 生成令牌
// LoginVo loginVo = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
// LoginVo loginVo = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
// loginBody.getUuid());
// loginBody.getUuid());
// ajax.put(Constants.TOKEN, token);
// ajax.put(Constants.TOKEN, token);
// return R.ok(ajax);
// return R.ok(ajax);
String
ipAddr
=
IpUtil
.
getIpAddr
(
request
);
String
ipAddr
=
IpUtil
.
getIpAddr
(
request
);
LoginVo
loginVo
=
loginService
.
passwordLogin
(
loginBody
,
ipAddr
);
LoginVo
loginVo
=
loginService
.
passwordLogin
(
loginBody
,
ipAddr
);
return
R
.
ok
(
loginVo
);
return
R
.
ok
(
loginVo
);
...
...
dsk-common/src/main/java/com/dsk/common/core/domain/model/LoginBody.java
View file @
5dd4842d
...
@@ -30,7 +30,7 @@ public class LoginBody {
...
@@ -30,7 +30,7 @@ public class LoginBody {
* 用户密码
* 用户密码
*/
*/
@NotBlank
(
message
=
"{user.password.not.blank}"
)
@NotBlank
(
message
=
"{user.password.not.blank}"
)
@Length
(
min
=
UserConstants
.
PASSWORD_MIN_LENGTH
,
max
=
UserConstants
.
PASSWORD_MAX_LENGTH
,
message
=
"{user.password.length.valid}"
)
//
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
private
String
password
;
private
String
password
;
/**
/**
...
...
dsk-common/src/main/java/com/dsk/common/core/domain/model/RegisterBody.java
View file @
5dd4842d
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
package
com
.
dsk
.
common
.
core
.
domain
.
model
;
import
com.dsk.common.constant.UserConstants
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
/**
/**
* 用户注册对象
* 用户注册对象
...
@@ -11,7 +15,16 @@ import lombok.EqualsAndHashCode;
...
@@ -11,7 +15,16 @@ import lombok.EqualsAndHashCode;
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
public
class
RegisterBody
extends
LoginBody
{
public
class
RegisterBody
extends
LoginBody
{
/**
* 用户密码
*/
@NotBlank
(
message
=
"{user.password.not.blank}"
)
@Length
(
min
=
UserConstants
.
PASSWORD_MIN_LENGTH
,
max
=
UserConstants
.
PASSWORD_MAX_LENGTH
,
message
=
"{user.password.length.valid}"
)
private
String
password
;
/**
* 用户类型
*/
private
String
userType
;
private
String
userType
;
}
}
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