diff --git a/README-zh.md b/README-zh.md index 0ad60147..73bfc30d 100644 --- a/README-zh.md +++ b/README-zh.md @@ -30,25 +30,11 @@ 基于Golang的分布式爬虫管理平台,支持Python、NodeJS、Go、Java、PHP等多种编程语言以及多种爬虫框架。 -[查看演示 Demo](https://demo-pro.crawlab.cn) | [文档](https://docs.crawlab.cn) | [文档 (v0.6-beta)](https://docs-next.crawlab.cn) +[查看演示 Demo](https://demo-pro.crawlab.cn) | [文档](https://docs.crawlab.cn/zh/) ## 安装 -三种方式: -1. [Docker](http://docs.crawlab.cn/zh/Installation/Docker.html)(推荐) -2. [直接部署](http://docs.crawlab.cn/zh/Installation/Direct.html)(了解内核) -3. [Kubernetes](http://docs.crawlab.cn/zh/Installation/Kubernetes.html) (多节点部署) - -### 要求(Docker) -- Docker 18.03+ -- MongoDB 3.6+ -- Docker Compose 1.24+ (可选,但推荐) - -### 要求(直接部署) -- Go 1.15+ -- Node 12.20+ -- MongoDB 3.6+ -- [SeaweedFS](https://github.com/chrislusf/seaweedfs) 2.59+ +您可以参考这个[安装指南](https://docs.crawlab.cn/zh/guide/installation)。 ## 快速开始 @@ -109,7 +95,7 @@ services: - master mongo: - image: mongo:latest + image: mongo:4.2 container_name: crawlab_example_mongo restart: always ``` @@ -120,11 +106,7 @@ services: docker-compose up -d ``` -Docker部署的详情,请见[相关文档](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html)。 - -### 直接部署 - -请参考[相关文档](https://tikazyq.github.io/crawlab-docs/Installation/Direct.html)。 +Docker部署的详情,请见[相关文档](https://docs.crawlab.cn/zh/guide/installation/docker.html)。 ## 截图 diff --git a/README.md b/README.md index bb149cf1..5c455dc4 100644 --- a/README.md +++ b/README.md @@ -30,25 +30,11 @@ Golang-based distributed web crawler management platform, supporting various languages including Python, NodeJS, Go, Java, PHP and various web crawler frameworks including Scrapy, Puppeteer, Selenium. -[Demo](https://demo-pro.crawlab.cn) | [Documentation](https://docs.crawlab.cn) | [Documentation (v0.6-beta)](http://docs-next.crawlab.cn) +[Demo](https://demo-pro.crawlab.cn) | [Documentation](https://docs.crawlab.cn/en/) ## Installation -Three methods: -1. [Docker](http://docs.crawlab.cn/en/Installation/Docker.html) (Recommended) -2. [Direct Deploy](http://docs.crawlab.cn/en/Installation/Direct.html) (Check Internal Kernel) -3. [Kubernetes](http://docs.crawlab.cn/en/Installation/Kubernetes.html) (Multi-Node Deployment) - -### Pre-requisite (Docker) -- Docker 18.03+ -- MongoDB 3.6+ -- Docker Compose 1.24+ (optional but recommended) - -### Pre-requisite (Direct Deploy) -- Go 1.15+ -- Node 12.20+ -- MongoDB 3.6+ -- [SeaweedFS](https://github.com/chrislusf/seaweedfs) 2.59+ +You can follow the [installation guide](https://docs.crawlab.cn/en/guide/installation/). ## Quick Start @@ -60,7 +46,7 @@ cd examples/docker/basic docker-compose up -d ``` -Next, you can look into the `docker-compose.yml` (with detailed config params) and the [Documentation (Chinese)](http://docs.crawlab.cn) for further information. +Next, you can look into the `docker-compose.yml` (with detailed config params) and the [Documentation](http://docs.crawlab.cn/en/) for further information. ## Run @@ -110,7 +96,7 @@ services: - master mongo: - image: mongo:latest + image: mongo:4.2 container_name: crawlab_example_mongo restart: always ``` @@ -121,7 +107,7 @@ Then execute the command below, and Crawlab Master and Worker Nodes + MongoDB wi docker-compose up -d ``` -For Docker Deployment details, please refer to [relevant documentation](https://tikazyq.github.io/crawlab-docs/Installation/Docker.html). +For Docker Deployment details, please refer to [relevant documentation](https://docs.crawlab.cn/en/guide/installation/docker.html). ## Screenshot diff --git a/docker-compose.yml b/docker-compose.yml index 1c5d779e..bc018590 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,4 +11,4 @@ services: depends_on: - mongo mongo: - image: mongo:4.2 \ No newline at end of file + image: mongo:4.2 diff --git a/frontend/yarn.lock b/frontend/yarn.lock index be27574b..57a51f7c 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4363,9 +4363,9 @@ events@^3.0.0: integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== eventsource@^1.0.7: - version "1.1.0" - resolved "https://registry.npmmirror.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" - integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f" + integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA== dependencies: original "^1.0.0" @@ -7055,7 +7055,7 @@ ora@^3.4.0: original@^1.0.0: version "1.0.2" - resolved "https://registry.npmmirror.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== dependencies: url-parse "^1.4.3"