Merge pull request #259 from lepdou/0613_17

apollo-adminservice/src/main/resources/logback.xml

@@ -7,4 +7,4 @@
 	<root level="INFO">
 		<appender-ref ref="FILE" />
 	</root>
-</configuration>
\ No newline at end of file
+</configuration>

apollo-assembly/src/main/resources/logback.xml

@@ -7,4 +7,4 @@
 	<root level="INFO">
 		<appender-ref ref="FILE" />
 	</root>
-</configuration>
\ No newline at end of file
+</configuration>

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/BizLoggingCustomizer.java

+package com.ctrip.framework.apollo.biz.customize;
+
+import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
+import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Component
+@Profile("ctrip")
+public class BizLoggingCustomizer extends LoggingCustomizer{
+
+  private static final String CLOGGING_SERVER_URL_KEY = "clogging.server.url";
+  private static final String CLOGGING_SERVER_PORT_KEY = "clogging.server.port";
+
+  @Autowired
+  private ServerConfigRepository serverConfigRepository;
+
+  private String cloggingUrl;
+  private String cloggingPort;
+
+  @Override
+  protected String cloggingUrl() {
+    if (cloggingUrl == null){
+      cloggingUrl = serverConfigRepository.findByKey(CLOGGING_SERVER_URL_KEY).getValue();
+    }
+    return cloggingUrl;
+  }
+
+  @Override
+  protected String cloggingPort() {
+    if (cloggingPort == null){
+      cloggingPort = serverConfigRepository.findByKey(CLOGGING_SERVER_PORT_KEY).getValue();
+    }
+    return cloggingPort;
+  }
+}

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/package-info.java

+/**
+ * 携程内部的日志系统,第三方公司可删除
+ */
+package com.ctrip.framework.apollo.biz.customize;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/LoggingCustomizer.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/LoggingCustomizer.java

-package com.ctrip.framework.apollo.biz.customize;
+package com.ctrip.framework.apollo.common.customize;
 
 import com.google.common.base.Strings;
 
-import com.ctrip.framework.apollo.biz.entity.ServerConfig;
-import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository;
 import com.ctrip.framework.foundation.Foundation;
 import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
-import java.util.Objects;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.Appender;
 
 /**
+ * clogging config.only used in ctrip
  * @author Jason Song(song_s@ctrip.com)
  */
-@Component
-public class LoggingCustomizer implements InitializingBean {
+public abstract class LoggingCustomizer implements InitializingBean {
   private static final Logger logger = LoggerFactory.getLogger(LoggingCustomizer.class);
   private static final String cLoggingAppenderClass =
       "com.ctrip.framework.clogging.agent.appender.CLoggingAppender";
   private static boolean cLoggingAppenderPresent =
       ClassUtils.isPresent(cLoggingAppenderClass, LoggingCustomizer.class.getClassLoader());
 
-  private static final String CLOGGING_SERVER_URL_KEY = "clogging.server.url";
-  private static final String CLOGGING_SERVER_PORT_KEY = "clogging.server.port";
-
-  @Autowired
-  private ServerConfigRepository serverConfigRepository;
-
   @Override
   public void afterPropertiesSet() {
     if (!cLoggingAppenderPresent) {
@@ -59,13 +48,6 @@ public class LoggingCustomizer implements InitializingBean {
       return;
     }
 
-    ServerConfig cloggingUrl = serverConfigRepository.findByKey(CLOGGING_SERVER_URL_KEY);
-    ServerConfig cloggingPort = serverConfigRepository.findByKey(CLOGGING_SERVER_PORT_KEY);
-
-    if (Objects.isNull(cloggingUrl) || Objects.isNull(cloggingPort)) {
-      logger.warn("CLogging config is not set!");
-      return;
-    }
 
     LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
     Class clazz = Class.forName(cLoggingAppenderClass);
@@ -73,9 +55,9 @@ public class LoggingCustomizer implements InitializingBean {
 
     ReflectionUtils.findMethod(clazz, "setAppId", String.class).invoke(cLoggingAppender, appId);
     ReflectionUtils.findMethod(clazz, "setServerIp", String.class)
-        .invoke(cLoggingAppender, cloggingUrl.getValue());
+        .invoke(cLoggingAppender, cloggingUrl());
     ReflectionUtils.findMethod(clazz, "setServerPort", int.class)
-        .invoke(cLoggingAppender, Integer.parseInt(cloggingPort.getValue()));
+        .invoke(cLoggingAppender, Integer.parseInt(cloggingPort()));
 
     cLoggingAppender.setName("CentralLogging");
     cLoggingAppender.setContext(loggerContext);
@@ -87,4 +69,17 @@ public class LoggingCustomizer implements InitializingBean {
 
   }
 
+  /**
+   * clogging server url
+   * @return
+   */
+  protected abstract String cloggingUrl();
+
+  /**
+   * clogging server port
+   * @return
+   */
+  protected abstract String cloggingPort();
+
+
 }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/TomcatContainerCustomizer.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/TomcatContainerCustomizer.java

-package com.ctrip.framework.apollo.biz.customize;
+package com.ctrip.framework.apollo.common.customize;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.coyote.ProtocolHandler;

apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/package-info.java

+/**
+ * 携程内部的日志系统,第三方公司可删除
+ */
+package com.ctrip.framework.apollo.common.customize;

apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/package-info.java

+/**
+ * 携程内部的dal,第三方公司可替换实现
+ */
+package com.ctrip.framework.apollo.common.datasource;

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

@@ -95,12 +95,12 @@ public class AdminServiceAPI {
   @Service
   public static class ItemAPI extends API {
 
-    public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespace) {
+    public List<ItemDTO> findItems(String appId, Env env, String clusterName, String namespaceName) {
       ItemDTO[] itemDTOs =
           restTemplate
               .getForObject("{host}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
                             ItemDTO[].class,
-                            getAdminServiceHost(env), appId, clusterName, namespace);
+                            getAdminServiceHost(env), appId, clusterName, namespaceName);
       return Arrays.asList(itemDTOs);
     }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/cumsomize/BizLoggingCustomizer.java

+package com.ctrip.framework.apollo.portal.cumsomize;
+
+import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
+import com.ctrip.framework.apollo.portal.repository.ServerConfigRepository;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Component
+@Profile("ctrip")
+public class BizLoggingCustomizer extends LoggingCustomizer{
+
+  private static final String CLOGGING_SERVER_URL_KEY = "clogging.server.url";
+  private static final String CLOGGING_SERVER_PORT_KEY = "clogging.server.port";
+
+  @Autowired
+  private ServerConfigRepository serverConfigRepository;
+
+  private String cloggingUrl;
+  private String cloggingPort;
+
+  @Override
+  protected String cloggingUrl() {
+    if (cloggingUrl == null){
+      cloggingUrl = serverConfigRepository.findByKey(CLOGGING_SERVER_URL_KEY).getValue();
+    }
+    return cloggingUrl;
+  }
+
+  @Override
+  protected String cloggingPort() {
+    if (cloggingPort == null){
+      cloggingPort = serverConfigRepository.findByKey(CLOGGING_SERVER_PORT_KEY).getValue();
+    }
+    return cloggingPort;
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/cumsomize/package-info.java

+/**
+ * 携程内部的日志系统,第三方公司可删除
+ */
+package com.ctrip.framework.apollo.portal.cumsomize;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java

@@ -168,13 +168,14 @@ public class PortalConfigService {
                           namespace.getClusterName(), namespace.getNamespaceName());
 
     long namespaceId = getNamespaceId(namespace);
+
     if (CollectionUtils.isEmpty(targetItems)) {//all source items is added
       int lineNum = 1;
       for (ItemDTO sourceItem : sourceItems) {
         changeSets.addCreateItem(buildItem(namespaceId, lineNum++, sourceItem));
       }
     } else {
-      Map<String, ItemDTO> keyMapItem = BeanUtils.mapByKey("key", targetItems);
+      Map<String, ItemDTO> targetItemMap = BeanUtils.mapByKey("key", targetItems);
       String key, sourceValue, sourceComment;
       ItemDTO targetItem = null;
       int maxLineNum = targetItems.size();//append to last
@@ -182,7 +183,7 @@ public class PortalConfigService {
         key = sourceItem.getKey();
         sourceValue = sourceItem.getValue();
         sourceComment = sourceItem.getComment();
-        targetItem = keyMapItem.get(key);
+        targetItem = targetItemMap.get(key);
 
         if (targetItem == null) {//added items
 
@@ -196,6 +197,16 @@ public class PortalConfigService {
       }
     }
 
+    //parse deleted items
+    List<ItemDTO> deletedItems = new LinkedList<>();
+    Map<String, ItemDTO> sourceItemMap = BeanUtils.mapByKey("key", sourceItems);
+    for (ItemDTO targetItem: targetItems){
+      if (sourceItemMap.get(targetItem.getKey()) == null){
+        deletedItems.add(targetItem);
+      }
+    }
+    changeSets.setDeleteItems(deletedItems);
+
     return changeSets;
   }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalNamespaceService.java

@@ -2,6 +2,7 @@ package com.ctrip.framework.apollo.portal.service;
 
 import com.google.gson.Gson;
 
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.utils.ExceptionUtils;
 import com.ctrip.framework.apollo.core.dto.AppNamespaceDTO;
 import com.ctrip.framework.apollo.core.dto.ItemDTO;
@@ -139,17 +140,48 @@ public class PortalNamespaceService {
 
       itemVos.add(itemVO);
     }
+
+    //deleted items
+    List<NamespaceVO.ItemVO> deletedItems = countDeletedItemNum(items, releaseItems);
+    itemVos.addAll(deletedItems);
+    modifiedItemCnt += deletedItems.size();
+
     namespaceVO.setItemModifiedCnt(modifiedItemCnt);
 
     return namespaceVO;
   }
 
+  private List<NamespaceVO.ItemVO> countDeletedItemNum(List<ItemDTO> newItems, Map<String, String> releaseItems) {
+    Map<String, ItemDTO> newItemMap = BeanUtils.mapByKey("key", newItems);
+
+    List<NamespaceVO.ItemVO> deletedItems = new LinkedList<>();
+    for (Map.Entry<String, String> entry: releaseItems.entrySet()){
+      String key = entry.getKey();
+      if (newItemMap.get(key) == null){
+        NamespaceVO.ItemVO deletedItem = new NamespaceVO.ItemVO();
+
+        ItemDTO deletedItemDto = new ItemDTO();
+        deletedItemDto.setKey(key);
+        String oldValue = entry.getValue();
+        deletedItem.setItem(deletedItemDto);
+
+        deletedItemDto.setValue(oldValue);
+        deletedItem.setModified(true);
+        deletedItem.setOldValue(oldValue);
+        deletedItem.setNewValue("");
+        deletedItems.add(deletedItem);
+      }
+    }
+    return deletedItems;
+  }
+
   private NamespaceVO.ItemVO parseItemVO(ItemDTO itemDTO, Map<String, String> releaseItems) {
     String key = itemDTO.getKey();
     NamespaceVO.ItemVO itemVO = new NamespaceVO.ItemVO();
     itemVO.setItem(itemDTO);
     String newValue = itemDTO.getValue();
     String oldValue = releaseItems.get(key);
+    //new item or modified
     if (!StringUtils.isEmpty(key) && (oldValue == null || !newValue.equals(oldValue))) {
       itemVO.setModified(true);
       itemVO.setOldValue(oldValue == null ? "" : oldValue);

apollo-portal/src/main/resources/static/server_config.html

@@ -83,6 +83,7 @@
 
 <script type="application/javascript" src="scripts/services/AppService.js"></script>
 <script type="application/javascript" src="scripts/services/EnvService.js"></script>
+<script type="application/javascript" src="scripts/services/UserService.js"></script>
 <script type="application/javascript" src="scripts/services/ServerConfigService.js"></script>
 
 <script type="application/javascript" src="scripts/controller/ServerConfigController.js"></script>

apollo-portal/src/main/resources/static/views/common/nav.html

@@ -10,6 +10,9 @@
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
             <ul class="nav navbar-nav navbar-right">
+                <li><a href="http://conf.ctripcorp.com/pages/viewpage.action?pageId=98435462" target="_blank">
+                    help</span>
+                </a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                        aria-expanded="false">{{userName}} <span class="caret"></span></a>