Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
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
openSource
apollo
Commits
85338f8e
Commit
85338f8e
authored
Nov 30, 2016
by
Jason Song
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix filter precedence bug and js bug
parent
96fd956e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
CatConfig.java
...m/ctrip/framework/apollo/common/controller/CatConfig.java
+2
-0
AuthConfiguration.java
...rk/apollo/portal/spi/configuration/AuthConfiguration.java
+4
-0
IndexController.js
...in/resources/static/scripts/controller/IndexController.js
+3
-0
No files found.
apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java
View file @
85338f8e
...
@@ -5,6 +5,7 @@ import javax.servlet.DispatcherType;
...
@@ -5,6 +5,7 @@ import javax.servlet.DispatcherType;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.Ordered
;
import
com.dianping.cat.servlet.CatFilter
;
import
com.dianping.cat.servlet.CatFilter
;
...
@@ -18,6 +19,7 @@ public class CatConfig {
...
@@ -18,6 +19,7 @@ public class CatConfig {
bean
.
setName
(
"cat-filter"
);
bean
.
setName
(
"cat-filter"
);
bean
.
addUrlPatterns
(
"/*"
);
bean
.
addUrlPatterns
(
"/*"
);
bean
.
setDispatcherTypes
(
DispatcherType
.
REQUEST
,
DispatcherType
.
FORWARD
);
bean
.
setDispatcherTypes
(
DispatcherType
.
REQUEST
,
DispatcherType
.
FORWARD
);
bean
.
setOrder
(
Ordered
.
HIGHEST_PRECEDENCE
);
return
bean
;
return
bean
;
}
}
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
View file @
85338f8e
...
@@ -65,6 +65,7 @@ public class AuthConfiguration {
...
@@ -65,6 +65,7 @@ public class AuthConfiguration {
FilterRegistrationBean
singleSignOutFilter
=
new
FilterRegistrationBean
();
FilterRegistrationBean
singleSignOutFilter
=
new
FilterRegistrationBean
();
singleSignOutFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.session.SingleSignOutFilter"
));
singleSignOutFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.session.SingleSignOutFilter"
));
singleSignOutFilter
.
addUrlPatterns
(
"/*"
);
singleSignOutFilter
.
addUrlPatterns
(
"/*"
);
singleSignOutFilter
.
setOrder
(
1
);
return
singleSignOutFilter
;
return
singleSignOutFilter
;
}
}
...
@@ -83,6 +84,7 @@ public class AuthConfiguration {
...
@@ -83,6 +84,7 @@ public class AuthConfiguration {
casFilter
.
setInitParameters
(
filterInitParam
);
casFilter
.
setInitParameters
(
filterInitParam
);
casFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAuthenticationFilter"
));
casFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAuthenticationFilter"
));
casFilter
.
addUrlPatterns
(
"/*"
);
casFilter
.
addUrlPatterns
(
"/*"
);
casFilter
.
setOrder
(
2
);
return
casFilter
;
return
casFilter
;
}
}
...
@@ -102,6 +104,7 @@ public class AuthConfiguration {
...
@@ -102,6 +104,7 @@ public class AuthConfiguration {
casValidationFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"
));
casValidationFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"
));
casValidationFilter
.
setInitParameters
(
filterInitParam
);
casValidationFilter
.
setInitParameters
(
filterInitParam
);
casValidationFilter
.
addUrlPatterns
(
"/*"
);
casValidationFilter
.
addUrlPatterns
(
"/*"
);
casValidationFilter
.
setOrder
(
3
);
return
casValidationFilter
;
return
casValidationFilter
;
...
@@ -119,6 +122,7 @@ public class AuthConfiguration {
...
@@ -119,6 +122,7 @@ public class AuthConfiguration {
assertionHolderFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAssertionThreadLocalFilter"
));
assertionHolderFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAssertionThreadLocalFilter"
));
assertionHolderFilter
.
addUrlPatterns
(
"/*"
);
assertionHolderFilter
.
addUrlPatterns
(
"/*"
);
assertionHolderFilter
.
setOrder
(
4
);
return
assertionHolderFilter
;
return
assertionHolderFilter
;
}
}
...
...
apollo-portal/src/main/resources/static/scripts/controller/IndexController.js
View file @
85338f8e
...
@@ -79,6 +79,9 @@ function IndexController($scope, $window, toastr, AppUtil, AppService, UserServi
...
@@ -79,6 +79,9 @@ function IndexController($scope, $window, toastr, AppUtil, AppService, UserServi
});
});
result
.
forEach
(
function
(
favorite
)
{
result
.
forEach
(
function
(
favorite
)
{
var
app
=
appIdMapApp
[
favorite
.
appId
];
var
app
=
appIdMapApp
[
favorite
.
appId
];
if
(
!
app
){
return
;
}
app
.
favoriteId
=
favorite
.
id
;
app
.
favoriteId
=
favorite
.
id
;
$scope
.
favorites
.
push
(
app
);
$scope
.
favorites
.
push
(
app
);
});
});
...
...
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