Inject authed RestTemplate into Portal

apollo-biz/pom.xml

@@ -26,10 +26,5 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

apollo-configservice/pom.xml

@@ -67,6 +67,11 @@
 			</exclusions>
 		</dependency>
 		<!-- end of eureka -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

-package com.ctrip.apollo.portal;
+package com.ctrip.apollo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;

apollo-portal/src/main/java/com/ctrip/apollo/portal/api/API.java

 package com.ctrip.apollo.portal.api;
 
-import com.ctrip.apollo.core.enums.Env;
-import com.ctrip.apollo.core.exception.ServiceException;
-import com.ctrip.apollo.portal.service.ServiceLocator;
+import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.client.RestTemplate;
 
+import com.ctrip.apollo.common.auth.RestTemplateFactory;
+import com.ctrip.apollo.core.enums.Env;
+import com.ctrip.apollo.core.exception.ServiceException;
+import com.ctrip.apollo.portal.service.ServiceLocator;
+
 public class API {
 
   @Autowired
   protected ServiceLocator serviceLocator;
 
   @Autowired
+  private RestTemplateFactory restTemplateFactory;
+
   protected RestTemplate restTemplate;
 
+  @PostConstruct
+  private void postConstruct() {
+    restTemplate = restTemplateFactory.getObject();
+  }
+
   public String getAdminServiceHost(Env env) {
     // 本地测试用
     // return "http://localhost:8090";
@@ -25,5 +35,5 @@ public class API {
     }
     return "";
   }
-  
+
 }

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

@@ -15,4 +15,4 @@ ctrip:
   
 apollo:
   portal:
-    env: dev
+    env: local

apollo-portal/src/test/java/com/ctrip/apollo/portal/AbstractPortalTest.java

@@ -4,6 +4,8 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.ctrip.apollo.PortalApplication;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = PortalApplication.class)
 public abstract class AbstractPortalTest {