Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
f144fe06
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,发现更多精彩内容 >>
提交
f144fe06
编写于
12月 06, 2016
作者:
J
Jason Song
提交者:
GitHub
12月 06, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #474 from lepdou/configuration
add default configuration profile
上级
9f1740e0
c38e7c6a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
52 addition
and
21 deletion
+52
-21
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
...rk/apollo/portal/spi/configuration/AuthConfiguration.java
+7
-14
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthFilterConfiguration.java
...llo/portal/spi/configuration/AuthFilterConfiguration.java
+26
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java
...k/apollo/portal/spi/configuration/EmailConfiguration.java
+19
-7
未找到文件。
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
浏览文件 @
f144fe06
...
...
@@ -56,7 +56,8 @@ public class AuthConfiguration {
@Bean
public
ServletListenerRegistrationBean
singleSignOutHttpSessionListener
()
{
ServletListenerRegistrationBean
singleSignOutHttpSessionListener
=
new
ServletListenerRegistrationBean
();
singleSignOutHttpSessionListener
.
setListener
(
listener
(
"org.jasig.cas.client.session.SingleSignOutHttpSessionListener"
));
singleSignOutHttpSessionListener
.
setListener
(
listener
(
"org.jasig.cas.client.session.SingleSignOutHttpSessionListener"
));
return
singleSignOutHttpSessionListener
;
}
...
...
@@ -101,7 +102,8 @@ public class AuthConfiguration {
filterInitParam
.
put
(
"useRedis"
,
"true"
);
filterInitParam
.
put
(
"redisClusterName"
,
"casClientPrincipal"
);
casValidationFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"
));
casValidationFilter
.
setFilter
(
filter
(
"org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter"
));
casValidationFilter
.
setInitParameters
(
filterInitParam
);
casValidationFilter
.
addUrlPatterns
(
"/*"
);
casValidationFilter
.
setOrder
(
3
);
...
...
@@ -171,23 +173,14 @@ public class AuthConfiguration {
}
}
/**
*
默认实现
*
spring.profiles.active != ctrip
*/
@Configuration
@Profile
({
"!ctrip"
})
static
class
DefaultAuthAutoConfiguration
{
@Bean
public
FilterRegistrationBean
openApiAuthenticationFilter
(
ConsumerAuthUtil
consumerAuthUtil
,
ConsumerAuditUtil
consumerAuditUtil
)
{
FilterRegistrationBean
openApiFilter
=
new
FilterRegistrationBean
();
openApiFilter
.
setFilter
(
new
ConsumerAuthenticationFilter
(
consumerAuthUtil
,
consumerAuditUtil
));
openApiFilter
.
addUrlPatterns
(
"/openapi/*"
);
return
openApiFilter
;
}
@Bean
@ConditionalOnMissingBean
(
SsoHeartbeatHandler
.
class
)
public
SsoHeartbeatHandler
defaultSsoHeartbeatHandler
()
{
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthFilterConfiguration.java
0 → 100644
浏览文件 @
f144fe06
package
com.ctrip.framework.apollo.portal.spi.configuration
;
import
com.ctrip.framework.apollo.openapi.filter.ConsumerAuthenticationFilter
;
import
com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil
;
import
com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil
;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
@Configuration
public
class
AuthFilterConfiguration
{
@Bean
public
FilterRegistrationBean
openApiAuthenticationFilter
(
ConsumerAuthUtil
consumerAuthUtil
,
ConsumerAuditUtil
consumerAuditUtil
)
{
FilterRegistrationBean
openApiFilter
=
new
FilterRegistrationBean
();
openApiFilter
.
setFilter
(
new
ConsumerAuthenticationFilter
(
consumerAuthUtil
,
consumerAuditUtil
));
openApiFilter
.
addUrlPatterns
(
"/openapi/*"
);
return
openApiFilter
;
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java
浏览文件 @
f144fe06
...
...
@@ -14,9 +14,12 @@ import org.springframework.context.annotation.Profile;
@Configuration
public
class
EmailConfiguration
{
/**
* spring.profiles.active = ctrip
*/
@Configuration
@Profile
(
"ctrip"
)
public
static
class
CtripEmailConfiguration
{
public
static
class
CtripEmailConfiguration
{
@Bean
public
EmailService
ctripEmailService
()
{
...
...
@@ -24,16 +27,25 @@ public class EmailConfiguration {
}
@Bean
public
CtripEmailRequestBuilder
emailRequestBuilder
(){
public
CtripEmailRequestBuilder
emailRequestBuilder
()
{
return
new
CtripEmailRequestBuilder
();
}
}
/**
* spring.profiles.active != ctrip
*/
@Configuration
@Profile
({
"!ctrip"
})
public
static
class
DefaultEmailConfiguration
{
@Bean
@ConditionalOnMissingBean
(
EmailService
.
class
)
public
EmailService
defaultEmailService
()
{
return
new
DefaultEmailService
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录