Skip to content

A
apollo
Commit 44a2e143 by Yiming Liu
Options

Update default port

parent 9841c500
Showing with 90 additions and 34 deletions
apollo-adminservice/src/main/resources/application.yml
...@@ -3,12 +3,12 @@ spring: ...@@ -3,12 +3,12 @@ spring:
name: apollo-adminservice name: apollo-adminservice
server: server:
port: ${port:23646} port: ${port:8090}
logging: logging:
level: level:
org.springframework.cloud: 'DEBUG' org.springframework.cloud: 'DEBUG'
file: /opt/logs/apollo-adminservice.log file: /opt/logs/${ctrip.appid}/apollo-adminservice.log
ctrip: ctrip:
appid: 100003172 appid: 100003172
apollo-adminservice/src/main/resources/bootstrap.yml
...@@ -3,6 +3,6 @@ eureka: ...@@ -3,6 +3,6 @@ eureka:
hostname: ${hostname:localhost} hostname: ${hostname:localhost}
client: client:
serviceUrl: serviceUrl:
defaultZone: http://${eureka.instance.hostname}/eureka/ defaultZone: http://${eureka.instance.hostname}:8080/eureka/
healthcheck: healthcheck:
enabled: true enabled: true
\ No newline at end of file
apollo-biz/src/main/resources/application.properties
...@@ -2,4 +2,5 @@ spring.datasource.url = jdbc:h2:mem:~/fxapolloconfigdb;mode=mysql ...@@ -2,4 +2,5 @@ spring.datasource.url = jdbc:h2:mem:~/fxapolloconfigdb;mode=mysql
spring.datasource.username = sa spring.datasource.username = sa
spring.datasource.password = spring.datasource.password =
spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
spring.h2.console.enabled = true spring.h2.console.enabled = true
\ No newline at end of file spring.h2.console.settings.web-allow-others=true
\ No newline at end of file
apollo-configservice/pom.xml
...@@ -11,34 +11,68 @@ ...@@ -11,34 +11,68 @@
<artifactId>apollo-configservice</artifactId> <artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name> <name>Apollo ConfigService</name>
<dependencies> <dependencies>
<!-- apollo --> <!-- apollo -->
<dependency> <dependency>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
<artifactId>apollo-biz</artifactId> <artifactId>apollo-biz</artifactId>
</dependency> </dependency>
<!-- end of apollo --> <!-- end of apollo -->
<!-- redis --> <!-- redis -->
<dependency> <!-- <dependency> <groupId>org.springframework.data</groupId> <artifactId>spring-data-redis</artifactId>
<groupId>org.springframework.data</groupId> </dependency> <dependency> <groupId>redis.clients</groupId> <artifactId>jedis</artifactId>
<artifactId>spring-data-redis</artifactId> </dependency> -->
</dependency> <!-- end of redis -->
<dependency> <!-- eureka -->
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<!-- end of redis -->
<!-- eureka -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId> <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> </dependency>
<!-- end of eureka --> <!-- end of eureka -->
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
apollo-configservice/src/main/java/com/ctrip/apollo/ServerApplication.java
...@@ -7,13 +7,16 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; ...@@ -7,13 +7,16 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
/** /**
* Spring boot application entry point * Spring boot application entry point
*
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
*/ */
@SpringBootApplication @SpringBootApplication
@EnableEurekaServer @EnableEurekaServer
@EnableEurekaClient @EnableEurekaClient
public class ServerApplication { public class ServerApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(ServerApplication.class).web(true).run(args); public static void main(String[] args) {
} new SpringApplicationBuilder(ServerApplication.class).web(true).run(args);
}
} }
apollo-configservice/src/main/resources/application.yml
...@@ -3,12 +3,12 @@ spring: ...@@ -3,12 +3,12 @@ spring:
name: apollo-configservice name: apollo-configservice
server: server:
port: ${port:2756} port: ${port:8080}
logging: logging:
level: level:
org.springframework.cloud: 'DEBUG' org.springframework.cloud: 'DEBUG'
file: /opt/logs/apollo-configservice.log file: /opt/logs/${ctrip.appid}/apollo-configservice.log
ctrip: ctrip:
appid: 100003171 appid: 100003171
\ No newline at end of file
apollo-configservice/src/main/resources/bootstrap.yml
eureka: eureka:
instance: instance:
hostname: ${hostname:localhost} hostname: ${hostname:localhost}
preferIpAddress: true
client: client:
serviceUrl: serviceUrl:
defaultZone: http://${eureka.instance.hostname}/eureka/ defaultZone: http://${eureka.instance.hostname}:8080/eureka/
healthcheck: healthcheck:
enabled: true enabled: true
\ No newline at end of file
apollo-core/src/main/java/com/ctrip/apollo/core/MetaDomainConsts.java
...@@ -7,21 +7,29 @@ import com.ctrip.apollo.Apollo.Env; ...@@ -7,21 +7,29 @@ import com.ctrip.apollo.Apollo.Env;
public class MetaDomainConsts { 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<>(); private static Map<Env, String> domains = new HashMap<>();
......
apollo-portal/src/main/resources/application.yml
...@@ -5,9 +5,14 @@ spring: ...@@ -5,9 +5,14 @@ spring:
application: application:
name: apollo-portal name: apollo-portal
datasource: datasource:
url: jdbc:h2:file:~/fxapolloportaldb url: jdbc:h2:mem:~/fxapolloportaldb
username: sa username: sa
password: sa password: sa
logging:
level:
org.springframework.cloud: 'DEBUG'
file: /opt/logs/${ctrip.appid}/apollo-adminservice.log
ctrip: ctrip:
appid: 100003173 appid: 100003173
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment