Merge pull request #371 from Jzow/master

[EAIRP-365] Document on Improving Docker Deployment Methods

Author: Jzow

README.md

@@ -41,8 +41,85 @@ It's completely free, if this project is helpful to you, please click on Star. T
 - test password: 123456
 
 ## Quick Start
+
 We provide a more comprehensive Docker deployment method, which can be found in [docker folder](https://github.com/eairps/eairp/blob/master/docker/README.md)
 
+### Prerequisites
+- Docker Engine 20.10+
+- Docker Compose v2.17+
+
+### 1. Docker Compose (Recommended)
+
+**Applicable scenarios**: There is no MySQL/Redis environment locally, and a complete service stack needs to be started quickly.
+
+```bash
+# Clone deployment repository
+git clone https://github.com/eairps/eairp.git
+
+cd eairp
+
+# Start services
+docker compose up -d
+```
+
+### 2. Docker standalone container
+
+**Applicable scenarios**: MySQL/Redis service already exists, and custom database configuration is required.
+
+**Step 1**: Create a Private Network
+
+```console
+docker network create eairp-net
+```
+
+**Step 2**: Start the MySQL container
+
+```console
+docker run -d --name mysql-eairp \
+  --network eairp-net \
+  -p 3306:3306 \
+  -v /path/to/mysql:/var/lib/mysql \
+  -e MYSQL_ROOT_PASSWORD=123456 \
+  -e MYSQL_USER=eairp \
+  -e MYSQL_PASSWORD=123456 \
+  mysql:8.3 \
+  --character-set-server=utf8mb4 \
+  --collation-server=utf8mb4_bin
+```
+
+**Step 3**: Start the Redis container
+
+```console
+docker run -d --name redis-eairp \
+  --network eairp-net \
+  -p 6379:6379 \
+  -v /path/to/redis/data:/data \
+  redis:7.0 \
+  redis-server --requirepass 123456
+```
+
+**Step 4**: Start the Eairp container
+
+Configuration parameters:
+|  Environment variables   | Explanation  |  Example Value  |  
+|  ----  | ----  | ----  |
+| SPRING_DATASOURCE_URL  | MySQL connection address | jdbc:mysql://mysql-eairp:3306/eairp |
+| SPRING_REDIS_HOST	  | Redis host address | redis-eairp |
+| API_BASE_URL		  | Front-end API basic path | http://your-domain.com/erp-api |
+
+```console
+docker run -d --name eairp \
+  --network eairp-net \
+  -p 3000:80 \
+  -p 8088:8088 \
+  -e SPRING_DATASOURCE_URL="jdbc:mysql://mysql-eairp:3306/eairp" \
+  -e SPRING_DATASOURCE_USERNAME=eairp \
+  -e SPRING_DATASOURCE_PASSWORD=123456 \
+  -e SPRING_REDIS_HOST=redis-eairp \
+  -e SPRING_REDIS_PASSWORD=123456 \
+  wansenai/eairp:latest
+```
+
 ## License
 
 Licensed under either of

README_ZH.md

@@ -43,6 +43,82 @@
 ## 快速开始
 我们提供了一种更全面的Docker部署方法，可以在[Docker](https://github.com/eairps/eairp/blob/master/docker/README_ZH.md)文件夹中找到
 
+### 先决条件
+- Docker Engine 20.10+
+- Docker Compose v2.17+
+
+### 1. Docker Compose（推荐）
+
+**适用场景**: 本地没有MySQL/Redis环境，需要快速启动完整的服务栈。
+
+```bash
+# Clone deployment repository
+git clone https://github.com/eairps/eairp.git
+
+cd eairp
+
+# Start services
+docker compose up -d
+```
+
+### 2. Docker 独立容器
+
+**适用场景**: MySQL/Redis服务已经存在，需要自定义数据库配置。
+
+**步骤 1**: 创建专用网络
+
+```console
+docker network create eairp-net
+```
+
+**步骤 2**: 启动 MySQL 容器
+
+```console
+docker run -d --name mysql-eairp \
+  --network eairp-net \
+  -p 3306:3306 \
+  -v /path/to/mysql:/var/lib/mysql \
+  -e MYSQL_ROOT_PASSWORD=123456 \
+  -e MYSQL_USER=eairp \
+  -e MYSQL_PASSWORD=123456 \
+  mysql:8.3 \
+  --character-set-server=utf8mb4 \
+  --collation-server=utf8mb4_bin
+```
+
+**步骤 3**: 启动 Redis 容器
+
+```console
+docker run -d --name redis-eairp \
+  --network eairp-net \
+  -p 6379:6379 \
+  -v /path/to/redis/data:/data \
+  redis:7.0 \
+  redis-server --requirepass 123456
+```
+
+**步骤 4**: 启动 Eairp 容器
+
+配置参数：
+|  环境变量	   | 说明  |  示例值  |  
+|  ----  | ----  | ----  |
+| SPRING_DATASOURCE_URL  | MySQL connection address | jdbc:mysql://mysql-eairp:3306/eairp |
+| SPRING_REDIS_HOST	  | Redis host address | redis-eairp |
+| API_BASE_URL		  | Front-end API basic path | http://your-domain.com/erp-api |
+
+```console
+docker run -d --name eairp \
+  --network eairp-net \
+  -p 3000:80 \
+  -p 8088:8088 \
+  -e SPRING_DATASOURCE_URL="jdbc:mysql://mysql-eairp:3306/eairp" \
+  -e SPRING_DATASOURCE_USERNAME=eairp \
+  -e SPRING_DATASOURCE_PASSWORD=123456 \
+  -e SPRING_REDIS_HOST=redis-eairp \
+  -e SPRING_REDIS_PASSWORD=123456 \
+  wansenai/eairp:latest
+```
+
 ## License
 
 根据以下任一许可证之一，对本项目中的代码和文档进行许可：

docker/README.md

@@ -164,16 +164,14 @@ If you want to deploy on your server, please modify the value of the `API_BASE_U
 
 Another solution is to use the Docker Compose files we provide.
 
-First you need to download the [eairp source code](https://github.com/wansenai/eairp/releases) to your local machine, then you must download 5 files from [eairp-docker](https://github.com/wansenai/eairp-docker) repository, they are:
+First you need to download the [eairp source code](https://github.com/wansenai/eairp/releases) to your local machine.
 
 -	`.env`
 -	`Dockerfile`
 -	`docker-compose.yaml`
 -	`start.sh`
 -	`mysql-scripts/eairp.sql`
 
-Then copy these four files and the `mysql-scripts` folder to the Eairp source code directory structure, Note that `mysql-scripts` is a folder. You need to copy the folder in its entirety instead of the sql file inside.
-
 The complete directory structure is as follows:
 
 ```markdown

docker/README_ZH.md

@@ -160,16 +160,14 @@ docker run --net=eairp-nw -d --name eairp -p 8088:8088 -p 3000:80 -v /usr/local/
 
 另一种解决方案是使用我们提供的Docker Compose文件。
 
-首先，您需要下载[eairp源代码](https://github.com/eairps/eairp/releases)到您的本地计算机，然后您必须从[docker](https://github.com/eairps/eairp/tree/master/docker)文件夹下载5个文件，它们是：
+首先，您需要下载[eairp源代码](https://github.com/eairps/eairp/releases)到您的本地计算机，它们是：
 
 -	`.env`
 -	`Dockerfile`
 -	`docker-compose.yaml`
 -	`start.sh`
 -	`mysql-scripts/eairp.sql`
 
-然后将这四个文件和 `mysql-scripts` 文件夹复制到Eairp源代码目录结构中，注意 `mysql-scscripts` 是一个文件夹。您需要复制整个文件夹，而不仅仅是其中的sql文件。
-
 完整的目录结构如下：
 
 ```markdown