Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
de92194f
Commit
de92194f
authored
Jul 15, 2022
by
guojx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log
parent
31fc52a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
2 deletions
+26
-2
LoginController.java
...com/gic/haoban/manage/web/controller/LoginController.java
+2
-2
WebLoginVO.java
...rc/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java
+24
-0
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java
View file @
de92194f
...
...
@@ -319,7 +319,7 @@ public class LoginController extends WebBaseController {
private
String
doLogin
(
String
wxEnterpriseId
,
String
gicEnterpriseId
,
String
loginPhoneNumber
,
String
loginChannel
,
HttpServletResponse
response
,
String
operationUserId
,
String
userName
)
{
//运维单点登录信息:operationUserId userName : 运维realName
logger
.
info
(
"doLogin={},{}
"
,
gicEnterpriseId
,
loginPhoneNumber
);
logger
.
info
(
"doLogin={},{}
,{},{}"
,
gicEnterpriseId
,
loginPhoneNumber
,
operationUserId
,
userName
);
WxApplicationDTO
application
=
wxApplicationApiService
.
selectByWxEnterpriseIdAndApplicationType
(
wxEnterpriseId
,
2
);
if
(
null
==
application
)
{
logger
.
info
(
"登录企业应用 没授权!gicEnterpriseId:{}"
,
gicEnterpriseId
);
...
...
@@ -567,7 +567,7 @@ public class LoginController extends WebBaseController {
@RequestMapping
(
"/gic-login-check"
)
@IgnoreLogin
public
ModelAndView
gicLogin
(
String
code
,
String
hbEnt
,
String
hbPage
,
String
operationUserId
,
String
userName
)
{
logger
.
info
(
"gic登录clerkId={},hbEnt={}
"
,
code
,
hbEnt
);
logger
.
info
(
"gic登录clerkId={},hbEnt={}
,operationUserId={},userName={}"
,
code
,
hbEnt
,
operationUserId
,
userName
);
PowerClerkDTO
clerkDTO
=
this
.
userService
.
haobanLoginBack
(
code
);
if
(
clerkDTO
==
null
)
{
logger
.
info
(
"从gic后台登录,传入clerkId={}无效"
,
code
);
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java
View file @
de92194f
...
...
@@ -22,6 +22,12 @@ public class WebLoginVO implements Serializable {
private
String
gicHost
;
private
String
staffId
;
/**
* 运维登录相关信息。新版运维登录、运维登录GIC再登录好办
*/
private
String
operationUserId
;
private
String
operationUserName
;
public
String
getStaffId
()
{
return
staffId
;
}
...
...
@@ -125,4 +131,22 @@ public class WebLoginVO implements Serializable {
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getOperationUserId
()
{
return
operationUserId
;
}
public
WebLoginVO
setOperationUserId
(
String
operationUserId
)
{
this
.
operationUserId
=
operationUserId
;
return
this
;
}
public
String
getOperationUserName
()
{
return
operationUserName
;
}
public
WebLoginVO
setOperationUserName
(
String
operationUserName
)
{
this
.
operationUserName
=
operationUserName
;
return
this
;
}
}
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