From f71a9aa7e3cd67a35a4efde7c2b6caaf417e9ae2 Mon Sep 17 00:00:00 2001
From: SliverHorn <503551462@qq.com>
Date: Thu, 10 Sep 2020 19:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README-en.md | 85 ++++++++++++++++++++++++++++++++++++++++++++++++----
README.md | 7 ++---
2 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/README-en.md b/README-en.md
index b42eef36..2e745e8f 100644
--- a/README-en.md
+++ b/README-en.md
@@ -1,4 +1,4 @@
-
+
@@ -105,10 +105,83 @@ We are excited that you are interested in contributing to gin-vue-admin. Before
docker-compose up -d
```
- - Web project preview [http://127.0.0.1:8888/admin](http://127.0.0.1:8888/admin)
+ - Web project preview [http://127.0.0.1:8000](http://127.0.0.1:8000)
- swagger APIs [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
+- Openhttp://127.0.0.1:8000, if the verification code cannot be displayed or padding,Please try the following
+
+ - ```shell
+ # Enter the following command in the terminal to find
+ docker network inspect gin-vue-admin_default
+ [
+ {
+ "Name": "gin-vue-admin_default",
+ "Id": "dd65598bd3fcce9916a88161f26268f4e08a6d5bd1c619d07e69abc93c69bba3",
+ "Created": "2020-09-10T10:36:37.868984015Z",
+ "Scope": "local",
+ "Driver": "bridge",
+ "EnableIPv6": false,
+ "IPAM": {
+ "Driver": "default",
+ "Options": null,
+ "Config": [
+ {
+ "Subnet": "172.29.0.0/16",
+ "Gateway": "172.29.0.1"
+ }
+ ]
+ },
+ "Internal": false,
+ "Attachable": true,
+ "Ingress": false,
+ "ConfigFrom": {
+ "Network": ""
+ },
+ "ConfigOnly": false,
+ "Containers": {
+ "1e246725c7ab689608c9f451c57a892e070fd63ec971d1749ede8dfbdaf704e1": {
+ "Name": "gva-redis",
+ "EndpointID": "d457e4babd5676e289bdf4f4c5ef0ce30c2acd87d437bfd7ea8809467a9304ef",
+ "MacAddress": "02:42:ac:1d:00:02",
+ "IPv4Address": "172.29.0.2/16",
+ "IPv6Address": ""
+ },
+ "7228d1c37654173e78a5ae82047b3a3b771feeea855dcc1e88e8e29e262bf789": {
+ "Name": "gva-web",
+ "EndpointID": "ffc9c29b9aa1e4c7a56b9e8060fff455295813298df585df51b802548c477969",
+ "MacAddress": "02:42:ac:1d:00:05",
+ "IPv4Address": "172.29.0.5/16",
+ "IPv6Address": ""
+ },
+ "99b6063801049d659a329cada5ad0d418c02a9956794b9bcbc07327fff3a1e58": {
+ "Name": "gva-server",
+ "EndpointID": "9a04629997d8b9aa6d75cc396d5dbb54bc5d239017a1010bacb53f73e2d46199",
+ "MacAddress": "02:42:ac:1d:00:04",
+ "IPv4Address": "172.29.0.4/16",
+ "IPv6Address": ""
+ },
+ "af60bee9ddca855beaf6bd6c6612516970f1336215af622d560f982276d9e4c6": {
+ "Name": "gva-mysql",
+ "EndpointID": "998a67b2b2ca9a12c916e97bf30f6b5879ee610c52d5ab329253192acd686cd8",
+ "MacAddress": "02:42:ac:1d:00:03",
+ "IPv4Address": "172.29.0.3/16",
+ "IPv6Address": ""
+ }
+ },
+ "Options": {},
+ "Labels": {
+ "com.docker.compose.network": "default",
+ "com.docker.compose.project": "gin-vue-admin",
+ "com.docker.compose.version": "1.26.2"
+ }
+ }
+ ]
+ # Replace the ip on line 20 of .docker-compose/nginx/conf.d/my.conf with the ip of IPv4Address whose Name is "gva-server"
+ ```
+
+
+
```
- node version > v8.6.0
- golang version >= v1.11
@@ -155,7 +228,7 @@ go get -u github.com/swaggo/swag/cmd/swag
````
##### (2) In mainland China
-
+
In mainland China, access to go.org/x is prohibited，we recommend [goproxy.io](https://goproxy.io/zh/)
````bash
@@ -278,7 +351,7 @@ backend code file: model\dnModel\api.go
(1) Development environment course
> Bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/
-
+
(2) Template course
> Bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/
@@ -293,8 +366,8 @@ backend code file: model\dnModel\api.go
### 8.1 Groups
#### QQ group: 622360840
-| QQ group |
-| :---: |
+| QQ group |
+| :---: |
| 
|
diff --git a/README.md b/README.md
index fb997e17..7094511e 100644
--- a/README.md
+++ b/README.md
@@ -113,12 +113,11 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
- swagger文档 [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
-- 打开http://127.0.0.1:8000,验证码无法显示的话
+- 打开http://127.0.0.1:8000,验证码无法显示或者padding的话, 请尝试以下方法
- ```shell
# 终端输入以下命令查找
docker network inspect gin-vue-admin_default
-
[
{
"Name": "gin-vue-admin_default",
@@ -182,11 +181,9 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
}
}
]
- # Name为"gva-server"的IPv4Address,把172.29.0.3放到.docker-compose/nginx/conf.d/my.conf的第20行
+ # .docker-compose/nginx/conf.d/my.conf的第20行的ip替换为Name为"gva-server"的IPv4Address的ip
```
- -
-
### 2.1 web端
```bash
--
GitLab
