Update Spring pom.xml

.gitattributes

@@ -0,0 +1 @@
+text=auto

apollo-configserver/pom.xml

@@ -21,22 +21,32 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-metaserver/pom.xml

@@ -25,4 +25,12 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-portal/pom.xml

@@ -21,8 +21,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -38,4 +38,12 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalApplication.java

@@ -5,6 +5,7 @@
 
 @SpringBootApplication
 public class PortalApplication {
+
   public static void main(String[] args) throws Exception {
     SpringApplication.run(PortalApplication.class, args);
   }

apollo-portal/src/main/java/com/ctrip/apollo/portal/entities/App.java → apollo-portal/src/main/java/com/ctrip/apollo/portal/domain/App.java

@@ -1,4 +1,4 @@
-package com.ctrip.apollo.portal.entities;
+package com.ctrip.apollo.portal.domain;
 
 import java.io.Serializable;
 import java.util.Date;

apollo-portal/src/main/java/com/ctrip/apollo/portal/repository/AppRepository.java → apollo-portal/src/main/java/com/ctrip/apollo/portal/domain/AppRepository.java

@@ -1,11 +1,9 @@
-package com.ctrip.apollo.portal.repository;
+package com.ctrip.apollo.portal.domain;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.CrudRepository;
 
-import com.ctrip.apollo.portal.entities.App;
-
 public interface AppRepository extends CrudRepository<App, String> {
 
   Page<App> findAll(Pageable pageable);

apollo-portal/src/main/java/com/ctrip/apollo/portal/service/AppService.java

@@ -0,0 +1,31 @@
+package com.ctrip.apollo.portal.service;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import com.ctrip.apollo.portal.domain.App;
+import com.ctrip.apollo.portal.domain.AppRepository;
+
+@Service
+public class AppService {
+
+  @Autowired
+  private AppRepository appRepository;
+
+  public App detail(String appId) {
+    return appRepository.findOne(appId);
+  }
+
+  public Page<App> list(Pageable pageable) {
+    return appRepository.findAll(pageable);
+  }
+
+  public App save(App app) {
+    app.setCreateTimestamp(new Date());
+    return appRepository.save(app);
+  }
+}

apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java → apollo-portal/src/main/java/com/ctrip/apollo/portal/web/AppController.java

@@ -1,33 +1,36 @@
-package com.ctrip.apollo.portal.controller;
-
-import java.util.Date;
+package com.ctrip.apollo.portal.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.apollo.portal.entities.App;
-import com.ctrip.apollo.portal.repository.AppRepository;
+import com.ctrip.apollo.portal.domain.App;
+import com.ctrip.apollo.portal.service.AppService;
 
 @RestController
 @RequestMapping("/apps")
 public class AppController {
 
   @Autowired
-  private AppRepository appRepository;
-
-  @RequestMapping("")
-  public Page<App> list(@PageableDefault(size = 50) Pageable pageable) {
-    return appRepository.findAll(pageable);
-  }
+  private AppService appService;
 
   @RequestMapping(value = "", method = RequestMethod.POST)
   public App create(App app) {
-    app.setCreateTimestamp(new Date());
-    return appRepository.save(app);
+    return appService.save(app);
+  }
+
+  @RequestMapping("/{appid}")
+  public App detail(@PathVariable String appId) {
+    return appService.detail(appId);
+  }
+
+  @RequestMapping("")
+  public Page<App> list(@PageableDefault(size = 50) Pageable pageable) {
+    return appService.list(pageable);
   }
 }

apollo-portal/src/main/resources/application.properties

@@ -1,4 +1,3 @@
-spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb
+spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username = sa
 spring.datasource.password = sa
-spring.datasource.driver-class-name = org.h2.Driver

apollo-portal/src/test/java/com/ctrip/apollo/portal/repository/AppRepositoryTest.java

@@ -10,7 +10,8 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.ctrip.apollo.portal.PortalApplicationTestConfiguration;
-import com.ctrip.apollo.portal.entities.App;
+import com.ctrip.apollo.portal.domain.App;
+import com.ctrip.apollo.portal.domain.AppRepository;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = PortalApplicationTestConfiguration.class)

apollo-portal/src/test/resources/application.properties

@@ -2,4 +2,3 @@ spring.datasource.url = jdbc:h2:file:~/fxapolloportaldb;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username = sa
 spring.datasource.password = sa
 
-spring.h2.console.enabled = true