Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
52d39129
Commit
52d39129
authored
Jan 15, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_0115' into dev
parents
154393b5
a8ff4d9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
AppPermissionService.java
...aoqi/security/admin/rpc/service/AppPermissionService.java
+6
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @
52d39129
...
@@ -258,6 +258,9 @@ public class AppPermissionService {
...
@@ -258,6 +258,9 @@ public class AppPermissionService {
if
(
StringUtils
.
isBlank
(
username
)
||
StringUtils
.
isBlank
(
password
)
||
StringUtils
.
isBlank
(
mobilecode
))
{
if
(
StringUtils
.
isBlank
(
username
)
||
StringUtils
.
isBlank
(
password
)
||
StringUtils
.
isBlank
(
mobilecode
))
{
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
NULL_CODE
,
"参数为空"
);
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
NULL_CODE
,
"参数为空"
);
}
}
if
(
StringUtils
.
isNotBlank
(
username
)){
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"服务升级中,暂不支持注册"
);
}
if
(
StringUtils
.
isNotBlank
(
code
)){
if
(
StringUtils
.
isNotBlank
(
code
)){
//判断处理活动关键字
//判断处理活动关键字
String
[]
codes
=
code
.
split
(
"_"
);
String
[]
codes
=
code
.
split
(
"_"
);
...
@@ -1050,6 +1053,9 @@ public class AppPermissionService {
...
@@ -1050,6 +1053,9 @@ public class AppPermissionService {
if
(
StringUtils
.
isBlank
(
username
)
||
StringUtils
.
isBlank
(
password
))
{
if
(
StringUtils
.
isBlank
(
username
)
||
StringUtils
.
isBlank
(
password
))
{
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
NULL_CODE
,
"参数为空"
);
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
NULL_CODE
,
"参数为空"
);
}
}
if
(
StringUtils
.
isNotBlank
(
username
)){
return
JsonResultUtil
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"服务升级中,暂不支持注册"
);
}
// 是否已存在
// 是否已存在
AppUserLogin
user
=
appUserLoginBiz
.
checkeUserLogin
(
username
);
AppUserLogin
user
=
appUserLoginBiz
.
checkeUserLogin
(
username
);
if
(
null
!=
user
)
{
if
(
null
!=
user
)
{
...
...
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