Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
bcbddd69
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bcbddd69
编写于
9月 07, 2020
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature/java11' into 'develop'
token expire See merge request o2oa/o2oa!1561
上级
8aa0cc9b
795add76
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
33 addition
and
35 deletion
+33
-35
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java
...src/main/java/com/x/base/core/project/http/HttpToken.java
+33
-35
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java
浏览文件 @
bcbddd69
package
com.x.base.core.project.http
;
import
java.net.URLDecoder
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Date
;
import
java.util.Enumeration
;
import
java.util.Objects
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
...
...
@@ -41,13 +41,14 @@ public class HttpToken {
effectivePerson
.
setRemoteAddress
(
this
.
remoteAddress
(
request
));
effectivePerson
.
setUserAgent
(
this
.
userAgent
(
request
));
effectivePerson
.
setUri
(
request
.
getRequestURI
());
/
* 加入调试标记 */
/
/ 加入调试标记
Object
debugger
=
request
.
getHeader
(
HttpToken
.
X_Debugger
);
if
(
null
!=
debugger
&&
BooleanUtils
.
toBoolean
(
Objects
.
toString
(
debugger
)))
{
effectivePerson
.
setDebugger
(
true
);
}
else
{
effectivePerson
.
setDebugger
(
false
);
}
effectivePerson
.
setDebugger
((
null
!=
debugger
)
&&
BooleanUtils
.
toBoolean
(
Objects
.
toString
(
debugger
)));
// if (null != debugger && BooleanUtils.toBoolean(Objects.toString(debugger))) {
// effectivePerson.setDebugger(true);
// } else {
// effectivePerson.setDebugger(false);
// }
setAttribute
(
request
,
effectivePerson
);
setToken
(
request
,
response
,
effectivePerson
);
return
effectivePerson
;
...
...
@@ -69,7 +70,7 @@ public class HttpToken {
Pattern
pattern
=
Pattern
.
compile
(
RegularExpression_Token
,
Pattern
.
CASE_INSENSITIVE
);
Matcher
matcher
=
pattern
.
matcher
(
plain
);
if
(!
matcher
.
find
())
{
/
* 不报错,跳过错误,将用户设置为anonymous */
/
/ 不报错,跳过错误,将用户设置为anonymous
logger
.
warn
(
"token format error:{}."
,
plain
);
return
EffectivePerson
.
anonymous
();
}
...
...
@@ -79,21 +80,18 @@ public class HttpToken {
diff
=
Math
.
abs
(
diff
);
if
(
TokenType
.
user
.
equals
(
tokenType
)
||
TokenType
.
manager
.
equals
(
tokenType
))
{
if
(
diff
>
(
60000L
*
Config
.
person
().
getTokenExpiredMinutes
()))
{
//
throw new Exception("token expired." + token);
/* 不报错,跳过错误,将用户设置为anonymous */
logger
.
warn
(
"token expired:{}."
,
plain
);
//
不报错,跳过错误,将用户设置为anonymous
logger
.
warn
(
"token expired, user:{}, token:{}."
,
URLDecoder
.
decode
(
matcher
.
group
(
3
),
StandardCharsets
.
UTF_8
.
name
())
,
plain
);
return
EffectivePerson
.
anonymous
();
}
}
if
(
TokenType
.
cipher
.
equals
(
tokenType
))
{
if
(
diff
>
(
60000
*
20
))
{
/* 不报错,跳过错误,将用户设置为anonymous */
if
(
TokenType
.
cipher
.
equals
(
tokenType
)
&&
(
diff
>
(
60000
*
20
)))
{
// 不报错,跳过错误,将用户设置为anonymous
return
EffectivePerson
.
anonymous
();
}
}
EffectivePerson
effectivePerson
=
new
EffectivePerson
(
URLDecoder
.
decode
(
matcher
.
group
(
3
),
"utf-8"
),
tokenType
,
key
);
return
effectivePerson
;
return
new
EffectivePerson
(
URLDecoder
.
decode
(
matcher
.
group
(
3
),
StandardCharsets
.
UTF_8
.
name
()),
tokenType
,
key
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
...
...
@@ -138,8 +136,8 @@ public class HttpToken {
}
}
public
void
setResponseToken
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
tokenName
,
String
token
)
throws
Exception
{
public
void
setResponseToken
(
HttpServletRequest
request
,
HttpServletResponse
response
,
String
tokenName
,
String
token
)
throws
Exception
{
if
(!
StringUtils
.
isEmpty
(
token
))
{
String
cookie
=
tokenName
+
"="
+
token
+
"; path=/; domain="
+
this
.
domain
(
request
);
response
.
setHeader
(
"Set-Cookie"
,
cookie
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录