Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
workflow-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
workflow-platform
Commits
91049b6a
Commit
91049b6a
authored
May 23, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分pom
parent
cb6fd32e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
workflow-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
.../java/com/mortals/xhx/base/login/web/LoginController.java
+3
-3
workflow-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java
...c/main/java/com/mortals/xhx/base/login/web/LoginForm.java
+2
-2
No files found.
workflow-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @
91049b6a
...
@@ -62,7 +62,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
...
@@ -62,7 +62,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
JSONObject
ret
=
new
JSONObject
();
JSONObject
ret
=
new
JSONObject
();
String
loginName
=
loginForm
.
getLoginName
();
String
loginName
=
loginForm
.
getLoginName
();
String
password
=
loginForm
.
getPassword
();
String
password
=
loginForm
.
getPassword
();
String
securityCode
=
loginForm
.
getSecurityCode
();
//
String securityCode = loginForm.getSecurityCode();
String
ip
=
super
.
getRequestIP
(
request
);
String
ip
=
super
.
getRequestIP
(
request
);
if
(
StringUtils
.
isEmpty
(
loginName
)
||
StringUtils
.
isEmpty
(
password
))
{
if
(
StringUtils
.
isEmpty
(
loginName
)
||
StringUtils
.
isEmpty
(
password
))
{
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
...
@@ -72,13 +72,13 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
...
@@ -72,13 +72,13 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
UserEntity
userEntity
=
null
;
UserEntity
userEntity
=
null
;
try
{
try
{
loginForm
.
validate
();
loginForm
.
validate
();
boolean
result
=
validCodeService
.
doCheckImageValidCode
(
request
.
getSession
().
getId
(),
ip
,
securityCode
);
/*
boolean result = validCodeService.doCheckImageValidCode(request.getSession().getId(), ip, securityCode);
if (!result) {
if (!result) {
recordSysLog(request, userEntity, "登录验证码不正确或已过期!");
recordSysLog(request, userEntity, "登录验证码不正确或已过期!");
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "登录验证码不正确或已过期!");
ret.put(KEY_RESULT_MSG, "登录验证码不正确或已过期!");
return ret.toJSONString();
return ret.toJSONString();
}
}
*/
userEntity
=
userService
.
doLogin
(
loginName
,
password
,
ip
);
userEntity
=
userService
.
doLogin
(
loginName
,
password
,
ip
);
userEntity
.
setLastLoginAddress
(
ip
);
userEntity
.
setLastLoginAddress
(
ip
);
saveCurrUser
(
request
,
response
,
userEntity
);
saveCurrUser
(
request
,
response
,
userEntity
);
...
...
workflow-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java
View file @
91049b6a
...
@@ -48,9 +48,9 @@ public class LoginForm extends BaseForm {
...
@@ -48,9 +48,9 @@ public class LoginForm extends BaseForm {
if
(
password
==
null
||
password
.
trim
().
length
()
==
0
)
{
if
(
password
==
null
||
password
.
trim
().
length
()
==
0
)
{
throw
new
AppException
(
"密码不能为空!"
);
throw
new
AppException
(
"密码不能为空!"
);
}
}
if
(
securityCode
==
null
||
securityCode
.
trim
().
length
()
==
0
)
{
/*
if (securityCode == null || securityCode.trim().length() == 0) {
throw new AppException("验证码不能为空!");
throw new AppException("验证码不能为空!");
}
}
*/
return
super
.
validate
();
return
super
.
validate
();
}
}
}
}
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