Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
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
base_platform_enterprise
gic-platform-auth
Commits
66ac8975
Commit
66ac8975
authored
Mar 09, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/developer' into developer
parents
bf50e839
310a5dab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
LoginController.java
...ain/java/com/gic/auth/web/controller/LoginController.java
+11
-2
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java
View file @
66ac8975
...
...
@@ -153,7 +153,8 @@ public class LoginController {
}
@RequestMapping
(
"login"
)
public
RestResponse
login
(
String
nationCode
,
String
phoneNumber
,
Integer
enterpriseId
,
String
password
)
{
public
RestResponse
login
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
nationCode
,
String
phoneNumber
,
Integer
enterpriseId
,
String
password
,
String
appId
)
{
if
(
StringUtils
.
isBlank
(
password
)
||
StringUtils
.
isBlank
(
phoneNumber
)
||
enterpriseId
==
null
)
{
return
EnterpriseRestResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
);
}
...
...
@@ -212,7 +213,15 @@ public class LoginController {
//塞缓存
UserDetailUtils
.
setUserDetail
(
userDetail
);
logger
.
info
(
"登录所花时间:{}"
,
System
.
currentTimeMillis
()
-
startTime
);
return
RestResponse
.
success
(
userDetail
);
if
(
StringUtils
.
isNotBlank
(
appId
)){
try
{
response
.
sendRedirect
(
"https://four.gicdev.com/application-auth-center/auth/custom?authToken="
+
appId
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
else
{
return
RestResponse
.
success
(
userDetail
);
}
}
}
}
...
...
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