diff --git a/apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java b/apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java new file mode 100644 index 0000000000000000000000000000000000000000..1936ebc4048e133141aecb5c032d98de1c4638bb --- /dev/null +++ b/apollo-common/src/main/java/com/ctrip/apollo/common/controller/ApolloInfoController.java @@ -0,0 +1,37 @@ +package com.ctrip.apollo.common.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ctrip.apollo.Apollo; +import com.ctrip.framework.foundation.Foundation; + +@RestController +@RequestMapping(path = "/apollo") +public class ApolloInfoController { + + @RequestMapping("app") + public String getApp() { + return Foundation.app().toString(); + } + + @RequestMapping("web") + public String getEnv() { + return Foundation.web().toString(); + } + + @RequestMapping("net") + public String getNet() { + return Foundation.net().toString(); + } + + @RequestMapping("server") + public String getServer() { + return Foundation.server().toString(); + } + + @RequestMapping("version") + public String getVersion() { + return Apollo.VERSION; + } +} diff --git a/apollo-core/src/main/java/com/ctrip/apollo/Apollo.java b/apollo-core/src/main/java/com/ctrip/apollo/Apollo.java index 484e6d5675770f0658b689514232a988be80ed7a..c6b58a5535172ff0088d0ce3c1512fc67a898730 100644 --- a/apollo-core/src/main/java/com/ctrip/apollo/Apollo.java +++ b/apollo-core/src/main/java/com/ctrip/apollo/Apollo.java @@ -4,5 +4,6 @@ package com.ctrip.apollo; * @author Jason Song(song_s@ctrip.com) */ public class Apollo { - public final static String VERSION = "java-0.0.1-SNAPSHOT"; + public final static String VERSION = + "java-" + Apollo.class.getPackage().getImplementationVersion(); } diff --git a/pom.xml b/pom.xml index dc650674dcea927b6fbcc9260ee7d7af1083f3fd..7d208303a3b37a7d802f5b68d74eb3e04d85fbe6 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,6 @@ 9.2.15.v20160210 github ${env.GITHUB_OAUTH_TOKEN} - @@ -250,7 +249,7 @@ com.ctrip.apollo apollo-buildtools - 0.0.1-SNAPSHOT + ${project.version} @@ -283,6 +282,11 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + @@ -294,6 +298,22 @@ org.codehaus.mojo findbugs-maven-plugin + + org.apache.maven.plugins + maven-release-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + +