Merge branch 'develop'

Author: gunlee01

scouter.client/src/scouter/client/misc/UpdateCheckScheduler.java

@@ -34,7 +34,7 @@ public void initialize() {
 	}
 
 	private void process() throws IOException {
-		final String recommendedVersion = getRecommendedVersion();
+		final String recommendedVersion = UpdateCheckScheduler.getRecommendedVersion();
 		final String clientVersion = Version.getVersion();
 
 		if(Version.versionCompare(recommendedVersion, clientVersion) > 0) {
@@ -51,15 +51,15 @@ public void run() {
 		}
 	}
 
-	private String getRecommendedVersion() {
+	public static String getRecommendedVersion() {
 		return ServerManager.getInstance().getOpenServerList().stream()
 				.map(ServerManager.getInstance()::getServer)
 				.map(s -> StringUtil.isNotEmpty(s.getRecommendedClientVersion()) ? s.getRecommendedClientVersion() : s.getVersion())
-				.map(this::getVersionOnly)
+				.map(UpdateCheckScheduler::getVersionOnly)
 				.max(Version::versionCompare).orElse("");
 	}
 
-	private String getVersionOnly(String buildIncludedVersion) {
+	private static String getVersionOnly(String buildIncludedVersion) {
 		String[] parts = buildIncludedVersion.split(" ");
 		return parts[0];
 	}

scouter.client/src/scouter/client/notice/NoticeCheckScheduler.java

@@ -8,7 +8,8 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.eclipse.ui.PlatformUI;
-
+import scouter.Version;
+import scouter.client.misc.UpdateCheckScheduler;
 import scouter.client.util.ExUtil;
 import scouter.client.util.RCPUtil;
 import scouter.util.DateUtil;
@@ -19,7 +20,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
 
 public enum NoticeCheckScheduler {
 
@@ -73,6 +77,15 @@ private void process() throws ClientProtocolException, IOException {
 		HttpClient httpClient = HttpClientBuilder.create().build();
 		HttpGet httpGet = new HttpGet(NOTICE_URL);
 		httpGet.addHeader("X-SCCH", getClientHash());
+
+		try {
+			final String recommendedVersion = UpdateCheckScheduler.getRecommendedVersion();
+			final String clientVersion = Version.getVersion();
+			httpGet.addHeader("X-SCV", recommendedVersion + "::" + clientVersion);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		HttpResponse response = null;
 		response = httpClient.execute(httpGet);
 		System.out.println("Notice Response Code : "