Merge pull request #492 from lepdou/1220

bugfix: email template placeholder has conflict with spring placeholder

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/config/PortalConfig.java

@@ -110,11 +110,11 @@ public class PortalConfig extends RefreshableConfig {
   }
 
   public String publishEmailBodyTemplate() {
-    return getValue("email.template.release", "");
+    return getValue("email.template.release.v2", "");
   }
 
   public String rollbackEmailBodyTemplate() {
-    return getValue("email.template.rollback", "");
+    return getValue("email.template.rollback.v2", "");
   }
 
   /***

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/emailbuilder/ConfigPublishEmailBuilder.java

@@ -36,21 +36,21 @@ import java.util.regex.Matcher;
 public abstract class ConfigPublishEmailBuilder {
 
   //email content common field placeholder
-  private static final String EMAIL_CONTENT_FIELD_APPID = "\\$\\{appId\\}";
-  private static final String EMAIL_CONTENT_FIELD_ENV = "\\$\\{env}";
-  private static final String EMAIL_CONTENT_FIELD_CLUSTER = "\\$\\{clusterName}";
-  private static final String EMAIL_CONTENT_FIELD_NAMESPACE = "\\$\\{namespaceName}";
-  private static final String EMAIL_CONTENT_FIELD_OPERATOR = "\\$\\{operator}";
-  private static final String EMAIL_CONTENT_FIELD_RELEASE_TIME = "\\$\\{releaseTime}";
-  private static final String EMAIL_CONTENT_FIELD_RELEASE_ID = "\\$\\{releaseId}";
-  private static final String EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID = "\\$\\{releaseHistoryId}";
-  private static final String EMAIL_CONTENT_FIELD_RELEASE_TITLE = "\\$\\{releaseTitle}";
-  private static final String EMAIL_CONTENT_FIELD_RELEASE_COMMENT = "\\$\\{releaseComment}";
-  private static final String EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS = "\\$\\{apollo.portal.address}";
-  private static final String EMAIL_CONTENT_FIELD_DIFF = "\\$\\{diff}";
+  private static final String EMAIL_CONTENT_FIELD_APPID = "#\\{appId\\}";
+  private static final String EMAIL_CONTENT_FIELD_ENV = "#\\{env}";
+  private static final String EMAIL_CONTENT_FIELD_CLUSTER = "#\\{clusterName}";
+  private static final String EMAIL_CONTENT_FIELD_NAMESPACE = "#\\{namespaceName}";
+  private static final String EMAIL_CONTENT_FIELD_OPERATOR = "#\\{operator}";
+  private static final String EMAIL_CONTENT_FIELD_RELEASE_TIME = "#\\{releaseTime}";
+  private static final String EMAIL_CONTENT_FIELD_RELEASE_ID = "#\\{releaseId}";
+  private static final String EMAIL_CONTENT_FIELD_RELEASE_HISTORY_ID = "#\\{releaseHistoryId}";
+  private static final String EMAIL_CONTENT_FIELD_RELEASE_TITLE = "#\\{releaseTitle}";
+  private static final String EMAIL_CONTENT_FIELD_RELEASE_COMMENT = "#\\{releaseComment}";
+  private static final String EMAIL_CONTENT_FIELD_APOLLO_SERVER_ADDRESS = "#\\{apollo.portal.address}";
+  private static final String EMAIL_CONTENT_FIELD_DIFF = "#\\{diff}";
 
   //email content special field placeholder
-  protected static final String EMAIL_CONTENT_FIELD_RULE = "\\$\\{rules}";
+  protected static final String EMAIL_CONTENT_FIELD_RULE = "#\\{rules}";
 
   //email content module switch
   private static final String EMAIL_CONTENT_DIFF_HAS_CONTENT_SWITCH = "diff-hidden";

apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html

@@ -163,7 +163,7 @@
         <!--table view-->
         <div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
 
-            <div class="well well-sm no-radius text-center" ng-show="!namespace.latestRelease">
+            <div class="well well-sm no-radius text-center" ng-show="!namespace.isLinkedNamespace && !namespace.latestRelease">
                 <span style="color: red"> Tips: 此namespace从来没有发布过，Apollo客户端将获取不到配置并记录404日志信息，请及时发布。</span>
             </div>
             <!--not link namespace-->
@@ -510,10 +510,10 @@
 
                             </th>
                             <th>
-                                Old Value
+                                已发布的值
                             </th>
                             <th>
-                                New Value
+                                未发布的值
                             </th>
                             <th>
                                 备注