Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
dbe8e3c1
Commit
dbe8e3c1
authored
Jan 09, 2024
by
唐峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
跳过 stms校验
parent
74b0fd2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
14 deletions
+23
-14
StmsInnerInterceptor.java
.../java/cn/quantgroup/xyqb/filter/StmsInnerInterceptor.java
+15
-6
XyqbSessionContextHolder.java
.../cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java
+8
-8
No files found.
src/main/java/cn/quantgroup/xyqb/filter/StmsInnerInterceptor.java
View file @
dbe8e3c1
...
@@ -37,7 +37,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
...
@@ -37,7 +37,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
@Override
@Override
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
throws
Exception
{
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
throws
Exception
{
//所有开放出去的外部接口,都需要验证租户id和注册来源
//所有开放出去的外部接口,都需要验证租户id和注册来源
/*
String tenantId = request.getHeader(Constants.X_AUTH_TENANT);
String
tenantId
=
request
.
getHeader
(
Constants
.
X_AUTH_TENANT
);
String
registeredFrom
=
request
.
getHeader
(
Constants
.
X_AUTH_FROM
);
String
registeredFrom
=
request
.
getHeader
(
Constants
.
X_AUTH_FROM
);
...
@@ -51,13 +51,22 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
...
@@ -51,13 +51,22 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
throw
new
BizException
(
BizExceptionEnum
.
UN_EXIT_TENANT_ID
);
throw
new
BizException
(
BizExceptionEnum
.
UN_EXIT_TENANT_ID
);
}
}
if (StringUtils.isEmpty(stmsToken)) {
/*
if (StringUtils.isEmpty(stmsToken)) {
throw new BizException(BizExceptionEnum.UN_EXIT_STMS_TOKEN);
throw new BizException(BizExceptionEnum.UN_EXIT_STMS_TOKEN);
}
}
*/
SessionStruct
sessionStruct
=
XyqbSessionContextHolder
.
getXSessionFromRedis
(
stmsToken
,
Integer
.
valueOf
(
tenantId
),
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isEmpty
(
registeredFrom
)
?
null
:
Long
.
valueOf
(
registeredFrom
));
SessionStruct
sessionStruct
=
XyqbSessionContextHolder
.
getXSessionFromRedis
(
stmsToken
,
Integer
.
valueOf
(
tenantId
),
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isEmpty
(
registeredFrom
)
?
null
:
Long
.
valueOf
(
registeredFrom
));
log
.
info
(
"从redis获取sessionStruct结果:{}"
,
JSONObject
.
toJSONString
(
sessionStruct
));
log
.
info
(
"从redis获取sessionStruct结果:{}"
,
JSONObject
.
toJSONString
(
sessionStruct
));
if
(
sessionStruct
==
null
)
{
if
(
sessionStruct
==
null
)
{
sessionStruct
=
XyqbSessionContextHolder
.
initSTMSSession
(
stmsToken
,
null
,
null
);
sessionService
.
persistSession
(
sessionStruct
.
getSid
(),
sessionStruct
.
getValues
(),
sessionStruct
.
getTenantId
());
}
else
{
//session续期
sessionService
.
persistSession
(
sessionStruct
.
getSid
(),
sessionStruct
.
getValues
(),
sessionStruct
.
getTenantId
());
log
.
info
(
"sessionStruct续期完成:{}"
,
JSONObject
.
toJSONString
(
sessionStruct
));
}
/*if (sessionStruct == null) {
OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken);
OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken);
if (oauthResult != null && 2000 == oauthResult.getCode()) {
if (oauthResult != null && 2000 == oauthResult.getCode()) {
LinkedHashMap<String, Object> linkedHashMap = (LinkedHashMap<String, Object>) oauthResult.getData();
LinkedHashMap<String, Object> linkedHashMap = (LinkedHashMap<String, Object>) oauthResult.getData();
...
@@ -74,12 +83,12 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
...
@@ -74,12 +83,12 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
//session续期
//session续期
sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(), sessionStruct.getTenantId());
sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(), sessionStruct.getTenantId());
log.info("sessionStruct续期完成:{}",JSONObject.toJSONString(sessionStruct));
log.info("sessionStruct续期完成:{}",JSONObject.toJSONString(sessionStruct));
}
}
*/
//校验接口权限
//校验接口权限
//smts 租户概念不明确,暂且先统一为560761
//smts 租户概念不明确,暂且先统一为560761
String tenantIdTmp = "560761";
//
String tenantIdTmp = "560761";
OauthResult permissionResult = stmsRemoteService.checkPermission(stmsToken,
/*
OauthResult permissionResult = stmsRemoteService.checkPermission(stmsToken,
request.getRequestURI(), tenantIdTmp);
request.getRequestURI(), tenantIdTmp);
if (permissionResult != null && 2000 == permissionResult.getCode()) {
if (permissionResult != null && 2000 == permissionResult.getCode()) {
return true;
return true;
...
...
src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java
View file @
dbe8e3c1
...
@@ -87,7 +87,7 @@ public class XyqbSessionContextHolder {
...
@@ -87,7 +87,7 @@ public class XyqbSessionContextHolder {
return
sessionStruct
;
return
sessionStruct
;
}
}
public
static
SessionStruct
initSTMSSession
(
String
token
,
String
userId
,
String
userName
)
{
public
static
SessionStruct
initSTMSSession
(
String
token
1
,
String
userId1
,
String
userName1
)
{
SessionStruct
sessionStruct
=
threadSession
.
get
();
SessionStruct
sessionStruct
=
threadSession
.
get
();
if
(
sessionStruct
==
null
)
{
if
(
sessionStruct
==
null
)
{
...
@@ -106,20 +106,20 @@ public class XyqbSessionContextHolder {
...
@@ -106,20 +106,20 @@ public class XyqbSessionContextHolder {
sessionStruct
.
setIp
(
ip
);
sessionStruct
.
setIp
(
ip
);
sessionStruct
.
setScDeviceId
(
request
.
getHeader
(
"scDeviceId"
));
sessionStruct
.
setScDeviceId
(
request
.
getHeader
(
"scDeviceId"
));
sessionStruct
.
setTerminal
(
request
.
getHeader
(
"terminal"
));
sessionStruct
.
setTerminal
(
request
.
getHeader
(
"terminal"
));
sessionStruct
.
setSid
(
token
);
//
sessionStruct.setSid(token);
sessionStruct
.
setStmsUserId
(
userId
);
//
sessionStruct.setStmsUserId(userId);
sessionStruct
.
setStmsUserName
(
userName
);
//
sessionStruct.setStmsUserName(userName);
threadSession
.
set
(
sessionStruct
);
threadSession
.
set
(
sessionStruct
);
}
else
{
}
else
{
sessionStruct
.
setStmsUserId
(
userId
);
//
sessionStruct.setStmsUserId(userId);
sessionStruct
.
setStmsUserName
(
userName
);
//
sessionStruct.setStmsUserName(userName);
}
}
SessionValue
sessionValue
=
sessionStruct
.
getValues
();
SessionValue
sessionValue
=
sessionStruct
.
getValues
();
if
(
sessionValue
==
null
)
{
if
(
sessionValue
==
null
)
{
sessionValue
=
new
SessionValue
();
sessionValue
=
new
SessionValue
();
LoginProperties
loginProperties
=
new
LoginProperties
();
LoginProperties
loginProperties
=
new
LoginProperties
();
loginProperties
.
setStmsUserId
(
userId
);
//
loginProperties.setStmsUserId(userId);
loginProperties
.
setStmsUserName
(
userName
);
//
loginProperties.setStmsUserName(userName);
sessionValue
.
setLoginProperties
(
loginProperties
);
sessionValue
.
setLoginProperties
(
loginProperties
);
}
}
sessionStruct
.
setValues
(
sessionValue
);
sessionStruct
.
setValues
(
sessionValue
);
...
...
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