Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
apollo
提交
af089bd8
apollo
项目概览
zhangjian1949
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
af089bd8
编写于
6月 24, 2016
作者:
张
张乐
提交者:
GitHub
6月 24, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #291 from nobodyiam/support-system-property-as-server-config
support system property as server config
上级
99a2cf04
eda9fd7d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
20 deletion
+8
-20
apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
...om/ctrip/framework/apollo/assembly/ApolloApplication.java
+0
-11
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java
.../com/ctrip/framework/apollo/portal/PortalApplication.java
+0
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalSettings.java
...ava/com/ctrip/framework/apollo/portal/PortalSettings.java
+0
-1
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServerConfigService.java
.../framework/apollo/portal/service/ServerConfigService.java
+8
-0
apollo-portal/src/main/resources/portal.properties
apollo-portal/src/main/resources/portal.properties
+0
-7
未找到文件。
apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
浏览文件 @
af089bd8
...
...
@@ -48,17 +48,6 @@ public class ApolloApplication {
.
sources
(
RefreshScope
.
class
).
run
(
args
);
logger
.
info
(
adminContext
.
getId
()
+
" isActive: "
+
adminContext
.
isActive
());
}
/**
* Portal
*
* WARNING: Do not start portal at the same pool as configservice, they will conflict on 8080
*/
if
(
commonContext
.
getEnvironment
().
containsProperty
(
"portal"
))
{
ConfigurableApplicationContext
portalContext
=
new
SpringApplicationBuilder
(
PortalApplication
.
class
).
parent
(
commonContext
).
run
(
args
);
logger
.
info
(
portalContext
.
getId
()
+
" isActive: "
+
portalContext
.
isActive
());
}
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java
浏览文件 @
af089bd8
...
...
@@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@EnableAutoConfiguration
@EnableTransactionManagement
@PropertySource
(
value
=
{
"classpath:portal.properties"
})
@ComponentScan
(
basePackageClasses
=
{
ApolloCommonConfig
.
class
,
PortalApplication
.
class
})
public
class
PortalApplication
{
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalSettings.java
浏览文件 @
af089bd8
...
...
@@ -35,7 +35,6 @@ public class PortalSettings {
private
static
final
int
HEALTH_CHECK_INTERVAL
=
5000
;
@Value
(
"#{'${apollo.portal.envs}'.split(',')}"
)
private
List
<
String
>
allStrEnvs
;
@Autowired
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ServerConfigService.java
浏览文件 @
af089bd8
...
...
@@ -4,6 +4,7 @@ import com.ctrip.framework.apollo.portal.entity.po.ServerConfig;
import
com.ctrip.framework.apollo.portal.repository.ServerConfigRepository
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.core.env.Environment
;
import
org.springframework.stereotype.Service
;
/**
...
...
@@ -14,7 +15,14 @@ public class ServerConfigService {
@Autowired
private
ServerConfigRepository
serverConfigRepository
;
@Autowired
private
Environment
environment
;
public
String
getValue
(
String
key
)
{
if
(
environment
.
containsProperty
(
key
))
{
return
environment
.
getProperty
(
key
);
}
ServerConfig
serverConfig
=
serverConfigRepository
.
findByKey
(
key
);
return
serverConfig
==
null
?
null
:
serverConfig
.
getValue
();
...
...
apollo-portal/src/main/resources/portal.properties
已删除
100644 → 0
浏览文件 @
99a2cf04
spring.application.name
=
apollo-portal
apollo.portal.envs
=
fat,uat,pro
ctrip.appid
=
100003173
server.port
=
8070
logging.file
=
/opt/logs/100003173/apollo-portal.log
server.context_parameters.appid
=
${ctrip.appid}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录