update

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java

@@ -109,7 +109,7 @@ public class AppControllerTest extends AbstractControllerTest {
     App app = BeanUtils.transfrom(App.class, dto);
     app = appRepository.save(app);
 
-    restTemplate.delete(getBaseAppUrl() + dto.getAppId());
+    restTemplate.delete("http://localhost:{port}/apps/{appId}?operator={operator}", port, app.getAppId(), "test");
 
     App deletedApp = appRepository.findOne(app.getId());
     Assert.assertNull(deletedApp);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalSettings.java

@@ -73,9 +73,9 @@ public class PortalSettings {
 
     healthCheckService = Executors.newScheduledThreadPool(1);
 
-//    healthCheckService
-//        .scheduleWithFixedDelay(new HealthCheckTask(applicationContext), 1000, HEALTH_CHECK_INTERVAL,
-//                                TimeUnit.MILLISECONDS);
+    healthCheckService
+        .scheduleWithFixedDelay(new HealthCheckTask(applicationContext), 1000, HEALTH_CHECK_INTERVAL,
+                                TimeUnit.MILLISECONDS);
 
   }
 

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

@@ -25,7 +25,6 @@ public class API {
   }
 
   public String getAdminServiceHost(Env env) {
-    return "http://localhost:8090";
-//    return serviceLocator.getServiceAddress(env).getHomepageUrl();
+    return serviceLocator.getServiceAddress(env).getHomepageUrl();
   }
 }

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/ConfigServiceTest.java

@@ -6,6 +6,8 @@ import com.ctrip.framework.apollo.core.dto.ItemDTO;
 import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
+import com.ctrip.framework.apollo.portal.auth.UserInfoHolder;
+import com.ctrip.framework.apollo.portal.entity.po.UserInfo;
 import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
 import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifer;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
@@ -37,6 +39,8 @@ public class ConfigServiceTest {
   private AdminServiceAPI.ItemAPI itemAPI;
   @Mock
   private PropertyResolver resolver;
+  @Mock
+  private UserInfoHolder userInfoHolder;
 
   @InjectMocks
   private PortalConfigService configService;
@@ -64,6 +68,11 @@ public class ConfigServiceTest {
 
     when(itemAPI.findItems(appId, Env.DEV, clusterName, namespaceName)).thenReturn(itemDTOs);
     when(resolver.resolve(0, model.getConfigText(), itemDTOs)).thenReturn(changeSets);
+
+    UserInfo userInfo = new UserInfo();
+    userInfo.setUsername("test");
+    when(userInfoHolder.getUser()).thenReturn(userInfo);
+
     try {
       configService.updateConfigItemByText(model);
     }catch (Exception e){
@@ -95,6 +104,10 @@ public class ConfigServiceTest {
     when(namespaceAPI.loadNamespace(appId, Env.valueOf(env), clusterName, namespaceName)).thenReturn(namespaceDTO);
     when(itemAPI.findItems(appId, Env.valueOf(env), clusterName, namespaceName)).thenReturn(null);
 
+    UserInfo userInfo = new UserInfo();
+    userInfo.setUsername("test");
+    when(userInfoHolder.getUser()).thenReturn(userInfo);
+
     List<ItemDiffs> itemDiffses = configService.compare(namespaceIdentifers, sourceItems);
 
     assertEquals(1,itemDiffses.size());
@@ -132,6 +145,10 @@ public class ConfigServiceTest {
     when(namespaceAPI.loadNamespace(appId, Env.valueOf(env), clusterName, namespaceName)).thenReturn(namespaceDTO);
     when(itemAPI.findItems(appId, Env.valueOf(env), clusterName, namespaceName)).thenReturn(targetItems);
 
+    UserInfo userInfo = new UserInfo();
+    userInfo.setUsername("test");
+    when(userInfoHolder.getUser()).thenReturn(userInfo);
+
     List<ItemDiffs> itemDiffses = configService.compare(namespaceIdentifers, sourceItems);
     assertEquals(1, itemDiffses.size());