Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
85338f8e
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
85338f8e
编写于
11月 30, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix filter precedence bug and js bug
上级
96fd956e
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
0 deletion
+9
-0
apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java
...m/ctrip/framework/apollo/common/controller/CatConfig.java
+2
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
...rk/apollo/portal/spi/configuration/AuthConfiguration.java
+4
-0
apollo-portal/src/main/resources/static/scripts/controller/IndexController.js
...in/resources/static/scripts/controller/IndexController.js
+3
-0
未找到文件。
apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java
浏览文件 @
85338f8e
...
...
@@ -5,6 +5,7 @@ import javax.servlet.DispatcherType;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.Ordered
;
import
com.dianping.cat.servlet.CatFilter
;
...
...
@@ -18,6 +19,7 @@ public class CatConfig {
bean
.
setName
(
"cat-filter"
);
bean
.
addUrlPatterns
(
"/*"
);
bean
.
setDispatcherTypes
(
DispatcherType
.
REQUEST
,
DispatcherType
.
FORWARD
);
bean
.
setOrder
(
Ordered
.
HIGHEST_PRECEDENCE
);
return
bean
;
}
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
浏览文件 @
85338f8e
...
...
@@ -65,6 +65,7 @@ public class AuthConfiguration {
FilterRegistrationBean
singleSignOutFilter
=
new
FilterRegistrationBean
();
singleSignOutFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.session.SingleSignOutFilter"
));
singleSignOutFilter
.
addUrlPatterns
(
"/*"
);
singleSignOutFilter
.
setOrder
(
1
);
return
singleSignOutFilter
;
}
...
...
@@ -83,6 +84,7 @@ public class AuthConfiguration {
casFilter
.
setInitParameters
(
filterInitParam
);
casFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAuthenticationFilter"
));
casFilter
.
addUrlPatterns
(
"/*"
);
casFilter
.
setOrder
(
2
);
return
casFilter
;
}
...
...
@@ -102,6 +104,7 @@ public class AuthConfiguration {
casValidationFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"
));
casValidationFilter
.
setInitParameters
(
filterInitParam
);
casValidationFilter
.
addUrlPatterns
(
"/*"
);
casValidationFilter
.
setOrder
(
3
);
return
casValidationFilter
;
...
...
@@ -119,6 +122,7 @@ public class AuthConfiguration {
assertionHolderFilter
.
setFilter
(
filter
(
"com.ctrip.framework.apollo.sso.filter.ApolloAssertionThreadLocalFilter"
));
assertionHolderFilter
.
addUrlPatterns
(
"/*"
);
assertionHolderFilter
.
setOrder
(
4
);
return
assertionHolderFilter
;
}
...
...
apollo-portal/src/main/resources/static/scripts/controller/IndexController.js
浏览文件 @
85338f8e
...
...
@@ -79,6 +79,9 @@ function IndexController($scope, $window, toastr, AppUtil, AppService, UserServi
});
result
.
forEach
(
function
(
favorite
)
{
var
app
=
appIdMapApp
[
favorite
.
appId
];
if
(
!
app
){
return
;
}
app
.
favoriteId
=
favorite
.
id
;
$scope
.
favorites
.
push
(
app
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录