Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
44a2e143
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,发现更多精彩内容 >>
提交
44a2e143
编写于
3月 24, 2016
作者:
Y
Yiming Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update default port
上级
9841c500
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
85 addition
and
33 deletion
+85
-33
apollo-adminservice/src/main/resources/application.yml
apollo-adminservice/src/main/resources/application.yml
+2
-2
apollo-adminservice/src/main/resources/bootstrap.yml
apollo-adminservice/src/main/resources/bootstrap.yml
+1
-1
apollo-biz/src/main/resources/application.properties
apollo-biz/src/main/resources/application.properties
+2
-1
apollo-configservice/pom.xml
apollo-configservice/pom.xml
+48
-14
apollo-configservice/src/main/java/com/ctrip/apollo/ServerApplication.java
...ice/src/main/java/com/ctrip/apollo/ServerApplication.java
+6
-3
apollo-configservice/src/main/resources/application.yml
apollo-configservice/src/main/resources/application.yml
+2
-2
apollo-configservice/src/main/resources/bootstrap.yml
apollo-configservice/src/main/resources/bootstrap.yml
+2
-1
apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
...src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
+16
-8
apollo-portal/src/main/resources/application.yml
apollo-portal/src/main/resources/application.yml
+6
-1
未找到文件。
apollo-adminservice/src/main/resources/application.yml
浏览文件 @
44a2e143
...
...
@@ -3,12 +3,12 @@ spring:
name
:
apollo-adminservice
server
:
port
:
${port:
23646
}
port
:
${port:
8090
}
logging
:
level
:
org.springframework.cloud
:
'
DEBUG'
file
:
/opt/logs/apollo-adminservice.log
file
:
/opt/logs/
${ctrip.appid}/
apollo-adminservice.log
ctrip
:
appid
:
100003172
apollo-adminservice/src/main/resources/bootstrap.yml
浏览文件 @
44a2e143
...
...
@@ -3,6 +3,6 @@ eureka:
hostname
:
${hostname:localhost}
client
:
serviceUrl
:
defaultZone
:
http://${eureka.instance.hostname}/eureka/
defaultZone
:
http://${eureka.instance.hostname}
:8080
/eureka/
healthcheck
:
enabled
:
true
\ No newline at end of file
apollo-biz/src/main/resources/application.properties
浏览文件 @
44a2e143
...
...
@@ -3,3 +3,4 @@ spring.datasource.username = sa
spring.datasource.password
=
spring.jpa.hibernate.naming_strategy
=
org.hibernate.cfg.EJB3NamingStrategy
spring.h2.console.enabled
=
true
spring.h2.console.settings.web-allow-others
=
true
\ No newline at end of file
apollo-configservice/pom.xml
浏览文件 @
44a2e143
...
...
@@ -18,19 +18,50 @@
</dependency>
<!-- end of apollo -->
<!-- redis -->
<dependency>
<groupId>
org.springframework.data
</groupId>
<artifactId>
spring-data-redis
</artifactId>
</dependency>
<dependency>
<groupId>
redis.clients
</groupId>
<artifactId>
jedis
</artifactId>
</dependency>
<!-- <dependency> <groupId>org.springframework.data</groupId> <artifactId>spring-data-redis</artifactId>
</dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId>
</dependency> -->
<!-- end of redis -->
<!-- eureka -->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-eureka-server
</artifactId>
<exclusions>
<exclusion>
<artifactId>
spring-cloud-starter-archaius
</artifactId>
<groupId>
org.springframework.cloud
</groupId>
</exclusion>
<exclusion>
<artifactId>
spring-cloud-starter-ribbon
</artifactId>
<groupId>
org.springframework.cloud
</groupId>
</exclusion>
<exclusion>
<artifactId>
ribbon-eureka
</artifactId>
<groupId>
com.netflix.ribbon
</groupId>
</exclusion>
<exclusion>
<artifactId>
aws-java-sdk-core
</artifactId>
<groupId>
com.amazonaws
</groupId>
</exclusion>
<exclusion>
<artifactId>
aws-java-sdk-ec2
</artifactId>
<groupId>
com.amazonaws
</groupId>
</exclusion>
<exclusion>
<artifactId>
aws-java-sdk-autoscaling
</artifactId>
<groupId>
com.amazonaws
</groupId>
</exclusion>
<exclusion>
<artifactId>
aws-java-sdk-sts
</artifactId>
<groupId>
com.amazonaws
</groupId>
</exclusion>
<exclusion>
<artifactId>
aws-java-sdk-route53
</artifactId>
<groupId>
com.amazonaws
</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
...
...
@@ -39,6 +70,9 @@
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<executable>
true
</executable>
</configuration>
</plugin>
</plugins>
</build>
...
...
apollo-configservice/src/main/java/com/ctrip/apollo/ServerApplication.java
浏览文件 @
44a2e143
...
...
@@ -7,13 +7,16 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
/**
* Spring boot application entry point
*
* @author Jason Song(song_s@ctrip.com)
*/
@SpringBootApplication
@EnableEurekaServer
@EnableEurekaClient
public
class
ServerApplication
{
public
static
void
main
(
String
[]
args
)
{
new
SpringApplicationBuilder
(
ServerApplication
.
class
).
web
(
true
).
run
(
args
);
}
}
apollo-configservice/src/main/resources/application.yml
浏览文件 @
44a2e143
...
...
@@ -3,12 +3,12 @@ spring:
name
:
apollo-configservice
server
:
port
:
${port:
2756
}
port
:
${port:
8080
}
logging
:
level
:
org.springframework.cloud
:
'
DEBUG'
file
:
/opt/logs/apollo-configservice.log
file
:
/opt/logs/
${ctrip.appid}/
apollo-configservice.log
ctrip
:
appid
:
100003171
\ No newline at end of file
apollo-configservice/src/main/resources/bootstrap.yml
浏览文件 @
44a2e143
eureka
:
instance
:
hostname
:
${hostname:localhost}
preferIpAddress
:
true
client
:
serviceUrl
:
defaultZone
:
http://${eureka.instance.hostname}/eureka/
defaultZone
:
http://${eureka.instance.hostname}
:8080
/eureka/
healthcheck
:
enabled
:
true
\ No newline at end of file
apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
浏览文件 @
44a2e143
...
...
@@ -7,21 +7,29 @@ import com.ctrip.apollo.Apollo.Env;
public
class
MetaDomainConsts
{
public
static
final
String
LOCAL
=
"http://localhost
"
;
public
static
final
String
DEFAULT_PORT
=
"8080
"
;
public
static
final
String
DEV
=
"http://ws.meta.apollo.fx.dev.nt.ctripcorp.com"
;
public
static
final
String
LOCAL
=
"http://localhost"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
FAT
=
"http://ws.meta.apollo.fx.fat.nt.ctripcorp.com"
;;
public
static
final
String
DEV
=
"http://ws.meta.apollo.fx.dev.nt.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
FWS
=
"http://ws.meta.apollo.fx.fws.nt.ctripcorp.com"
;
public
static
final
String
FAT
=
"http://ws.meta.apollo.fx.fat.nt.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
UAT
=
"http://ws.meta.apollo.fx.uat.nt.ctripcorp.com"
;
public
static
final
String
FWS
=
"http://ws.meta.apollo.fx.fws.nt.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
LPT
=
"http://ws.meta.apollo.fx.lpt.nt.ctripcorp.com"
;
public
static
final
String
UAT
=
"http://ws.meta.apollo.fx.uat.nt.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
TOOLS
=
"http://ws.meta.apollo.fx.tools.ctripcorp.com"
;
public
static
final
String
LPT
=
"http://ws.meta.apollo.fx.lpt.nt.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
PRD
=
"http://ws.meta.apollo.fx.ctripcorp.com"
;
public
static
final
String
TOOLS
=
"http://ws.meta.apollo.fx.tools.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
public
static
final
String
PRD
=
"http://ws.meta.apollo.fx.ctripcorp.com"
+
"/"
+
DEFAULT_PORT
;
private
static
Map
<
Env
,
String
>
domains
=
new
HashMap
<>();
...
...
apollo-portal/src/main/resources/application.yml
浏览文件 @
44a2e143
...
...
@@ -5,9 +5,14 @@ spring:
application
:
name
:
apollo-portal
datasource
:
url
:
jdbc:h2:
file
:~/fxapolloportaldb
url
:
jdbc:h2:
mem
:~/fxapolloportaldb
username
:
sa
password
:
sa
logging
:
level
:
org.springframework.cloud
:
'
DEBUG'
file
:
/opt/logs/${ctrip.appid}/apollo-adminservice.log
ctrip
:
appid
:
100003173
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录