Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
e27c193b
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
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,发现更多精彩内容 >>
提交
e27c193b
编写于
9月 07, 2021
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
未登录或权限不足返回修改
上级
6cd9bc76
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
115 addition
and
36 deletion
+115
-36
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionUnauthorized.java
.../x/base/core/project/exception/ExceptionUnauthorized.java
+10
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherJaxrsFilter.java
...java/com/x/base/core/project/jaxrs/CipherJaxrsFilter.java
+26
-7
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherManagerJaxrsFilter.java
...m/x/base/core/project/jaxrs/CipherManagerJaxrsFilter.java
+26
-7
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherManagerUserJaxrsFilter.java
...base/core/project/jaxrs/CipherManagerUserJaxrsFilter.java
+13
-7
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/ManagerUserJaxrsFilter.java
...com/x/base/core/project/jaxrs/ManagerUserJaxrsFilter.java
+14
-8
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/UserJaxrsFilter.java
...n/java/com/x/base/core/project/jaxrs/UserJaxrsFilter.java
+26
-7
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionUnauthorized.java
0 → 100644
浏览文件 @
e27c193b
package
com.x.base.core.project.exception
;
public
class
ExceptionUnauthorized
extends
LanguagePromptException
{
private
static
final
long
serialVersionUID
=
8121998765154409958L
;
public
ExceptionUnauthorized
()
{
super
(
"会话已过期或未登录."
);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherJaxrsFilter.java
浏览文件 @
e27c193b
...
...
@@ -11,10 +11,10 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.
http.EffectivePerson
;
import
com.x.base.core.project.
http.FilterTools
;
import
com.x.base.core.project.http.
HttpToken
;
import
com.x.base.core.project.http.TokenType
;
import
com.x.base.core.project.
exception.ExceptionAccessDenied
;
import
com.x.base.core.project.
exception.ExceptionUnauthorized
;
import
com.x.base.core.project.http.
*
;
import
org.apache.commons.lang3.StringUtils
;
/**
* 必须由前台已经登陆的用户访问
...
...
@@ -30,11 +30,30 @@ public abstract class CipherJaxrsFilter extends TokenFilter {
if
(!
request
.
getMethod
().
equalsIgnoreCase
(
"options"
))
{
HttpToken
httpToken
=
new
HttpToken
();
EffectivePerson
effectivePerson
=
httpToken
.
who
(
request
,
response
,
Config
.
token
().
getCipher
());
if
(!
TokenType
.
cipher
.
equals
(
effectivePerson
.
getTokenType
()))
{
if
(
TokenType
.
anonymous
.
equals
(
effectivePerson
.
getTokenType
()))
{
/** 401 Unauthorized 未登录访问被拒绝 */
response
.
setStatus
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
ActionResult
result
=
new
ActionResult
();
ExceptionUnauthorized
e
=
new
ExceptionUnauthorized
();
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
if
(!
TokenType
.
cipher
.
equals
(
effectivePerson
.
getTokenType
()))
{
/** 需要自己标志500 */
response
.
setStatus
(
500
);
response
.
setStatus
(
HttpServletResponse
.
SC_INTERNAL_SERVER_ERROR
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
response
.
getWriter
().
write
(
FilterTools
.
Application_Not_Cipher_Json
);
ActionResult
result
=
new
ActionResult
();
ExceptionAccessDenied
e
=
new
ExceptionAccessDenied
(
effectivePerson
);
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
{
chain
.
doFilter
(
request
,
response
);
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherManagerJaxrsFilter.java
浏览文件 @
e27c193b
...
...
@@ -11,10 +11,10 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.
http.EffectivePerson
;
import
com.x.base.core.project.
http.FilterTools
;
import
com.x.base.core.project.http.
HttpToken
;
import
com.x.base.core.project.http.TokenType
;
import
com.x.base.core.project.
exception.ExceptionAccessDenied
;
import
com.x.base.core.project.
exception.ExceptionUnauthorized
;
import
com.x.base.core.project.http.
*
;
import
org.apache.commons.lang3.StringUtils
;
/**
* 必须由前台已经登陆的用户访问
...
...
@@ -30,12 +30,31 @@ public abstract class CipherManagerJaxrsFilter extends TokenFilter {
if
(!
request
.
getMethod
().
equalsIgnoreCase
(
"options"
))
{
HttpToken
httpToken
=
new
HttpToken
();
EffectivePerson
effectivePerson
=
httpToken
.
who
(
request
,
response
,
Config
.
token
().
getCipher
());
if
((!
TokenType
.
cipher
.
equals
(
effectivePerson
.
getTokenType
()))
if
(
TokenType
.
anonymous
.
equals
(
effectivePerson
.
getTokenType
()))
{
/** 401 Unauthorized 未登录访问被拒绝 */
response
.
setStatus
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
ActionResult
result
=
new
ActionResult
();
ExceptionUnauthorized
e
=
new
ExceptionUnauthorized
();
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
if
((!
TokenType
.
cipher
.
equals
(
effectivePerson
.
getTokenType
()))
&&
(!
TokenType
.
manager
.
equals
(
effectivePerson
.
getTokenType
())))
{
/** 需要自己标志500 */
response
.
setStatus
(
500
);
response
.
setStatus
(
HttpServletResponse
.
SC_INTERNAL_SERVER_ERROR
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
response
.
getWriter
().
write
(
FilterTools
.
Application_Not_CipherManager_Json
);
ActionResult
result
=
new
ActionResult
();
ExceptionAccessDenied
e
=
new
ExceptionAccessDenied
(
effectivePerson
);
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
{
chain
.
doFilter
(
request
,
response
);
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/CipherManagerUserJaxrsFilter.java
浏览文件 @
e27c193b
...
...
@@ -11,10 +11,9 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.FilterTools
;
import
com.x.base.core.project.http.HttpToken
;
import
com.x.base.core.project.http.TokenType
;
import
com.x.base.core.project.exception.ExceptionUnauthorized
;
import
com.x.base.core.project.http.*
;
import
org.apache.commons.lang3.StringUtils
;
/**
* 必须由前台已经登陆的用户访问
...
...
@@ -31,10 +30,17 @@ public abstract class CipherManagerUserJaxrsFilter extends TokenFilter {
HttpToken
httpToken
=
new
HttpToken
();
EffectivePerson
effectivePerson
=
httpToken
.
who
(
request
,
response
,
Config
.
token
().
getCipher
());
if
(
TokenType
.
anonymous
.
equals
(
effectivePerson
.
getTokenType
()))
{
/**
需要自己标志500
*/
response
.
setStatus
(
500
);
/**
401 Unauthorized 未登录访问被拒绝
*/
response
.
setStatus
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
response
.
getWriter
().
write
(
FilterTools
.
Application_Not_CipherManagerUser_Json
);
ActionResult
result
=
new
ActionResult
();
ExceptionUnauthorized
e
=
new
ExceptionUnauthorized
();
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
{
chain
.
doFilter
(
request
,
response
);
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/ManagerUserJaxrsFilter.java
浏览文件 @
e27c193b
...
...
@@ -11,10 +11,9 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.FilterTools
;
import
com.x.base.core.project.http.HttpToken
;
import
com.x.base.core.project.http.TokenType
;
import
com.x.base.core.project.exception.ExceptionUnauthorized
;
import
com.x.base.core.project.http.*
;
import
org.apache.commons.lang3.StringUtils
;
/**
* 必须由前台已经登陆的用户访问
...
...
@@ -31,11 +30,18 @@ public abstract class ManagerUserJaxrsFilter extends TokenFilter {
HttpToken
httpToken
=
new
HttpToken
();
EffectivePerson
effectivePerson
=
httpToken
.
who
(
request
,
response
,
Config
.
token
().
getCipher
());
if
(
TokenType
.
anonymous
.
equals
(
effectivePerson
.
getTokenType
()))
{
/**
需要自己标志500
*/
response
.
setStatus
(
500
);
/**
401 Unauthorized 未登录访问被拒绝
*/
response
.
setStatus
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
response
.
getWriter
().
write
(
FilterTools
.
Application_Not_ManagerUser_Json
);
}
else
{
ActionResult
result
=
new
ActionResult
();
ExceptionUnauthorized
e
=
new
ExceptionUnauthorized
();
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
{
chain
.
doFilter
(
request
,
response
);
}
}
else
{
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/UserJaxrsFilter.java
浏览文件 @
e27c193b
...
...
@@ -11,10 +11,10 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.
http.EffectivePerson
;
import
com.x.base.core.project.
http.FilterTools
;
import
com.x.base.core.project.http.
HttpToken
;
import
com.x.base.core.project.http.TokenType
;
import
com.x.base.core.project.
exception.ExceptionAccessDenied
;
import
com.x.base.core.project.
exception.ExceptionUnauthorized
;
import
com.x.base.core.project.http.
*
;
import
org.apache.commons.lang3.StringUtils
;
/**
* 必须由前台已经登陆的用户访问
...
...
@@ -30,11 +30,30 @@ public abstract class UserJaxrsFilter extends TokenFilter {
if
(!
request
.
getMethod
().
equalsIgnoreCase
(
"options"
))
{
HttpToken
httpToken
=
new
HttpToken
();
EffectivePerson
effectivePerson
=
httpToken
.
who
(
request
,
response
,
Config
.
token
().
getCipher
());
if
(!
TokenType
.
user
.
equals
(
effectivePerson
.
getTokenType
()))
{
if
(
TokenType
.
anonymous
.
equals
(
effectivePerson
.
getTokenType
()))
{
/** 401 Unauthorized 未登录访问被拒绝 */
response
.
setStatus
(
HttpServletResponse
.
SC_UNAUTHORIZED
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
ActionResult
result
=
new
ActionResult
();
ExceptionUnauthorized
e
=
new
ExceptionUnauthorized
();
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
if
(!
TokenType
.
user
.
equals
(
effectivePerson
.
getTokenType
()))
{
/** 需要自己标志500 */
response
.
setStatus
(
500
);
response
.
setStatus
(
HttpServletResponse
.
SC_INTERNAL_SERVER_ERROR
);
response
.
setHeader
(
"Content-Type"
,
"application/json;charset=UTF-8"
);
response
.
getWriter
().
write
(
FilterTools
.
Application_Not_User_Json
);
ActionResult
result
=
new
ActionResult
();
ExceptionAccessDenied
e
=
new
ExceptionAccessDenied
(
effectivePerson
);
result
.
error
(
e
);
String
message
=
e
.
getFormatMessage
(
result
.
getPrompt
(),
request
.
getHeader
(
ResponseFactory
.
Accept_Language
));
if
(
StringUtils
.
isNotBlank
(
message
))
{
result
.
setMessage
(
message
);
}
response
.
getWriter
().
write
(
result
.
toJson
());
}
else
{
chain
.
doFilter
(
request
,
response
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录