nginx切换调整

@@ -7,10 +7,13 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 public class ProjectOnline {
-	private final static String JAVA_ENV_QCLOUD="qcloud,qcloud_gray";
+	private final static String JAVA_ENV_QCLOUD_AZ1="qcloud";
 	private final static String JAVA_ENV_QCLOUD_AZ2="qcloudaz2";
 	private final static String JAVA_ENV_QCLOUD_AZ3="qcloudaz3";
-	public final static String JAVA_ENV_ALL=JAVA_ENV_QCLOUD+","+JAVA_ENV_QCLOUD_AZ2+","+JAVA_ENV_QCLOUD_AZ3;
+	public final static String JAVA_ENV_ALL=JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_AZ2+","+JAVA_ENV_QCLOUD_AZ3;
+
+	///// 暂时只有media有
+	private final static String JAVA_ENV_QCLOUD_ENV_GRAY="qcloud_gray";
 
 	private static List<Project> JAVA_LIST = new ArrayList<>();
 	private static Map<String,Project> JAVA_MAP = new HashMap<>();
@@ -34,21 +37,21 @@ public class ProjectOnline {
 		JAVA_LIST.add(new Project("1","yohobuy-risk","932","yoho30",JAVA_ENV_ALL,"java 核心服务"));
 
 		//只有qcloud ： java服务-单中心
-		JAVA_LIST.add(new Project("1","yoho-push","137","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","cms_push","514","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yoho-social","353","yoho30","qcloud,qcloud_gray","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yohobuy-union","133","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yohobuy-crm","275","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yohobuy-task","138","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yoho-message-controller","684","yoho30","qcloud","java服务-单中心"));
-		JAVA_LIST.add(new Project("1","yoho-message-sender","685","yoho30","qcloud","java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yoho-push","137","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","cms_push","514","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yoho-social","353","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yohobuy-union","133","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yohobuy-crm","275","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yohobuy-task","138","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yoho-message-controller","684","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
+		JAVA_LIST.add(new Project("1","yoho-message-sender","685","yoho30",JAVA_ENV_QCLOUD_AZ1,"java服务-单中心"));
 
 
-		//只有qcloud_gray： 媒体java （灰度）
-		JAVA_LIST.add(new Project("1", "yoho-now", "690", "YOHONow","qcloud_gray","媒体java （灰度）"));
-		JAVA_LIST.add(new Project("1","yoho-mars","737","media","qcloud_gray","媒体java （灰度）"));
-		JAVA_LIST.add(new Project("1","yohomars-platform","764","media","qcloud_gray","媒体java （灰度）"));
-		JAVA_LIST.add(new Project("1","yohonow-platform","775","media","qcloud_gray","媒体java （灰度）"));
+		//只有灰度环境： 媒体java （灰度）
+		JAVA_LIST.add(new Project("1", "yoho-now", "690", "YOHONow",JAVA_ENV_QCLOUD_ENV_GRAY,"媒体java （灰度）"));
+		JAVA_LIST.add(new Project("1","yoho-mars","737","media",JAVA_ENV_QCLOUD_ENV_GRAY,"媒体java （灰度）"));
+		JAVA_LIST.add(new Project("1","yohomars-platform","764","media",JAVA_ENV_QCLOUD_ENV_GRAY,"媒体java （灰度）"));
+		JAVA_LIST.add(new Project("1","yohonow-platform","775","media",JAVA_ENV_QCLOUD_ENV_GRAY,"媒体java （灰度）"));
 
 
 		//JAVA_LIST.add(new Project("1","yoho-cobar","461","yoho30"));
@@ -57,20 +60,20 @@ public class ProjectOnline {
 		//JAVA_LIST.add(new Project("1","yoho-union-recomand","789","yoho30"));
 
 		//只有qcloud、 qcloud灰度。  线下店java服务
-		JAVA_LIST.add(new Project("1","yohobuy-shops","490","yoho30",JAVA_ENV_QCLOUD,"线下店java服务"));
-		JAVA_LIST.add(new Project("1","yohobuy-portal-gateway","557","yoho30",JAVA_ENV_QCLOUD,"线下店java服务"));
-		JAVA_LIST.add(new Project("1","yohobuy-extendstore","852","yoho30",JAVA_ENV_QCLOUD,"线下店java服务"));
+		JAVA_LIST.add(new Project("1","yohobuy-shops","490","yoho30",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_ENV_GRAY,"线下店java服务"));
+		JAVA_LIST.add(new Project("1","yohobuy-portal-gateway","557","yoho30",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_ENV_GRAY,"线下店java服务"));
+		JAVA_LIST.add(new Project("1","yohobuy-extendstore","852","yoho30",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_ENV_GRAY,"线下店java服务"));
 
 
 
-		JAVA_LIST.add(new Project("2","yoho-search-service","12","yoho-search","qcloud,"+JAVA_ENV_QCLOUD_AZ2,""));
-		JAVA_LIST.add(new Project("2","yoho-search-consumer","8","yoho-search","qcloud,"+JAVA_ENV_QCLOUD_AZ2,""));
-		JAVA_LIST.add(new Project("2","yoho-search-producer","7","yoho-search","qcloud,"+JAVA_ENV_QCLOUD_AZ2,""));
-		JAVA_LIST.add(new Project("2","yoho-search-adaptor","13","yoho-search","qcloud,"+JAVA_ENV_QCLOUD_AZ2,""));
-		JAVA_LIST.add(new Project("2","yohomars-search-service","554","yoho-search",JAVA_ENV_QCLOUD,""));
+		JAVA_LIST.add(new Project("2","yoho-search-service","12","yoho-search",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_AZ2,""));
+		JAVA_LIST.add(new Project("2","yoho-search-consumer","8","yoho-search",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_AZ2,""));
+		JAVA_LIST.add(new Project("2","yoho-search-producer","7","yoho-search",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_AZ2,""));
+		JAVA_LIST.add(new Project("2","yoho-search-adaptor","13","yoho-search",JAVA_ENV_QCLOUD_AZ1+","+JAVA_ENV_QCLOUD_AZ2,""));
+		JAVA_LIST.add(new Project("2","yohomars-search-service","554","yoho-search",JAVA_ENV_QCLOUD_AZ1,""));
 
 
-		JAVA_LIST.add(new Project("3","yohobuy-platform","110","platform",JAVA_ENV_QCLOUD,""));
+		JAVA_LIST.add(new Project("3","yohobuy-platform","110","platform",JAVA_ENV_QCLOUD_AZ1,""));
 
 		//把list转成map,放到最后
 		JAVA_MAP=JAVA_LIST.stream().collect(Collectors.toMap(Project::getName,Project->Project));

@@ -81,7 +81,14 @@
                                        onclick="changeservers()"
                                        checked="checked"
                                 />
-                                <label for="${envi }">${envi }</label>
+                                <c:choose>
+                                    <c:when test="${fn:indexOf(envi,'az3')>=0 }">
+                                        <label for="${envi }">${envi }(灰度)</label>
+                                    </c:when>
+                                    <c:otherwise>
+                                        <label for="${envi }">${envi }</label>
+                                    </c:otherwise>
+                                </c:choose>
                             </div>
                         </c:forEach>
                     </c:if>

@@ -434,7 +434,7 @@
                         env_HTML += "</br>";
                     }
                     var show_label=env;
-                    if(env=='az2'){
+                    if(env!=null&&env.indexOf('az3')>=0){
                         show_label=env+'(灰度)';
                     }
                     env_HTML += "<div class='ckbox ckbox-primary' style='display: inline'>";

@@ -7,6 +7,16 @@ $(document).ready(function () {
  * @param resp
  */
 function drawData(resp) {
+    if(resp==null){
+        layer.msg("获取数据异常", {icon: 2});
+        return;
+    }
+
+    if(200!=resp.code){
+        console.log(resp);
+        layer.msg("获取数据错误"+resp.message, {icon: 20});
+        return ;
+    }
     var data = resp.data;
 
     var canvas = document.getElementById('canvas');