Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
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
吴迪
gs1-office-web-sit
Commits
191c6eb7
Commit
191c6eb7
authored
Dec 07, 2021
by
rongkailun
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
35625195
38d44c0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
AppLoginController.java
.../io/office/modules/app/controller/AppLoginController.java
+1
-1
OAuth2Filter.java
src/main/java/io/office/modules/sys/oauth2/OAuth2Filter.java
+8
-8
No files found.
src/main/java/io/office/modules/app/controller/AppLoginController.java
View file @
191c6eb7
...
...
@@ -57,7 +57,7 @@ public class AppLoginController {
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"token"
,
token
);
map
.
put
(
"expire"
,
jwtUtils
.
getExpire
());
//测试 git提交
return
R
.
ok
(
map
);
}
...
...
src/main/java/io/office/modules/sys/oauth2/OAuth2Filter.java
View file @
191c6eb7
/**
* Copyright (c) 2016-2019 人人开源 All rights reserved.
*
*
<p>
* https://www.renren.io
*
*
<p>
* 版权所有,侵权必究!
*/
...
...
@@ -36,7 +36,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
//获取请求token
String
token
=
getRequestToken
((
HttpServletRequest
)
request
);
if
(
StringUtils
.
isBlank
(
token
))
{
if
(
StringUtils
.
isBlank
(
token
))
{
return
null
;
}
...
...
@@ -45,11 +45,11 @@ public class OAuth2Filter extends AuthenticatingFilter {
@Override
protected
boolean
isAccessAllowed
(
ServletRequest
request
,
ServletResponse
response
,
Object
mappedValue
)
{
if
(((
HttpServletRequest
)
request
).
getMethod
().
equals
(
RequestMethod
.
OPTIONS
.
name
()))
{
if
(((
HttpServletRequest
)
request
).
getMethod
().
equals
(
RequestMethod
.
OPTIONS
.
name
()))
{
return
true
;
}
if
(((
HttpServletRequest
)
request
).
getRequestURI
().
indexOf
(
"uploadFileResource"
)>-
1
||
((
HttpServletRequest
)
request
).
getRequestURI
().
indexOf
(
"ueditorConfig"
)>
-
1
)
{
if
(((
HttpServletRequest
)
request
).
getRequestURI
().
indexOf
(
"uploadFileResource"
)
>
-
1
||
((
HttpServletRequest
)
request
).
getRequestURI
().
indexOf
(
"ueditorConfig"
)
>
-
1
||
((
HttpServletRequest
)
request
).
getRequestURI
().
indexOf
(
"uploadFile"
)
>
-
1
)
{
return
true
;
}
...
...
@@ -60,7 +60,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
protected
boolean
onAccessDenied
(
ServletRequest
request
,
ServletResponse
response
)
throws
Exception
{
//获取请求token,如果token不存在,直接返回401
String
token
=
getRequestToken
((
HttpServletRequest
)
request
);
if
(
StringUtils
.
isBlank
(
token
))
{
if
(
StringUtils
.
isBlank
(
token
))
{
HttpServletResponse
httpResponse
=
(
HttpServletResponse
)
response
;
httpResponse
.
setHeader
(
"Access-Control-Allow-Credentials"
,
"true"
);
httpResponse
.
setHeader
(
"Access-Control-Allow-Origin"
,
HttpContextUtils
.
getOrigin
());
...
...
@@ -98,12 +98,12 @@ public class OAuth2Filter extends AuthenticatingFilter {
/**
* 获取请求的token
*/
private
String
getRequestToken
(
HttpServletRequest
httpRequest
){
private
String
getRequestToken
(
HttpServletRequest
httpRequest
)
{
//从header中获取token
String
token
=
httpRequest
.
getHeader
(
"token"
);
//如果header中不存在token,则从参数中获取token
if
(
StringUtils
.
isBlank
(
token
))
{
if
(
StringUtils
.
isBlank
(
token
))
{
token
=
httpRequest
.
getParameter
(
"token"
);
}
...
...
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