diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css index 0687931103..11958da493 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/css/common.css @@ -1,6 +1,6 @@ .form-group.toolbar label { float: left; - width: 90px; + width: 130px; height: 52px; padding-left: 20px; text-align: center; @@ -135,3 +135,7 @@ #modal-dialog-width{ width: 60%; } +#execute-result { + float: top; + padding-left: 20px; +} diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html index d33edb8b33..1f901e5fe0 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/add_app.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -22,17 +22,17 @@
- +
- +
- +
- +
@@ -40,17 +40,17 @@
- +
- +
- +
- +
@@ -58,7 +58,7 @@
- +
@@ -69,7 +69,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html index 3eb8193b4d..8863a9b84d 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/apps_overview.html @@ -1,15 +1,24 @@
-

应用定义

+

    -
  1. 定义
    2. -
  2. 应用定义
    3. +
    4. +
-
- + + + + + + + + + +
+
@@ -19,7 +28,7 @@

应用定义

-

应用详情

+

@@ -33,7 +42,7 @@

应用详情

-

修改应用

+

@@ -47,7 +56,7 @@

修改应用

-

添加应用

+

@@ -59,16 +68,15 @@

添加应用

-

确认要删除该应用吗？删除应用同时会删除关联作业。

+

- - + +
- - + diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/detail_app.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/detail_app.html index 784e80c89c..b1e19dab70 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/detail_app.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/detail_app.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -22,17 +22,17 @@
- +
- +
- +
- +
@@ -40,17 +40,17 @@
- +
- +
- +
- +
@@ -58,7 +58,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html index 1c4d3a6bde..fecba301ff 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/app/modify_app.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -22,17 +22,17 @@
- +
- +
- +
- +
@@ -40,17 +40,17 @@
- +
- +
- +
- +
@@ -58,7 +58,7 @@
- +
@@ -69,7 +69,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html index 3cce868cd1..18f7838f77 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_dashboard.html @@ -1,9 +1,9 @@
-

Dashboard

+

    -
  1. 作业历史
    2. -
  2. 历史dashboard
    3. +
    4. +
@@ -13,7 +13,7 @@

Dashboard

-

作业成功/失败图

+

@@ -40,7 +40,7 @@

作业成功/失败图

-

作业分类

+

@@ -65,7 +65,7 @@

作业分类

-

作业成功/失败数

+

@@ -82,7 +82,7 @@

作业成功/失败数

-

作业/任务运行数

+

@@ -99,7 +99,7 @@

作业/任务运行数

-

接入平台作业数

+

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html index b073319b5f..9ff85854cb 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_details.html @@ -1,41 +1,43 @@
-

作业运行轨迹

+

    -
  1. 作业历史
    2. -
  2. 作业运行轨迹
    3. +
    4. +
- +
- +

- +
- +
- + -
-
- - 成功 - 失败 - 全部 +

+
+
+ : + + + +
@@ -57,15 +59,15 @@

作业运行轨迹

data-toolbar="#job-exec-detail-toolbar-div"> - 作业名称 - 任务ID - 宿主机IP - 分片项 - 执行依据 - 执行结果 - 失败原因 - 执行开始时间 - 执行结束时间 + + + + + + + + + @@ -73,7 +75,6 @@

作业运行轨迹

- diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html index 474da53f45..3a325be092 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/history/job_exec_status.html @@ -1,63 +1,63 @@
-

作业运行状态

+

    -
  1. 作业历史
    2. -
  2. 作业运行状态
    3. +
    4. +
- +
- +

- +
- +
- +

- +
- +
- +
@@ -80,15 +80,15 @@

作业运行状态

data-toolbar="#jobExecStatusToolbar"> - 作业名称 - 任务ID - 宿主机ID - 执行来源 - 分片项 - 任务来源 - 状态 - 创建时间 - 备注 + + + + + + + + + @@ -96,7 +96,6 @@

作业运行状态

- diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html index 0b03b2f1e7..272aa1780e 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/add_job.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -20,9 +20,9 @@
- +
- @@ -31,7 +31,7 @@
- +
@@ -39,9 +39,9 @@
- +
- @@ -53,7 +53,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -69,7 +69,7 @@
- +
@@ -79,7 +79,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -146,7 +146,7 @@
- +
@@ -162,7 +162,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html index 9c30a04cd8..b5da0a9ea1 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/detail_job.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -20,9 +20,9 @@
- +
- @@ -31,7 +31,7 @@
- +
@@ -39,9 +39,9 @@
- +
- @@ -53,7 +53,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -69,7 +69,7 @@
- +
@@ -79,7 +79,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -146,7 +146,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html index 70a305d201..0e8a4b4c4b 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/job_status.html @@ -1,17 +1,17 @@
-

作业状态

+

    -
  1. 作业
    2. -
  2. 作业状态
    3. +
    4. +
@@ -33,11 +33,11 @@

作业状态

data-show-columns="true"> - 任务ID - 任务名称 - 宿主机ID - 执行类型 - 分片项 + + + + + @@ -61,8 +61,8 @@

作业状态

data-show-columns="true"> - 作业名称 - 剩余执行次数 + + @@ -86,9 +86,9 @@

作业状态

data-show-columns="true"> - 作业名称 - 原任务ID - 分片项 + + + @@ -98,4 +98,3 @@

作业状态

- diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html index 90ed8952a1..c74309d9dd 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/jobs_overview.html @@ -1,15 +1,26 @@
-

作业定义

+

    -
  1. 作业
    2. -
  2. 作业定义
    3. +
    4. +
-
- + + + + + + + + + + + +
+
@@ -19,7 +30,7 @@

作业定义

-

作业详情

+

@@ -31,11 +42,11 @@

作业详情

-

确认要删除该作业吗？

+

- - + +
@@ -46,7 +57,7 @@

确认要删除该作业吗？

-

修改作业

+

@@ -60,7 +71,7 @@

修改作业

-

添加作业

+

@@ -73,10 +84,10 @@

添加作业

-

Spring方式配置

+

-

请填写beanName名称

+

@@ -86,15 +97,14 @@

请填写beanName名称

-

Spring方式配置

+

-

请填写Spring配置文件相对路径及名称

+

- - + diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html index 801ee51491..4c937280f1 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/html/job/modify_job.html @@ -4,7 +4,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -20,9 +20,9 @@
- +
- @@ -31,7 +31,7 @@
- +
@@ -39,9 +39,9 @@
- +
- @@ -53,7 +53,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -69,7 +69,7 @@
- +
@@ -79,7 +79,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -95,7 +95,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -121,7 +121,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -146,7 +146,7 @@
- +
@@ -162,7 +162,7 @@
- +
diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message.properties b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message.properties new file mode 100644 index 0000000000..e540934d53 --- /dev/null +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message.properties @@ -0,0 +1,169 @@ +sidebar-app=App +sidebar-defination=Defination +sidebar-job=Job +sidebar-status=Status +sidebar-job-history=Job history +sidebar-job-dashboard=Job history dashboard +sidebar-job-execute-details=Job execute details +sidebar-job-execute-status=Job execute status + +switch-language=Switch language +language-zh=中文 +language-en=English + +dangdang=dangdang.com + +switch-theme-title=Switch theme +switch-theme-blue=Blue +switch-theme-white=White +switch-theme-purple=Purple +switch-theme-green=Green +switch-theme-yellow=Yellow +switch-theme-red=Red +switch-theme-blue-light=Blue Light +switch-theme-white-light=White Light +switch-theme-purple-light=Purple Light +switch-theme-green-light=Green Light +switch-theme-yellow-light=Yellow Light +switch-theme-red-light=Red Light + +app-name=App name +app-bootstrap-script=App bootstrap script +app-cpu-count=App cpu count +app-memory=App memory +app-event-trace-sampling-count=App event trace sampling count +app-cache-enable=App cache enable +app-url=App url +app-detail=App detail +update-app=Update app +add-app=Add app +app-name-not-null=App name cannot be null +app-name-length-limit=App name length should less than 100 characters +app-name-exists=App name has already existed +app-bootstrap-script-not-null=App bootstrap script cannot be null +app-cpu-count-not-null=App cpu count cannot be null +app-cpu-count-regexp-limit=Cpu can only contain Numbers and decimal points +app-memory-not-null=App memory cannot be null +event-trace-sampling-count-not-null=Event trace sampling count cannot be null +app-url-not-null=App url cannot be null +app-name-unregistered=App name is unregistered +app-disabled=The application for the job has failed and the operation failed + +add-job=Add job +job-detail=Job detail +update-job=Update job +job-name=Job name +job-execution-type=Job execution type +job-class=Job class +job-type=Job type +job-cron=Crontab +job-sharding-total-count=Sharding total count +job-parameter=Job parameter +job-cpu-count=Cpu count +job-memory=Memory +job-bean-name=Bean name +job-failover=Failover +job-misfire=Misfire +job-streaming-process=Streaming process +job-application-context=Application context +job-sharding-item-parameters=Sharding item parameters +job-script-command-line=Script command line +job-description=Description +job-status=Job status +job-sharding-item=Sharding item +job-spring-type-settings=Job spring type settings +job-application-context-info=Job application context info +job-bean-name-info=Job bean name info +job-class-not-null=Job class cannot be null +job-class-regexp-limit=The job class can only use Numbers, letters, underscores (_) and dot (.). +job-name-not-null=Job name cannot be null +job-name-length-limit=Job name length should less than 100 characters +job-name-exists=Job name has already existed +job-cron-length-limit=Job crontab should less than 40 characters +job-cron-not-null=Job crontab cannot be null +job-cpu-count-not-null=Job cpu count cannot be null +job-cpu-count-regexp-limit=The job cpu count can only use Numbers and dot (.). +job-memory-not-null=Job memory cannot be null +job-sharding-count-not-null=Sharding count cannot be null +job-script-command-line-not-null=Script command line cannot be null +job-sharding-item-parameters-regexp-limit=The sharding item split item format is incorrect, format: 0 = xx, 1 = yy + +tab-running-tasks=Running tasks +tab-ready-jobs=Ready jobs +tab-failover-tasks=Failover tasks + +task-id=Task ID +task-name=Task name +server-ip=Server IP +remaining-execution-times=Remaining execution times +task-source-id=Task source id + +dashboard-succ-and-fail-pics=Success and failure num +dashboard-job-type-pics=Job type +dashboard-job-task-running-pics=Job and task running num +dashboard-import-jobs=Import jobs num +job-info-for-one-minute=Job info for one minute +job-info-for-one-hour=Job info for one hour +job-info-for-one-week=Job info for one week +job-success-count=Job success count +job-failure-count=Job failure count +task-running-count=Task running count +job-running-count=Job running count +highchart-tooltip-info1=Mouse drag can be scaled +highchart-tooltip-info2=Gesture operations are scaled + +placeholder-app-name=App name +placeholder-bootstrap-script=bootstrap-script,eg：bin//start.sh。 +placeholder-app-url=Path must be accessed through the network,eg：http://file_host:8080/your-job.tar.gz +placeholder-job-name=Job name +placeholder-job-app-name=The application name of the job must be registered in the application +placeholder-job-class=The job class needs to implement the ElasticJob interface, which does not require configuration +placeholder-cron=The cron expression for the job start time. eg: 0/5 * * *? +placeholder-sharding-total-count=Job sharding total count +placeholder-job-parameter=Job customization parameters, can by passing this parameter for job scheduling the business method of ginseng, eg: take parameters job every time for the amount of data read from the database and operation instance of the primary key. +placeholder-cpu-count=The minimum number of cpus required for a single operation is 0.001 +placeholder-job-memory=The memory MB required for a single piece of work is a minimum of 1 +placeholder-bean-name=The bean name configured in the Spring container +placeholder-failover=The failure transfer can be turned on only if the monitoring job is executed +placeholder-misfire=Whether the task is open misses the reexecution +placeholder-streaming-process=DATAFLOW type operation, whether if flow processing data flow processing data, the fetchData returns an empty result will not perform the operation, if the flow processing data, processing data after the completion of the work end. +placeholder-application-context=Spring configure the Spring configuration file relative path and name, eg: META-INF\\applicationContext.xml +placeholder-sharding-item-parameters=Separate serial Numbers and parameters are separated by equals, and multiple key values are separated by commas, similar to map. The serial serial Numbers start from 0, not greater than or equal to the total number of assignments. eg: 0 = a, 1 = b, 2 = c +placeholder-script-command-line=SCRIPT type job command line + +operation=Operation +operation-add=Add +operation-submit=Submit +operation-close=Close +operation-delete=Delete +operation-reset=Reset +operation-reset-scaling=Reset scaling +operation-enable=Enable +operation-disable=Disable + +status=Status +status-running=Running +status-staging=Staging +status-task-failed=Failed +status-task-finished=Finished +status-task-error=Error +status-task-killed=Killed + +start-time=Start time +end-time=End time +failure-reason=Failure reason +comments=Comments + +execute-result=Execute result +execute-result-all=All +execute-result-success=success +execute-result-failure=failure +execute-result-null=Null +execute-source=Execute source +execute-type=Execute type +remaining-execute-times=Remaining execute times + +confirm-to-close=Are you sure to close it? +confirm-to-delete=Confirm that you want to delete the application? Deleting the application also deletes the associated jobs. +operation-succeed=Operation complete successfully +confirm-to-delete-job=Confirm that you want to delete the job? diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_en.properties b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_en.properties new file mode 100644 index 0000000000..e540934d53 --- /dev/null +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_en.properties @@ -0,0 +1,169 @@ +sidebar-app=App +sidebar-defination=Defination +sidebar-job=Job +sidebar-status=Status +sidebar-job-history=Job history +sidebar-job-dashboard=Job history dashboard +sidebar-job-execute-details=Job execute details +sidebar-job-execute-status=Job execute status + +switch-language=Switch language +language-zh=中文 +language-en=English + +dangdang=dangdang.com + +switch-theme-title=Switch theme +switch-theme-blue=Blue +switch-theme-white=White +switch-theme-purple=Purple +switch-theme-green=Green +switch-theme-yellow=Yellow +switch-theme-red=Red +switch-theme-blue-light=Blue Light +switch-theme-white-light=White Light +switch-theme-purple-light=Purple Light +switch-theme-green-light=Green Light +switch-theme-yellow-light=Yellow Light +switch-theme-red-light=Red Light + +app-name=App name +app-bootstrap-script=App bootstrap script +app-cpu-count=App cpu count +app-memory=App memory +app-event-trace-sampling-count=App event trace sampling count +app-cache-enable=App cache enable +app-url=App url +app-detail=App detail +update-app=Update app +add-app=Add app +app-name-not-null=App name cannot be null +app-name-length-limit=App name length should less than 100 characters +app-name-exists=App name has already existed +app-bootstrap-script-not-null=App bootstrap script cannot be null +app-cpu-count-not-null=App cpu count cannot be null +app-cpu-count-regexp-limit=Cpu can only contain Numbers and decimal points +app-memory-not-null=App memory cannot be null +event-trace-sampling-count-not-null=Event trace sampling count cannot be null +app-url-not-null=App url cannot be null +app-name-unregistered=App name is unregistered +app-disabled=The application for the job has failed and the operation failed + +add-job=Add job +job-detail=Job detail +update-job=Update job +job-name=Job name +job-execution-type=Job execution type +job-class=Job class +job-type=Job type +job-cron=Crontab +job-sharding-total-count=Sharding total count +job-parameter=Job parameter +job-cpu-count=Cpu count +job-memory=Memory +job-bean-name=Bean name +job-failover=Failover +job-misfire=Misfire +job-streaming-process=Streaming process +job-application-context=Application context +job-sharding-item-parameters=Sharding item parameters +job-script-command-line=Script command line +job-description=Description +job-status=Job status +job-sharding-item=Sharding item +job-spring-type-settings=Job spring type settings +job-application-context-info=Job application context info +job-bean-name-info=Job bean name info +job-class-not-null=Job class cannot be null +job-class-regexp-limit=The job class can only use Numbers, letters, underscores (_) and dot (.). +job-name-not-null=Job name cannot be null +job-name-length-limit=Job name length should less than 100 characters +job-name-exists=Job name has already existed +job-cron-length-limit=Job crontab should less than 40 characters +job-cron-not-null=Job crontab cannot be null +job-cpu-count-not-null=Job cpu count cannot be null +job-cpu-count-regexp-limit=The job cpu count can only use Numbers and dot (.). +job-memory-not-null=Job memory cannot be null +job-sharding-count-not-null=Sharding count cannot be null +job-script-command-line-not-null=Script command line cannot be null +job-sharding-item-parameters-regexp-limit=The sharding item split item format is incorrect, format: 0 = xx, 1 = yy + +tab-running-tasks=Running tasks +tab-ready-jobs=Ready jobs +tab-failover-tasks=Failover tasks + +task-id=Task ID +task-name=Task name +server-ip=Server IP +remaining-execution-times=Remaining execution times +task-source-id=Task source id + +dashboard-succ-and-fail-pics=Success and failure num +dashboard-job-type-pics=Job type +dashboard-job-task-running-pics=Job and task running num +dashboard-import-jobs=Import jobs num +job-info-for-one-minute=Job info for one minute +job-info-for-one-hour=Job info for one hour +job-info-for-one-week=Job info for one week +job-success-count=Job success count +job-failure-count=Job failure count +task-running-count=Task running count +job-running-count=Job running count +highchart-tooltip-info1=Mouse drag can be scaled +highchart-tooltip-info2=Gesture operations are scaled + +placeholder-app-name=App name +placeholder-bootstrap-script=bootstrap-script,eg：bin//start.sh。 +placeholder-app-url=Path must be accessed through the network,eg：http://file_host:8080/your-job.tar.gz +placeholder-job-name=Job name +placeholder-job-app-name=The application name of the job must be registered in the application +placeholder-job-class=The job class needs to implement the ElasticJob interface, which does not require configuration +placeholder-cron=The cron expression for the job start time. eg: 0/5 * * *? +placeholder-sharding-total-count=Job sharding total count +placeholder-job-parameter=Job customization parameters, can by passing this parameter for job scheduling the business method of ginseng, eg: take parameters job every time for the amount of data read from the database and operation instance of the primary key. +placeholder-cpu-count=The minimum number of cpus required for a single operation is 0.001 +placeholder-job-memory=The memory MB required for a single piece of work is a minimum of 1 +placeholder-bean-name=The bean name configured in the Spring container +placeholder-failover=The failure transfer can be turned on only if the monitoring job is executed +placeholder-misfire=Whether the task is open misses the reexecution +placeholder-streaming-process=DATAFLOW type operation, whether if flow processing data flow processing data, the fetchData returns an empty result will not perform the operation, if the flow processing data, processing data after the completion of the work end. +placeholder-application-context=Spring configure the Spring configuration file relative path and name, eg: META-INF\\applicationContext.xml +placeholder-sharding-item-parameters=Separate serial Numbers and parameters are separated by equals, and multiple key values are separated by commas, similar to map. The serial serial Numbers start from 0, not greater than or equal to the total number of assignments. eg: 0 = a, 1 = b, 2 = c +placeholder-script-command-line=SCRIPT type job command line + +operation=Operation +operation-add=Add +operation-submit=Submit +operation-close=Close +operation-delete=Delete +operation-reset=Reset +operation-reset-scaling=Reset scaling +operation-enable=Enable +operation-disable=Disable + +status=Status +status-running=Running +status-staging=Staging +status-task-failed=Failed +status-task-finished=Finished +status-task-error=Error +status-task-killed=Killed + +start-time=Start time +end-time=End time +failure-reason=Failure reason +comments=Comments + +execute-result=Execute result +execute-result-all=All +execute-result-success=success +execute-result-failure=failure +execute-result-null=Null +execute-source=Execute source +execute-type=Execute type +remaining-execute-times=Remaining execute times + +confirm-to-close=Are you sure to close it? +confirm-to-delete=Confirm that you want to delete the application? Deleting the application also deletes the associated jobs. +operation-succeed=Operation complete successfully +confirm-to-delete-job=Confirm that you want to delete the job? diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_zh.properties b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_zh.properties new file mode 100644 index 0000000000..32fd53c27f --- /dev/null +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/i18n/message_zh.properties @@ -0,0 +1,169 @@ +sidebar-app=应用 +sidebar-defination=定义 +sidebar-job=作业 +sidebar-status=状态 +sidebar-job-history=作业历史 +sidebar-job-dashboard=历史dashboard +sidebar-job-execute-details=作业运行轨迹 +sidebar-job-execute-status=作业运行状态 + +switch-language=选择语言 +language-zh=中文 +language-en=English + +dangdang=当当网 + +switch-theme-title=更改主题 +switch-theme-blue=蓝色 +switch-theme-white=白色 +switch-theme-purple=紫色 +switch-theme-green=绿色 +switch-theme-yellow=黄色 +switch-theme-red=红色 +switch-theme-blue-light=蓝色高亮 +switch-theme-white-light=白色高亮 +switch-theme-purple-light=紫色高亮 +switch-theme-green-light=绿色高亮 +switch-theme-yellow-light=黄色高亮 +switch-theme-red-light=红色高亮 + +app-name=应用名称 +app-bootstrap-script=启动脚本 +app-cpu-count=CPU数量 +app-memory=应用内存(M) +app-event-trace-sampling-count=作业事件采样次数(Daemon) +app-cache-enable=本地缓存应用 +app-url=应用所在路径 +app-detail=应用详情 +update-app=修改应用 +add-app=添加应用 +app-name-not-null=应用名称不能为空 +app-name-length-limit=应用名称长度不能超过100字符大小 +app-name-exists=应用已经注册 +app-bootstrap-script-not-null=启动脚本不能为空 +app-cpu-count-not-null=cpu数量不能为空 +app-cpu-count-regexp-limit=cpu数量只能包含数字和小数点 +app-memory-not-null=单片内存不能为空 +event-trace-sampling-count-not-null=作业事件采样次数(Daemon)不能为空 +app-url-not-null=应用所在路径不能为空 +app-name-unregistered=应用未注册 +app-disabled=作业对应的应用已失效，操作失败 + +add-job=添加作业 +job-detail=作业详情 +update-job=修改作业 +job-name=作业名称 +job-execution-type=执行类型 +job-type=作业类型 +job-class=作业实现类 +job-cron=Cron表达式 +job-sharding-total-count=作业分片总数 +job-parameter=自定义参数 +job-cpu-count=CPU数量 +job-memory=单片作业内存 +job-bean-name=实体名称 +job-failover=支持自动失效转移 +job-misfire=支持错过重执行 +job-streaming-process=是否流式处理数据 +job-application-context=Spring配置文件相对路径及名称 +job-sharding-item-parameters=分片序列号/参数对照表 +job-script-command-line=脚本作业全路径 +job-description=作业描述信息 +job-status=作业状态 +job-sharding-item=分片项 +job-spring-type-settings=Spring方式配置 +job-application-context-info=请填写Spring配置文件相对路径及名称 +job-bean-name-info=请填写beanName名称 +job-class-not-null=作业实现类不能为空 +job-class-regexp-limit=作业实现类只能使用数字、字母、下划线(_)和点号(.) +job-name-not-null=作业名称不能为空 +job-name-length-limit=作业名称长度不能超过100字符大小 +job-name-exists=作业名称已经注册 +job-cron-length-limit=cron表达式不能超过40字符大小 +job-cron-not-null=cron表达式不能为空 +job-cpu-count-not-null=cpu数量不能为空 +job-cpu-count-regexp-limit=cpu数量只能包含数字和小数点 +job-memory-not-null=单片作业内存不能为空 +job-sharding-count-not-null=分片数量不能为空 +job-script-command-line-not-null=SCRIPT类型作业命令行执行脚本不能为空 +job-sharding-item-parameters-regexp-limit=作业分片项格式不正确, 格式: 0=xx,1=yy + +tab-running-tasks=运行任务 +tab-ready-jobs=待运行作业 +tab-failover-tasks=待失效转移任务 + +task-id=任务id +task-name=任务名称 +server-ip=服务器IP +remaining-execution-times=剩余执行次数 +task-source-id=原任务ID + +dashboard-succ-and-fail-pics=作业成功/失败数 +dashboard-job-type-pics=作业分类 +dashboard-job-task-running-pics=作业/任务运行数 +dashboard-import-jobs=接入平台作业数 +job-info-for-one-minute=一分钟作业情况 +job-info-for-one-hour=一小时作业情况 +job-info-for-one-week=一周作业情况 +job-success-count=作业成功数 +job-failure-count=作业失败数 +task-running-count=任务运行数 +job-running-count=作业运行数 +highchart-tooltip-info1=鼠标拖动可以进行缩放 +highchart-tooltip-info2=手势操作进行缩放 + +placeholder-app-name=应用名称 +placeholder-bootstrap-script=启动脚本，如：bin\\start.sh。 +placeholder-app-url=必须是可以通过网络访问到的路径。如：http://file_host:8080/your-job.tar.gz +placeholder-job-name=作业名称 +placeholder-job-app-name=作业所在的应用名称，必须是在应用中已注册。 +placeholder-job-class=作业实现类，需实现ElasticJob接口，脚本型作业不需要配置 +placeholder-cron=作业启动时间的cron表达式。如：0/5 * * * * ? +placeholder-sharding-total-count=作业分片总数 +placeholder-job-parameter=作业自定义参数，可通过传递该参数为作业调度的业务方法传参，用于实现带参数的作业例：每次获取的数据量、作业实例从数据库读取的主键。 +placeholder-cpu-count=单片作业所需要的CPU数量，最小值为0.001 +placeholder-job-memory=单片作业所需要的内存MB，最小值为1 +placeholder-bean-name=Spring容器中配置的bean名称 +placeholder-failover=只有开启监控作业执行时状态的情况下才可以开启失效转移 +placeholder-misfire=是否开启任务错过重新执行 +placeholder-streaming-process=DATAFLOW类型作业，是否流式处理数据如果流式处理数据, 则fetchData不返回空结果将持续执行作业，如果非流式处理数据, 则处理数据完成后作业结束。 +placeholder-application-context=Spring方式配置Spring配置文件相对路径以及名称，如：META-INF\\applicationContext.xml +placeholder-sharding-item-parameters=分片序列号和参数用等号分隔，多个键值对用逗号分隔，类似map。分片序列号从0开始，不可大于或等于作业分片总数。如：0=a,1=b,2=c +placeholder-script-command-line=SCRIPT类型作业命令行执行脚本 + +operation=操作 +operation-add=添加 +operation-submit=确认 +operation-close=关闭 +operation-delete=删除 +operation-reset=重置 +operation-reset-scaling=重置缩放比例 +operation-enable=生效 +operation-disable=失效 + +status=状态 +status-running=运行中 +status-staging=等待运行 +status-task-failed=运行失败 +status-task-finished=已完成 +status-task-error=启动失败 +status-task-killed=主动终止 + +start-time=开始时间 +end-time=结束时间 +failure-reason=失败原因 +comments=备注 + +execute-result=执行结果 +execute-result-all=全部 +execute-result-success=成功 +execute-result-failure=失败 +execute-result-null=空 +execute-source=执行来源 +execute-type=任务来源 +remaining-execute-times=剩余执行次数 + +confirm-to-close=确认要关闭吗? +confirm-to-delete=确认要删除该应用吗？删除应用同时会删除关联作业。 +operation-succeed=操作已成功完成 +confirm-to-delete-job=确认要删除该作业吗？ 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 index b9e56510b6..f905011acc 100644 --- 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 @@ -13,6 +13,7 @@ + @@ -35,6 +36,13 @@
    • +
  • + +
      +
      • +
      • +
    +
    • @@ -44,48 +52,48 @@
    -
    +
    - Copyright © 2004-2017 当当网. All rights reserved. + Copyright © 2004-2017 . All rights reserved.
    -

    紫色

    +

  • @@ -133,7 +141,7 @@

    更换主题皮肤

    • -

    绿色

    +

  • @@ -145,7 +153,7 @@

    更换主题皮肤

    • -

    黄色

    +

  • @@ -157,7 +165,7 @@

    更换主题皮肤

    • -

    红色

    +

  • @@ -169,7 +177,7 @@

    更换主题皮肤

    • -

    蓝色高亮

    +

  • @@ -181,7 +189,7 @@

    更换主题皮肤

    • -

    白色高亮

    +

  • @@ -193,7 +201,7 @@

    更换主题皮肤

    • -

    紫色高亮

    +

  • @@ -205,7 +213,7 @@

    更换主题皮肤

    • -

    绿色高亮

    +

  • @@ -217,7 +225,7 @@

    更换主题皮肤

    • -

    黄色高亮

    +

  • @@ -229,7 +237,7 @@

    更换主题皮肤

    • -

    红色高亮

    +

    @@ -239,10 +247,10 @@

    更换主题皮肤

    -

    操作已成功完成

    +

    - +
    @@ -254,7 +262,7 @@

    更换主题皮肤

    - +
    @@ -263,10 +271,10 @@
    -

    作业对应的应用已失效，操作失败

    +

    - +
    diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/app_common.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/app_common.js index b3e6fc9b32..a0d99374d7 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/app_common.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/app_common.js @@ -10,14 +10,14 @@ function validate() { appName: { validators: { notEmpty: { - message: "应用名称不能为空" + message: $.i18n.prop("app-name-not-null") }, stringLength: { max: 100, - message: "应用名称长度不能超过100字符大小" + message: $.i18n.prop("app-name-length-limit") }, callback: { - message: "应用已经注册", + message: $.i18n.prop("app-name-exists"), callback: function() { var appName = $("#app-name").val(); var result = true; @@ -39,39 +39,39 @@ function validate() { bootstrapScript: { validators: { notEmpty: { - message: "启动脚本不能为空" + message: $.i18n.prop("app-bootstrap-script-not-null") } } }, cpuCount: { validators: { notEmpty: { - message: "cpu数量不能为空" + message: $.i18n.prop("app-cpu-count-not-null") }, regexp: { regexp: /^(-?\d+)(\.\d+)?$/, - message: "cpu数量只能包含数字和小数点" + message: $.i18n.prop("app-cpu-count-regexp-limit") } } }, appMemory: { validators: { notEmpty: { - message: "单片内存不能为空" + message: $.i18n.prop("app-memory-not-null") } } }, eventTraceSamplingCount: { validators: { notEmpty: { - message: "作业事件采样次数(Daemon)不能为空" + message: $.i18n.prop("event-trace-sampling-count-not-null") } } }, appURL: { validators: { notEmpty: { - message: "应用所在路径不能为空" + message: $.i18n.prop("app-url-not-null") } } } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/apps_overview.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/apps_overview.js index 229abe60de..0c1cdb5fcf 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/apps_overview.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/app/apps_overview.js @@ -3,7 +3,10 @@ $(function() { renderAppOverview(); $("#add-app").click(function() { $(".box-body").remove(); - $("#add-app-body").load("html/app/add_app.html"); + $("#add-app-body").load("html/app/add_app.html", null, function() { + doLocale(); + tooltipLocale(); + }); $("#data-add-app").modal({backdrop: "static", keyboard: true}); }); bindDetailAppButton(); @@ -16,39 +19,23 @@ $(function() { function renderAppOverview() { var jsonData = { url: "/api/app/list", - cache: false, - columns: - [{ - field: "appName", - title: "应用名称", - sortable: "true" - }, { - field: "appURL", - title: "应用下载路径", - sortable: "true" - }, { - field: "bootstrapScript", - title: "启动脚本", - sortable: "true" - }, { - field: "operation", - title: "操作", - formatter: "operationApp" - }] + cache: false }; $("#app-table").bootstrapTable({ columns: jsonData.columns, url: jsonData.url, cache: jsonData.cache + }).on("all.bs.table", function() { + doLocale(); }); } function operationApp(val, row) { - var detailButton = ""; - var modifyButton = ""; - var deleteButton = ""; - var enableButton = ""; - var disableButton = ""; + var detailButton = ""; + var modifyButton = ""; + var deleteButton = ""; + var enableButton = ""; + var disableButton = ""; var operationId = detailButton + " " + modifyButton +" " + deleteButton; if(selectAppStatus(row.appName)) { operationId = operationId + " " + enableButton; @@ -69,6 +56,8 @@ function bindDetailAppButton() { if (null !== result) { $(".box-body").remove(); $("#detail-app-body").load("html/app/detail_app.html", null, function() { + doLocale(); + tooltipLocale(); renderApp(result); $("#data-detail-app").modal({backdrop : "static", keyboard : true}); $("#close-button").on("click", function() { @@ -91,6 +80,8 @@ function bindModifyAppButton() { if(null !== result) { $(".box-body").remove(); $("#update-app-body").load("html/app/modify_app.html", null, function() { + doLocale(); + tooltipLocale(); renderApp(result); $("#data-update-app").modal({backdrop : "static", keyboard : true}); }); 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 index c31a31eaf6..18e0ae3013 100644 --- 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,45 @@ function authorityControl() { } }); } + +function i18n(lang) { + jQuery.i18n.properties({ + name : 'message', + path : '/i18n/', + mode : 'map', + language : lang, + cache: true, + encoding: 'UTF-8', + callback : function() { + for (var i in $.i18n.map) { + $('[data-lang="'+i+'"]').html($.i18n.prop(i)); + } + } + }); +} + +function doLocale() { + if ($("#content-right").hasClass("lang-en")) { + i18n("en"); + } else { + i18n("zh"); + } +} + +function switchLanguage() { + $("#lang-zh").click(function() { + $("#content-right").removeClass("lang-en").addClass("lang-zh"); + doLocale(); + }); + $("#lang-en").click(function() { + $("#content-right").removeClass("lang-zh").addClass("lang-en"); + doLocale(); + }); +} + +function tooltipLocale(){ + for (var i = 0; i < $("[data-toggle='tooltip']").length; i++) { + var object = $("[data-toggle='tooltip']")[i]; + $(object).attr('title',$.i18n.prop("placeholder-" + object.getAttribute("id"))).tooltip('fixTitle'); + } +} diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_dashboard.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_dashboard.js index 13c9abbdee..eb25bbdd77 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_dashboard.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_dashboard.js @@ -1,14 +1,31 @@ $(function() { + doLocale(); renderPieChartSinceLastMinuteData(); renderPieChartSinceLastHourData(); renderPieChartSinceLastWeekData(); renderJobTypePieChart(); renderJobExecutionTypePieChart(); - renderStasticsJobsLineChart(); + renderStaticsJobsLineChart(); renderRunningJobsAndTasksLineChart(); renderRegisteredJobs(); }); +function doLocale() { + if ($("#content-right").hasClass("lang-en")) { + i18n("en"); + } else { + i18n("zh"); + } + renderPieChartSinceLastMinuteData(); + renderPieChartSinceLastHourData(); + renderPieChartSinceLastWeekData(); + renderJobTypePieChart(); + renderJobExecutionTypePieChart(); + renderStaticsJobsLineChart(); + renderRunningJobsAndTasksLineChart(); + renderRegisteredJobs(); +} + function renderPieChartSinceLastMinuteData() { $.ajax({ url: "/api/job/statistics/tasks/results/lastMinute", @@ -17,8 +34,8 @@ function renderPieChartSinceLastMinuteData() { if(null !== jobData) { var chartName = "#total-jobs-lastMinute"; var color = ["rgb(144,237,125)","red"]; - var jobResult = [["成功", jobData.successCount], ["失败", jobData.failedCount]]; - renderPieChart(chartName, "一分钟作业情况", color, jobResult); + var jobResult = [[$.i18n.prop("execute-result-success"), jobData.successCount], [$.i18n.prop("execute-result-failure"), jobData.failedCount]]; + renderPieChart(chartName, $.i18n.prop("job-info-for-one-minute"), color, jobResult); } } }); @@ -32,8 +49,8 @@ function renderPieChartSinceLastHourData() { if(null !== jobData) { var chartName = "#total-jobs-lastHour"; var color = ["rgb(144,237,125)", "red"]; - var jobResult = [["成功", jobData.successCount], ["失败", jobData.failedCount]]; - renderPieChart(chartName, "一小时作业情况", color, jobResult); + var jobResult = [[$.i18n.prop("execute-result-success"), jobData.successCount], [$.i18n.prop("execute-result-failure"), jobData.failedCount]]; + renderPieChart(chartName, $.i18n.prop("job-info-for-one-hour"), color, jobResult); } } }); @@ -47,8 +64,8 @@ function renderPieChartSinceLastWeekData() { if(null !== jobData) { var chartName = "#total-jobs-weekly"; var color = ["rgb(144,237,125)", "red"]; - var jobResult = [["成功", jobData.successCount], ["失败", jobData.failedCount]]; - renderPieChart(chartName, "一周作业情况", color, jobResult); + var jobResult = [[$.i18n.prop("execute-result-success"), jobData.successCount], [$.i18n.prop("execute-result-failure"), jobData.failedCount]]; + renderPieChart(chartName, $.i18n.prop("job-info-for-one-week"), color, jobResult); } } }); @@ -63,7 +80,7 @@ function renderJobTypePieChart() { var chartName = "#job-type"; var color = ["rgb(144, 237, 125)", "rgb(247, 163, 92)", "rgb(67, 67, 72)"]; var jobResult = [["DATAFLOW", jobData.dataflowJobCount], ["SIMPLE", jobData.simpleJobCount], ["SCRIPT", jobData.scriptJobCount]]; - renderPieChart(chartName, '作业类型', color, jobResult); + renderPieChart(chartName, $.i18n.prop("job-type"), color, jobResult); } } }); @@ -78,13 +95,13 @@ function renderJobExecutionTypePieChart() { var chartName = "#job-execution-type"; var color = ["rgb(144, 237, 125)", "rgb(124, 181, 236)"]; var jobResult = [["TRANSIENT", jobData.transientJobCount], ["DAEMON", jobData.daemonJobCount]]; - renderPieChart(chartName, "作业执行类型", color, jobResult); + renderPieChart(chartName, $.i18n.prop("job-execution-type"), color, jobResult); } } }); } -function renderStasticsJobsLineChart() { +function renderStaticsJobsLineChart() { $.ajax({ url: "/api/job/statistics/tasks/results?since=last24hours", dataType: "json", @@ -98,8 +115,8 @@ function renderStasticsJobsLineChart() { successData.push([dateTime, jobData[i].successCount]); failData.push([dateTime, jobData[i].failedCount]); } - var resultData = [{type: "spline", name: "作业成功数", data: successData}, {type: "spline", name: "作业失败数", data: failData}]; - renderLineChart(chartName, "作业成功/失败数", resultData); + var resultData = [{type: "spline", name: $.i18n.prop("job-success-count"), data: successData}, {type: "spline", name: $.i18n.prop("job-failure-count"), data: failData}]; + renderLineChart(chartName, $.i18n.prop("dashboard-succ-and-fail-pics"), resultData); } } }); @@ -126,8 +143,8 @@ function renderRunningJobsAndTasksLineChart() { var dateTime = new Date(taskData[i].statisticsTime).getTime() + 1000 * 60 * 60 * 8; taskRunningData.push([dateTime, taskData[i].runningCount]); } - var resultData = [{type: "spline", name: "任务运行数", data: taskRunningData}, {type: "spline", name: "作业运行数", data: jobRunningData}]; - renderLineChart(chartName, "作业/任务运行数", resultData); + var resultData = [{type: "spline", name: $.i18n.prop("task-running-count"), data: taskRunningData}, {type: "spline", name: $.i18n.prop("task-running-count"), data: jobRunningData}]; + renderLineChart(chartName, $.i18n.prop("dashboard-job-task-running-pics"), resultData); } } }); @@ -147,8 +164,8 @@ function renderRegisteredJobs() { var dateTime = new Date(jobData[i].statisticsTime).getTime() + 1000 * 60 * 60 * 8; registerData.push([dateTime, jobData[i].registeredCount]); } - var resultData = [{ type: "spline", name: "接入作业数", data: registerData}]; - renderLineChart(chartName, "接入平台作业数", resultData); + var resultData = [{ type: "spline", name: $.i18n.prop("dashboard-import-jobs"), data: registerData}]; + renderLineChart(chartName, $.i18n.prop("dashboard-import-jobs"), resultData); } } }); @@ -177,7 +194,7 @@ function renderPieChart(chartName, title, color, jobData) { colors: color, series: [{ type: "pie", - name: "作业", + name: $.i18n.prop("sidebar-job"), data: jobData }], credits: { @@ -189,8 +206,8 @@ function renderPieChart(chartName, title, color, jobData) { function renderLineChart(chartName, title, jobData) { Highcharts.setOptions({ lang: { - resetZoom: "重置", - resetZoomTitle: "重置缩放比例" + resetZoom: $.i18n.prop("operation-reset"), + resetZoomTitle: $.i18n.prop("operation-reset-scaling") } }); $(chartName).highcharts({ @@ -213,7 +230,7 @@ function renderLineChart(chartName, title, jobData) { text: title }, subtitle: { - text: document.ontouchstart === undefined ? "鼠标拖动可以进行缩放" : "手势操作进行缩放" + text: document.ontouchstart === undefined ? $.i18n.prop("highchart-tooltip-info1") : $.i18n.prop("highchart-tooltip-info2") }, tooltip: { shared: true, diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_details.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_details.js index d4176fc453..a6085f45da 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_details.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_details.js @@ -5,6 +5,9 @@ $(function() { $("#job-exec-details-table").bootstrapTable("refresh", {silent: true}); } }); + $("#job-exec-details-table").bootstrapTable().on("all.bs.table", function() { + doLocale(); + }); }); function queryParams(params) { @@ -28,11 +31,11 @@ function successFormatter(value) { switch(value) { case true: - return "成功"; + return ""; case false: - return "失败"; + return ""; default: - return "空"; + return ""; } } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_status.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_status.js index 9c064ed492..20e5b9902f 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_status.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_status.js @@ -4,6 +4,9 @@ $(function() { $("#job-exec-status-table").bootstrapTable("refresh", {silent: true}); } }); + $("#job-exec-status-table").bootstrapTable().on("all.bs.table", function() { + doLocale(); + }); }); function queryParams(params) { @@ -45,17 +48,17 @@ function stateFormatter(value) { switch(value) { case "TASK_STAGING": - return "等待运行"; + return ""; case "TASK_FAILED": - return "运行失败"; + return ""; case "TASK_FINISHED": - return "已完成"; + return ""; case "TASK_RUNNING": - return "运行中"; + return ""; case "TASK_ERROR": - return "启动失败"; + return ""; case "TASK_KILLED": - return "主动终止"; + return ""; default: return "-"; } 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 index 977a8e3c77..ae508bc6d1 100644 --- 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 @@ -9,7 +9,11 @@ $(function() { $("#content-right").load("/html/job/jobs_overview.html"); }); $("#status").click(function() { - $("#content-right").load("/html/job/job_status.html"); + $("#content-right").load("/html/job/job_status.html", null, function(){ + $("table").bootstrapTable().on("all.bs.table", function() { + doLocale(); + }); + }); }); $("#dashboard").click(function() { $("#content-right").load("/html/history/job_dashboard.html"); @@ -20,4 +24,5 @@ $(function() { $("#exec-status").click(function() { $("#content-right").load("/html/history/job_exec_status.html"); }); + switchLanguage(); }); diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js index d3ef0efe14..0f3a962968 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/job_common.js @@ -10,11 +10,11 @@ function validate() { jobClass: { validators: { notEmpty: { - message: "作业实现类不能为空" + message: $.i18n.prop("job-class-not-null") }, regexp: { regexp: /^[\w\.]+$/, - message: "作业实现类只能使用数字、字母、下划线(_)和点号(.)" + message: $.i18n.prop("job-class-regexp-limit") } } }, @@ -22,18 +22,18 @@ function validate() { jobNameCheck: true, validators: { notEmpty: { - message: "作业名称不能为空" + message: $.i18n.prop("job-name-not-null") }, stringLength: { max: 100, - message: "作业名称长度不能超过100字符大小" + message: $.i18n.prop("job-name-length-limit") }, callback: { - message: "作业名称已经注册", + message: $.i18n.prop("job-name-exists"), callback: function () { var jobName = $("#job-name").val(); var result = true; - if ("" !== appName) { + if ("" !== jobName) { $.ajax({ url: "/api/job/jobs/" + jobName, contentType: "application/json", @@ -53,7 +53,7 @@ function validate() { jobAppName: { validators: { callback: { - message: "应用未注册", + message: $.i18n.prop("app-name-unregistered"), callback: function (validator) { var appName = $("#job-app-name").val(); var result = false; @@ -76,35 +76,35 @@ function validate() { validators: { stringLength: { max: 40, - message: "cron表达式不能超过40字符大小" + message: $.i18n.prop("job-cron-length-limit") }, notEmpty: { - message: "cron表达式不能为空" + message: $.i18n.prop("job-cron-not-null") } } }, cpuCount: { validators: { notEmpty: { - message: "cpu数量不能为空" + message: $.i18n.prop("job-cpu-count-not-null") }, regexp: { regexp: /^(-?\d+)(\.\d+)?$/, - message: "cpu数量只能包含数字和小数点" + message: $.i18n.prop("job-cpu-count-regexp-limit") } } }, jobMemory: { validators: { notEmpty: { - message: "单片作业内存不能为空" + message: $.i18n.prop("job-memory-not-null") } } }, shardingTotalCount: { validators: { notEmpty: { - message: "分片数不能为空" + message: $.i18n.prop("job-sharding-count-not-null") } } }, @@ -119,7 +119,7 @@ function validate() { scriptCommandLine: { validators: { notEmpty: { - message: "SCRIPT类型作业命令行执行脚本不能为空" + message: $.i18n.prop("job-script-command-line-not-null") } } }, @@ -127,7 +127,7 @@ function validate() { validators: { regexp: { regexp: /^(\d+)=(\w+)(,(\d+)=(\w+))*$/, - message: "作业分片项格式不正确, 格式: 0=xx,1=yy" + message: $.i18n.prop("job-sharding-item-parameters-regexp-limit") } } } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js index 59185cdbd2..6138baf26a 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/job/jobs_overview.js @@ -3,7 +3,10 @@ $(function() { renderJobOverview(); $("#add-job").click(function() { $(".box-body").remove(); - $("#add-job-body").load("html/job/add_job.html"); + $("#add-job-body").load("html/job/add_job.html", null, function() { + doLocale(); + tooltipLocale(); + }); $("#data-add-job").modal({backdrop : "static", keyboard : true}); }); bindDetailJobButton(); @@ -16,47 +19,23 @@ $(function() { function renderJobOverview() { var jsonData = { url: "/api/job/jobs", - cache: false, - columns: - [{ - field: "jobName", - title: "作业名", - sortable: "true" - }, { - field: "appName", - title: "应用名", - sortable: "true" - }, { - field: "jobClass", - title: "作业实现类", - sortable: "true" - }, { - field: "shardingTotalCount", - title: "分片总数", - sortable: "true" - }, { - field: "cron", - title: "cron表达式", - sortable: "true" - }, { - field: "operation", - title: "操作", - formatter: "operationJob" - }] + cache: false }; $("#job-table").bootstrapTable({ columns: jsonData.columns, url: jsonData.url, cache: jsonData.cache + }).on("all.bs.table", function() { + doLocale(); }); } function operationJob(val, row) { - var detailButton = ""; - var modifyButton = ""; - var deleteButton = ""; - var enableButton = ""; - var disableButton = ""; + var detailButton = ""; + var modifyButton = ""; + var deleteButton = ""; + var enableButton = ""; + var disableButton = ""; var operationId = detailButton + " " + modifyButton +" " + deleteButton; if(selectJobStatus(row.jobName)) { operationId = operationId + " " + enableButton; @@ -96,6 +75,8 @@ function bindDetailJobButton() { $("#bootstrap-script-div").hide(); } renderJob(result); + doLocale(); + tooltipLocale(); $("#data-detail-job").modal({backdrop : "static", keyboard : true}); $("#close-button").on("click", function(){ $("#data-detail-job").modal("hide"); @@ -143,6 +124,8 @@ function bindModifyJobButton() { if (null !== result) { $(".box-body").remove(); $("#update-job-body").load("html/job/modify_job.html", null, function() { + doLocale(); + tooltipLocale(); $('#data-update-job').modal({backdrop : "static", keyboard : true}); renderJob(result); }); diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/lib/jQuery/jquery.i18n.properties-min.js b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/lib/jQuery/jquery.i18n.properties-min.js new file mode 100644 index 0000000000..059b4906da --- /dev/null +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/lib/jQuery/jquery.i18n.properties-min.js @@ -0,0 +1,9 @@ +(function(k){function n(c,a){k.ajax({url:c,async:!1,cache:a.cache,contentType:"text/plain;charset="+a.encoding,dataType:"text",success:function(b){r(b,a.mode)}})}function r(c,a){for(var b="",e=c.split(/\n/),d=/(\{\d+\})/g,q=/\{(\d+)\}/g,m=/(\\u.{4})/ig,f=0;f0&&e[f].match("^#")!="#"){var g=e[f].split("=");if(g.length>0){for(var o=unescape(g[0]).replace(/^\s\s*/,"").replace(/\s\s*$/,""),h=g.length==1?"":g[1];h.match(/\\$/)== +"\\";)h=h.substring(0,h.length-1),h+=e[++f].replace(/\s\s*$/,"");for(var l=2;l0&&(a+="."),a+=c[b],eval("typeof "+a+' == "undefined"')&&eval(a+"={};")}function s(c){var a=[],c=parseInt(c.substr(2),16);c>=0&&c=2&&n(c.path+a[i]+"_"+c.language.substring(0,2)+".properties",c),c.language.length>=5&&n(c.path+a[i]+"_"+c.language.substring(0,5)+".properties",c);c.callback&&c.callback()};k.i18n.prop=function(c){var a=k.i18n.map[c];if(a==null)return"["+ +c+"]";var b;if(typeof a=="string"){for(b=0;(b=a.indexOf("\\",b))!=-1;)a=a[b+1]=="t"?a.substring(0,b)+"\t"+a.substring(b++ +2):a[b+1]=="r"?a.substring(0,b)+"\r"+a.substring(b++ +2):a[b+1]=="n"?a.substring(0,b)+"\n"+a.substring(b++ +2):a[b+1]=="f"?a.substring(0,b)+"\u000c"+a.substring(b++ +2):a[b+1]=="\\"?a.substring(0,b)+"\\"+a.substring(b++ +2):a.substring(0,b)+a.substring(b+1);var e=[],d,j;for(b=0;b=0){var m=a.substring(0,b);m!=""&&e.push(m);e.push(j);b=0;a=a.substring(d+1)}else b=d+1;else b++;a!=""&&e.push(a);a=e;k.i18n.map[c]=e}if(a.length==0)return""; +if(a.lengh==1&&typeof a[0]=="string")return a[0];m="";for(b=0;b3&&(c=c.substring(0,3)+c.substring(3).toUpperCase());return c};var j;if(!j)j=function(c,a,b){if(Object.prototype.toString.call(a)!=="[object RegExp]")return typeof j._nativeSplit=="undefined"?c.split(a,b):j._nativeSplit.call(c, +a,b);var e=[],d=0,k=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.sticky?"y":""),a=RegExp(a.source,k+"g"),m,f,g;c+="";j._compliantExecNpcg||(m=RegExp("^"+a.source+"$(?!\\s)",k));if(b===void 0||+b<0)b=Infinity;else if(b=Math.floor(+b),!b)return[];for(;f=a.exec(c);){k=f.index+f[0].length;if(k>d&&(e.push(c.slice(d,f.index)),!j._compliantExecNpcg&&f.length>1&&f[0].replace(m,function(){for(var a=1;a1&&f.index=b))break;a.lastIndex===f.index&&a.lastIndex++}d===c.length?(g||!a.test(""))&&e.push(""):e.push(c.slice(d));return e.length>b?e.slice(0,b):e},j._compliantExecNpcg=/()??/.exec("")[1]===void 0,j._nativeSplit=String.prototype.split;String.prototype.split=function(c,a){return j(this,c,a)}})(jQuery); \ No newline at end of file