Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
8227851e
apollo
项目概览
wrr-cat
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
未验证
提交
8227851e
编写于
9月 27, 2018
作者:
J
Jason Song
提交者:
GitHub
9月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1509 from nobodyiam/misc-change
misc change
上级
0d322768
7a0591f9
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
8 addition
and
26 deletion
+8
-26
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java
...ramework/apollo/adminservice/AdminServiceApplication.java
+2
-8
apollo-adminservice/src/main/resources/logback.xml
apollo-adminservice/src/main/resources/logback.xml
+1
-0
apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
...om/ctrip/framework/apollo/assembly/ApolloApplication.java
+0
-2
apollo-assembly/src/test/java/com/ctrip/framework/apollo/assembly/LocalApolloApplication.java
...rip/framework/apollo/assembly/LocalApolloApplication.java
+0
-2
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java
...mework/apollo/configservice/ConfigServiceApplication.java
+2
-8
apollo-configservice/src/main/resources/logback.xml
apollo-configservice/src/main/resources/logback.xml
+1
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java
.../com/ctrip/framework/apollo/portal/PortalApplication.java
+1
-6
apollo-portal/src/main/resources/logback.xml
apollo-portal/src/main/resources/logback.xml
+1
-0
未找到文件。
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java
浏览文件 @
8227851e
...
...
@@ -3,12 +3,9 @@ package com.ctrip.framework.apollo.adminservice;
import
com.ctrip.framework.apollo.biz.ApolloBizConfig
;
import
com.ctrip.framework.apollo.common.ApolloCommonConfig
;
import
org.springframework.boot.actuate.system.ApplicationPidFileWriter
;
import
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.EnableAspectJAutoProxy
;
...
...
@@ -25,9 +22,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
AdminServiceApplication
.
class
})
public
class
AdminServiceApplication
{
public
static
void
main
(
String
[]
args
)
{
ConfigurableApplicationContext
context
=
new
SpringApplicationBuilder
(
AdminServiceApplication
.
class
).
run
(
args
);
context
.
addApplicationListener
(
new
ApplicationPidFileWriter
());
context
.
addApplicationListener
(
new
EmbeddedServerPortFileWriter
());
SpringApplication
.
run
(
AdminServiceApplication
.
class
,
args
);
}
}
apollo-adminservice/src/main/resources/logback.xml
浏览文件 @
8227851e
...
...
@@ -3,6 +3,7 @@
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-adminservice.log}"
/>
<property
name=
"LOG_PATH"
value=
"${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<include
resource=
"org/springframework/boot/logging/logback/console-appender.xml"
/>
<root
level=
"INFO"
>
...
...
apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
浏览文件 @
8227851e
...
...
@@ -6,7 +6,6 @@ import com.ctrip.framework.apollo.portal.PortalApplication;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.boot.actuate.system.ApplicationPidFileWriter
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
;
...
...
@@ -26,7 +25,6 @@ public class ApolloApplication {
*/
ConfigurableApplicationContext
commonContext
=
new
SpringApplicationBuilder
(
ApolloApplication
.
class
).
web
(
false
).
run
(
args
);
commonContext
.
addApplicationListener
(
new
ApplicationPidFileWriter
());
logger
.
info
(
commonContext
.
getId
()
+
" isActive: "
+
commonContext
.
isActive
());
/**
...
...
apollo-assembly/src/test/java/com/ctrip/framework/apollo/assembly/LocalApolloApplication.java
浏览文件 @
8227851e
...
...
@@ -6,7 +6,6 @@ import com.ctrip.framework.apollo.portal.PortalApplication;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.boot.actuate.system.ApplicationPidFileWriter
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
;
...
...
@@ -26,7 +25,6 @@ public class LocalApolloApplication {
*/
ConfigurableApplicationContext
commonContext
=
new
SpringApplicationBuilder
(
ApolloApplication
.
class
).
web
(
false
).
run
(
args
);
commonContext
.
addApplicationListener
(
new
ApplicationPidFileWriter
());
logger
.
info
(
commonContext
.
getId
()
+
" isActive: "
+
commonContext
.
isActive
());
/**
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java
浏览文件 @
8227851e
...
...
@@ -4,12 +4,9 @@ import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import
com.ctrip.framework.apollo.common.ApolloCommonConfig
;
import
com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig
;
import
org.springframework.boot.actuate.system.ApplicationPidFileWriter
;
import
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.server.EnableEurekaServer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.EnableAspectJAutoProxy
;
...
...
@@ -35,10 +32,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
public
class
ConfigServiceApplication
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
ConfigurableApplicationContext
context
=
new
SpringApplicationBuilder
(
ConfigServiceApplication
.
class
).
run
(
args
);
context
.
addApplicationListener
(
new
ApplicationPidFileWriter
());
context
.
addApplicationListener
(
new
EmbeddedServerPortFileWriter
());
SpringApplication
.
run
(
ConfigServiceApplication
.
class
,
args
);
}
}
apollo-configservice/src/main/resources/logback.xml
浏览文件 @
8227851e
...
...
@@ -3,6 +3,7 @@
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-configservice.log}"
/>
<property
name=
"LOG_PATH"
value=
"${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<include
resource=
"org/springframework/boot/logging/logback/console-appender.xml"
/>
<root
level=
"INFO"
>
...
...
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java
浏览文件 @
8227851e
...
...
@@ -4,10 +4,7 @@ import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import
com.ctrip.framework.apollo.openapi.PortalOpenApiConfig
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.actuate.system.ApplicationPidFileWriter
;
import
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.EnableAspectJAutoProxy
;
...
...
@@ -22,8 +19,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
public
class
PortalApplication
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
ConfigurableApplicationContext
context
=
SpringApplication
.
run
(
PortalApplication
.
class
,
args
);
context
.
addApplicationListener
(
new
ApplicationPidFileWriter
());
context
.
addApplicationListener
(
new
EmbeddedServerPortFileWriter
());
SpringApplication
.
run
(
PortalApplication
.
class
,
args
);
}
}
apollo-portal/src/main/resources/logback.xml
浏览文件 @
8227851e
...
...
@@ -3,6 +3,7 @@
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-portal.log}"
/>
<property
name=
"LOG_PATH"
value=
"${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<include
resource=
"org/springframework/boot/logging/logback/console-appender.xml"
/>
<root
level=
"INFO"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录