Merge pull request #6 from Zhangxinguo/master

html show Mesos role
apache · May 31, 2017 · f3d914c · f3d914c
2 parents 3ea47de + bfcd040
commit f3d914c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/.../main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudOperationRestfulApi.java b/.../main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudOperationRestfulApi.java
@@ -17,6 +17,7 @@
 
 package com.dangdang.ddframe.job.cloud.scheduler.restful;
 
+import com.dangdang.ddframe.job.cloud.scheduler.env.BootstrapEnvironment;
 import com.dangdang.ddframe.job.cloud.scheduler.mesos.MesosStateService;
 import com.dangdang.ddframe.job.cloud.scheduler.mesos.ReconcileService;
 import com.dangdang.ddframe.job.reg.base.CoordinatorRegistryCenter;
@@ -100,4 +101,15 @@ public JsonArray sandbox(@QueryParam("appName") final String appName) throws JSO
         Preconditions.checkArgument(!Strings.isNullOrEmpty(appName), "Lack param 'appName'");
         return mesosStateService.sandbox(appName);
     }
+
+    /**
+     * 获取作业云Mesos角色信息.
+     *
+     * @return mesos role
+     */
+    @GET
+    @Path("/mesosRole")
+    public String getMesosRole() {
+        return BootstrapEnvironment.getInstance().getMesosRole().orNull();
+    }
 }
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/index.html
@@ -26,6 +26,12 @@
                     <span class="logo-lg">Elastic Job Cloud Console</span>
                 </a>
                 <nav class="navbar navbar-static-top" role="navigation">
+                    <div class="navbar-header">
+                        <span class="navbar-brand">
+                            <i class="fa fa-server"></i>
+                            <span id="mesos-role"></span>
+                        </span>
+                    </div>
                     <div id="navbar" class="navbar-custom-menu">
                         <ul class="nav navbar-nav">
                             <li class="dropdown">

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/common/common.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/common/common.js
@@ -100,3 +100,15 @@ function authorityControl() {
         }
     });
 }
+
+function getMesosRole() {
+    $.ajax({
+        url: "/api/operate/mesosRole",
+        type: "GET",
+        success: function (data) {
+            if (null !== data) {
+                $("#mesos-role").text(data);
+            }
+        }
+    });
+}
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/index.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/index.js
@@ -1,5 +1,7 @@
 $(function() {
-    $("#content-right").load("/html/app/apps_overview.html");
+    $("#content-right").load("/html/app/apps_overview.html", function() {
+        getMesosRole();
+    });
     refreshJobNavTag();
     refreshAppNavTag();
     $("#register-app").click(function() {