Add justify reg center activated for job and server overview.

RoyZeng · Apr 7, 2017 · e517384 · e517384
1 parent 47b00c2
commit e517384
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 55 deletions.
diff --git a/...src/main/java/com/dangdang/ddframe/job/lite/console/filter/GlobalConfigurationFilter.java b/...src/main/java/com/dangdang/ddframe/job/lite/console/filter/GlobalConfigurationFilter.java
@@ -43,6 +43,11 @@
 import static com.dangdang.ddframe.job.lite.console.restful.config.EventTraceDataSourceRestfulApi.DATA_SOURCE_CONFIG_KEY;
 import static com.dangdang.ddframe.job.lite.console.restful.config.RegistryCenterRestfulApi.REG_CENTER_CONFIG_KEY;
 
+/**
+ * 全局配置过滤器.
+ *
+ * @author caohao
+ */
 public class GlobalConfigurationFilter implements Filter {
 
  private final RegistryCenterConfigurationService regCenterService = new RegistryCenterConfigurationServiceImpl();

diff --git a/...n/java/com/dangdang/ddframe/job/lite/console/restful/config/RegistryCenterRestfulApi.java b/...n/java/com/dangdang/ddframe/job/lite/console/restful/config/RegistryCenterRestfulApi.java
@@ -50,7 +50,19 @@ public final class RegistryCenterRestfulApi {
  private RegistryCenterConfigurationService regCenterService = new RegistryCenterConfigurationServiceImpl();
 
  /**
- * 读取注册中心配置.
+ * 判断是否存在已连接的注册中心配置.
+ *
+ * @param request HTTP请求
+ * @return 是否存在已连接的注册中心配置
+ */
+ @GET
+ @Path("/activated")
+ public boolean activated(final @Context HttpServletRequest request) {
+ return regCenterService.loadActivated().isPresent();
+ }
+
+ /**
+ * 读取注册中心配置集合.
  * 
  * @param request HTTP请求
  * @return 注册中心配置集合

diff --git a/...-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js b/...-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js
@@ -4,7 +4,7 @@ $(function() {
 });
 
 function bindSubmitJobSettingsForm() {
- $("#update-job-info-btn").on("click", function(ev){
+ $("#update-job-info-btn").on("click", function(){
  var bootstrapValidator = $("#job-config-form").data("bootstrapValidator");
  bootstrapValidator.validate();
  if (bootstrapValidator.isValid()) {

diff --git a/...elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js b/...elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
@@ -4,37 +4,48 @@ $(function() {
 });
 
 function renderJobsOverview() {
- $("#jobs-status-overview-tbl").bootstrapTable({
- url: "/api/jobs",
+ var jsonData = {
  cache: false,
- columns: 
- [{
- field: "jobName",
- title: "作业名",
- sortable: "true"
- }, {
- field: "shardingTotalCount",
- title: "分片总数",
- sortable: "true"
- }, {
- field: "cron",
- title: "cron表达式",
- sortable: "true"
- }, {
- field: "description",
- title: "描述",
- sortable: "true"
- }, {
- field: "status",
- title: "运行状态",
- formatter: "statusFormatter",
- sortable: "true"
- }, {
- field: "operation",
- title: "操作",
- formatter: "generateOperationButtons"
- }]
+ columns:
+ [{
+ field: "jobName",
+ title: "作业名",
+ sortable: "true"
+ }, {
+ field: "shardingTotalCount",
+ title: "分片总数",
+ sortable: "true"
+ }, {
+ field: "cron",
+ title: "cron表达式",
+ sortable: "true"
+ }, {
+ field: "description",
+ title: "描述",
+ sortable: "true"
+ }, {
+ field: "status",
+ title: "运行状态",
+ formatter: "statusFormatter",
+ sortable: "true"
+ }, {
+ field: "operation",
+ title: "操作",
+ formatter: "generateOperationButtons"
+ }]
+ };
+ var activated = false;
+ $.ajax({
+ url: "/api/registry-center/activated",
+ async: false,
+ success: function(data) {
+ activated = data;
+ }
  });
+ if (activated) {
+ jsonData.url = "/api/jobs";
+ }
+ $("#jobs-status-overview-tbl").bootstrapTable(jsonData);
 }
 
 function statusFormatter(value, row) {

diff --git a/...c-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js b/...c-job-lite-console/src/main/resources/console/js/status/server/servers_status_overview.js
@@ -4,32 +4,43 @@ $(function() {
 });
 
 function renderServersOverview() {
- $("#servers-overview-tbl").bootstrapTable({
- url: "/api/servers",
+ var jsonData = {
  cache: false,
- columns: 
- [{
- field: "serverIp",
- title: "服务器IP",
- sortable: "true"
- }, {
- field: "instancesNum",
- title: "运行实例数",
- sortable: "true"
- }, {
- field: "jobsNum",
- title: "作业总数",
- sortable: "true"
- }, {
- field: "disabledJobsNum",
- title: "禁用作业数",
- sortable: "true"
- }, {
- field: "operation",
- title: "操作",
- formatter: "generateOperationButtons"
- }]
+ columns:
+ [{
+ field: "serverIp",
+ title: "服务器IP",
+ sortable: "true"
+ }, {
+ field: "instancesNum",
+ title: "运行实例数",
+ sortable: "true"
+ }, {
+ field: "jobsNum",
+ title: "作业总数",
+ sortable: "true"
+ }, {
+ field: "disabledJobsNum",
+ title: "禁用作业数",
+ sortable: "true"
+ }, {
+ field: "operation",
+ title: "操作",
+ formatter: "generateOperationButtons"
+ }]
+ };
+ var activated = false;
+ $.ajax({
+ url: "/api/registry-center/activated",
+ async: false,
+ success: function(data) {
+ activated = data;
+ }
  });
+ if (activated) {
+ jsonData.url = "/api/servers";
+ }
+ $("#servers-overview-tbl").bootstrapTable(jsonData);
 }
 
 function bindOperationButtons() {