You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/16 15:46:18 UTC
[shardingsphere-elasticjob] branch master updated: Update overview
and quick-start (#1091)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new be7b19d Update overview and quick-start (#1091)
be7b19d is described below
commit be7b19d285117f76e1f6b05463419f34fd888191
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jul 16 23:46:11 2020 +0800
Update overview and quick-start (#1091)
* Update readme
* Update lite quick-start
* Update cloud quick-start
---
README.md | 6 +++---
README_ZH.md | 2 +-
docs/content/overview/_index.cn.md | 2 +-
docs/content/overview/_index.en.md | 6 +++---
docs/content/quick-start/elasticjob-cloud.cn.md | 8 ++++----
docs/content/quick-start/elasticjob-cloud.en.md | 6 +++---
docs/content/quick-start/elasticjob-lite.cn.md | 4 ++--
docs/content/quick-start/elasticjob-lite.en.md | 2 +-
.../elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java | 2 +-
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index b247d26..5dcfbb5 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
[![Stargazers over time](https://starchart.cc/apache/shardingsphere-elasticjob.svg)](https://starchart.cc/apache/shardingsphere-elasticjob)
-ElasticJob is a distributed scheduling solution consisting of two separate projects, Lite and Cloud.
+ElasticJob is a distributed scheduling solution consisting of two separate projects, ElasticJob-Lite and ElasticJob-Cloud.
-Elasticjob uses a unified job API for each product.
+It uses a unified job API for each project.
Developers only need code one time and can deploy at will.
ElasticJob became an [Apache ShardingSphere](https://shardingsphere.apache.org/) Sub-project on May 28 2020.
@@ -31,7 +31,7 @@ A lightweight, decentralized solution that provides distributed task sharding se
### ElasticJob-Cloud
-A Mesos framework which use Mesos + Docker(todo) to manage and isolate resources and processes.
+Uses Mesos to manage and isolate resources.
![ElasticJob-Cloud Architecture](https://shardingsphere.apache.org/elasticjob/current/img/architecture/elasticjob_cloud.png)
diff --git a/README_ZH.md b/README_ZH.md
index f346029..b33a90a 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -29,7 +29,7 @@ ElasticJob 已于 2020 年 5 月 28 日成为 [Apache ShardingSphere](https://sh
### ElasticJob-Cloud
-使用 Mesos + Docker(TODO)的解决方案,额外提供资源治理、应用分发以及进程隔离等服务。
+使用 Mesos 的解决方案,额外提供资源治理、应用分发以及进程隔离等服务。
![ElasticJob-Cloud Architecture](https://shardingsphere.apache.org/elasticjob/current/img/architecture/elasticjob_cloud.png)
diff --git a/docs/content/overview/_index.cn.md b/docs/content/overview/_index.cn.md
index dbe8e10..0991b5b 100644
--- a/docs/content/overview/_index.cn.md
+++ b/docs/content/overview/_index.cn.md
@@ -36,7 +36,7 @@ ElasticJob 已于 2020 年 5 月 28 日成为 [Apache ShardingSphere](https://sh
### ElasticJob-Cloud
-使用 Mesos + Docker(TODO)的解决方案,额外提供资源治理、应用分发以及进程隔离等服务。
+使用 Mesos 的解决方案,额外提供资源治理、应用分发以及进程隔离等服务。
![ElasticJob-Cloud Architecture](https://shardingsphere.apache.org/elasticjob/current/img/architecture/elasticjob_cloud.png)
diff --git a/docs/content/overview/_index.en.md b/docs/content/overview/_index.en.md
index 5093f02..c376324 100644
--- a/docs/content/overview/_index.en.md
+++ b/docs/content/overview/_index.en.md
@@ -11,9 +11,9 @@ chapter = true
[![GitHub watchers](https://img.shields.io/github/watchers/apache/shardingsphere-elasticjob.svg?style=social&label=Watch)](https://github.com/apache/shardingsphere-elasticjob/watchers)
[![Stargazers over time](https://starchart.cc/apache/shardingsphere-elasticjob.svg)](https://starchart.cc/apache/shardingsphere-elasticjob)
-ElasticJob is a distributed scheduling solution consisting of two separate projects, Lite and Cloud.
+ElasticJob is a distributed scheduling solution consisting of two separate projects, ElasticJob-Lite and ElasticJob-Cloud.
-Elasticjob uses a unified job API for each product.
+It uses a unified job API for each project.
Developers only need code one time and can deploy at will.
ElasticJob became an [Apache ShardingSphere](https://shardingsphere.apache.org/) Sub project on May 28 2020.
@@ -38,7 +38,7 @@ A lightweight, decentralized solution that provides distributed task sharding se
### ElasticJob-Cloud
-A Mesos framework which use Mesos + Docker(todo) to manage and isolate resources and processes.
+Uses Mesos to manage and isolate resources.
![ElasticJob-Cloud Architecture](https://shardingsphere.apache.org/elasticjob/current/img/architecture/elasticjob_cloud.png)
diff --git a/docs/content/quick-start/elasticjob-cloud.cn.md b/docs/content/quick-start/elasticjob-cloud.cn.md
index 8251020..a067c61 100644
--- a/docs/content/quick-start/elasticjob-cloud.cn.md
+++ b/docs/content/quick-start/elasticjob-cloud.cn.md
@@ -5,7 +5,7 @@ weight = 2
chapter = true
+++
-## 引入 maven 依赖
+## 引入 Maven 依赖
```xml
<dependency>
@@ -40,7 +40,7 @@ public class MyJob implements SimpleJob {
## 作业启动
-需定义 `Main` 方法并调用 `JobBootstrap.execute()`,例子如下:
+需定义 `main` 方法并调用 `JobBootstrap.execute()`,例子如下:
```java
public class MyJobDemo {
@@ -60,11 +60,11 @@ tar -cvf my-job.tar.gz my-job
## 作业发布
```bash
-curl -l -H "Content-type: application/json" -X POST -d '{"appName":"foo_app","appURL":"http://app_host:8080/my-job.tar.gz","cpuCount":0.1,"memoryMB":64.0,"bootstrapScript":"bin/start.sh","appCacheEnable":true,"eventTraceSamplingCount":0}' http://elasticjob_cloud_host:8899/api/app
+curl -l -H "Content-type: application/json" -X POST -d '{"appName":"my_app","appURL":"http://app_host:8080/my-job.tar.gz","cpuCount":0.1,"memoryMB":64.0,"bootstrapScript":"bin/start.sh","appCacheEnable":true,"eventTraceSamplingCount":0}' http://elasticjob_cloud_host:8899/api/app
```
## 作业调度
```bash
-curl -l -H "Content-type: application/json" -X POST -d '{"jobName":"foo_job","appName":"foo_app","jobExecutionType":"TRANSIENT","cron":"0/5 * * * * ?","shardingTotalCount":3,"cpuCount":0.1,"memoryMB":64.0}' http://elasticjob_cloud_host:8899/api/job/register
+curl -l -H "Content-type: application/json" -X POST -d '{"jobName":"my_job","appName":"my_app","jobExecutionType":"TRANSIENT","cron":"0/5 * * * * ?","shardingTotalCount":3,"cpuCount":0.1,"memoryMB":64.0}' http://elasticjob_cloud_host:8899/api/job/register
```
diff --git a/docs/content/quick-start/elasticjob-cloud.en.md b/docs/content/quick-start/elasticjob-cloud.en.md
index b0aefc2..df99c09 100644
--- a/docs/content/quick-start/elasticjob-cloud.en.md
+++ b/docs/content/quick-start/elasticjob-cloud.en.md
@@ -40,7 +40,7 @@ public class MyJob implements SimpleJob {
## Develop Job Bootstrap
-Define `Main` method and call `JobBootstrap.execute()`, example as follow:
+Define `main` method and call `JobBootstrap.execute()`, example as follow:
```java
public class MyJobDemo {
@@ -60,11 +60,11 @@ tar -cvf my-job.tar.gz my-job
## Publish Job
```bash
-curl -l -H "Content-type: application/json" -X POST -d '{"appName":"foo_app","appURL":"http://app_host:8080/my-job.tar.gz","cpuCount":0.1,"memoryMB":64.0,"bootstrapScript":"bin/start.sh","appCacheEnable":true,"eventTraceSamplingCount":0}' http://elasticjob_cloud_host:8899/api/app
+curl -l -H "Content-type: application/json" -X POST -d '{"appName":"my_app","appURL":"http://app_host:8080/my-job.tar.gz","cpuCount":0.1,"memoryMB":64.0,"bootstrapScript":"bin/start.sh","appCacheEnable":true,"eventTraceSamplingCount":0}' http://elasticjob_cloud_host:8899/api/app
```
## Schedule Job
```bash
-curl -l -H "Content-type: application/json" -X POST -d '{"jobName":"foo_job","appName":"foo_app","jobExecutionType":"TRANSIENT","cron":"0/5 * * * * ?","shardingTotalCount":3,"cpuCount":0.1,"memoryMB":64.0}' http://elasticjob_cloud_host:8899/api/job/register
+curl -l -H "Content-type: application/json" -X POST -d '{"jobName":"my_job","appName":"my_app","jobExecutionType":"TRANSIENT","cron":"0/5 * * * * ?","shardingTotalCount":3,"cpuCount":0.1,"memoryMB":64.0}' http://elasticjob_cloud_host:8899/api/job/register
```
diff --git a/docs/content/quick-start/elasticjob-lite.cn.md b/docs/content/quick-start/elasticjob-lite.cn.md
index b1642d1..697c16b 100644
--- a/docs/content/quick-start/elasticjob-lite.cn.md
+++ b/docs/content/quick-start/elasticjob-lite.cn.md
@@ -5,7 +5,7 @@ weight = 1
chapter = true
+++
-## 引入 maven 依赖
+## 引入 Maven 依赖
```xml
<dependency>
@@ -41,7 +41,7 @@ public class MyJob implements SimpleJob {
## 作业配置
```java
- JobConfiguration jobConfig = JobConfiguration.newBuilder("MyJob", 3).cron("0/5 * * * * ?").shardingItemParameters("0=Beijing,1=Shanghai,2=Guangzhou").build();
+ JobConfiguration jobConfig = JobConfiguration.newBuilder("MyJob", 3).cron("0/5 * * * * ?").build();
```
## 作业调度
diff --git a/docs/content/quick-start/elasticjob-lite.en.md b/docs/content/quick-start/elasticjob-lite.en.md
index 61af4d0..1c4653d 100644
--- a/docs/content/quick-start/elasticjob-lite.en.md
+++ b/docs/content/quick-start/elasticjob-lite.en.md
@@ -41,7 +41,7 @@ public class MyJob implements SimpleJob {
## Configure Job
```java
- JobConfiguration jobConfig = JobConfiguration.newBuilder("MyJob", 3).cron("0/5 * * * * ?").shardingItemParameters("0=Beijing,1=Shanghai,2=Guangzhou").build();
+ JobConfiguration jobConfig = JobConfiguration.newBuilder("MyJob", 3).cron("0/5 * * * * ?").build();
```
## Schedule Job
diff --git a/elasticjob-lite/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java b/elasticjob-lite/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java
index 22e547b..5638d32 100644
--- a/elasticjob-lite/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/boot/ElasticJobLiteAutoConfiguration.java
@@ -79,7 +79,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
}
throw new BeanCreationException(
"More than one [org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration] beans found. "
- + "Consider disabling [org.apache.shardingsphere.elasticjob.tracing.boot.ElasticjobTracingAutoConfiguration].");
+ + "Consider disabling [org.apache.shardingsphere.elasticjob.tracing.boot.ElasticJobTracingAutoConfiguration].");
}
private void registerClassedJobs(final ElasticJobProperties elasticJobProperties, final SingletonBeanRegistry beanFactory,