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
9d9b811e
Commit
9d9b811e
authored
Aug 30, 2019
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登陆接口
parent
131a0920
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
Main.java
...latform-auth-web/src/main/java/com/gic/auth/web/Main.java
+2
-1
LoginController.java
...ain/java/com/gic/auth/web/controller/LoginController.java
+5
-0
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/Main.java
View file @
9d9b811e
...
...
@@ -27,7 +27,8 @@ import org.springframework.context.annotation.ImportResource;
"classpath*:dubbo-setting.xml"
,
"classpath*:dubbo-gic-platform-auth-web.xml"
,
"classpath*:spring-interceptor.xml"
,
"classpath*:redis-init.xml"
"classpath*:redis-init.xml"
,
"classpath:web-common-spring.xml"
})
public
class
Main
{
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java
View file @
9d9b811e
...
...
@@ -4,12 +4,15 @@ import com.gic.api.base.commons.ServiceResponse;
import
com.gic.auth.dto.UserDTO
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.commons.util.Md5Util
;
import
com.gic.commons.util.ToolUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.dto.EnterpriseDTO
;
import
com.gic.enterprise.error.ErrorCode
;
import
com.gic.enterprise.response.EnterpriseRestResponse
;
import
com.gic.enterprise.service.EnterpriseApiService
;
import
com.gic.enterprise.utils.UserDetail
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.redis.data.util.RedisUtil
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.log4j.LogManager
;
...
...
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
@RestController
public
class
LoginController
{
...
...
@@ -84,6 +88,7 @@ public class LoginController {
if
(
enterpriseDTO
!=
null
){
userDetail
.
setEnterpriseId
(
enterpriseDTO
.
getEnterpriseId
());
userDetail
.
setEnterpriseInfo
(
enterpriseDTO
);
UserDetailUtils
.
setUserDetail
(
userDetail
);
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