Merge pull request alibaba#194 from yanlinly/master

Fix alibaba#38 alibaba#106 alibaba#188
matou2 · Oct 31, 2018 · 24a2ede · 24a2ede
2 parents ede4111 + 563105a
commit 24a2ede
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java
@@ -39,7 +39,7 @@ public interface ConfigService {
 	 * @throws NacosException
 	 *             NacosException
 	 */
-	public String getConfig(String dataId, String group, long timeoutMs) throws NacosException;
+	String getConfig(String dataId, String group, long timeoutMs) throws NacosException;
 
 	/**
 	 * Add a listener to the configuration, after the server to modify the
@@ -58,7 +58,7 @@ public interface ConfigService {
 	 * @throws NacosException
 	 *             NacosException
 	 */
-	public void addListener(String dataId, String group, Listener listener) throws NacosException;
+	void addListener(String dataId, String group, Listener listener) throws NacosException;
 
 	/**
 	 * publish config.
@@ -73,7 +73,7 @@ public interface ConfigService {
 	 * @throws NacosException
 	 *             NacosException
 	 */
-	public boolean publishConfig(String dataId, String group, String content) throws NacosException;
+	boolean publishConfig(String dataId, String group, String content) throws NacosException;
 
 	/**
 	 * Remove Config
@@ -86,7 +86,7 @@ public interface ConfigService {
 	 * @throws NacosException
 	 *             NacosException
 	 */
-	public boolean removeConfig(String dataId, String group) throws NacosException;
+	boolean removeConfig(String dataId, String group) throws NacosException;
 
 	/**
 	 * Remove Listener
@@ -98,13 +98,13 @@ public interface ConfigService {
 	 * @param listener
 	 *            listener
 	 */
-	public void removeListener(String dataId, String group, Listener listener);
+	void removeListener(String dataId, String group, Listener listener);
 
 	/**
 	 * server health info
 	 * 
 	 * @return whether health
 	 */
-	public String getServerStatus();
+	String getServerStatus();
 
 }
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
@@ -294,7 +294,7 @@ String getFixedNameSuffix(String... serverIps) {
         String split = "";
         for (String serverIp : serverIps) {
             sb.append(split);
-            sb.append(serverIp);
+            sb.append(serverIp.replaceAll(":", "_"));
             split = "-";
         }
         return sb.toString();

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
@@ -201,9 +201,13 @@ public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse resp
 		ParamUtils.checkParam(tag);
 		String clientIp = RequestUtil.getRemoteIp(request);
 		if (StringUtils.isBlank(tag)) {
-			persistService.removeAggrConfigInfo(dataId, group, tenant);
+			persistService.removeConfigInfo(dataId, group, tenant, clientIp, null);
+		} else {
+			persistService.removeConfigInfoTag(dataId, group, tenant, tag, clientIp, null);
 		}
-		mergeService.addMergeTask(dataId, group, tenant, tag, clientIp);
+		final Timestamp time = TimeUtils.getCurrentTime();
+		ConfigTraceService.logPersistenceEvent(dataId, group, tenant, null, time.getTime(), clientIp, ConfigTraceService.PERSISTENCE_EVENT_REMOVE, null);
+		EventDispatcher.fireEvent(new ConfigDataChangeEvent(false, dataId, group, tenant, tag, time.getTime()));
 		return true;
 	}