From f30182ce638fbb0e76fe90406e2a5a993d1418fa Mon Sep 17 00:00:00 2001 From: SliverHorn <503551462@qq.com> Date: Fri, 11 Sep 2020 11:58:47 +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 | 9 ++------- README.md | 16 +++++----------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/README-en.md b/README-en.md index a95ccfa6..9fe6ec14 100644 --- a/README-en.md +++ b/README-en.md @@ -62,14 +62,9 @@ We are excited that you are interested in contributing to gin-vue-admin. Before ### 1.3 Version list - master: 2.0 code, for prod - - develop: 2.0 dev code, for test - -- [gin-vue-admin_v2.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) （v2.0 is no longer compatible with v1.0） - -- [gin-vue-admin_v1.0_stable](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_stable) （stop maintenance） - -- [gin-vue-admin_v1.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_dev) （stop maintenance） +- [gin-vue-admin_v2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) (v2.0 [GormV1](https://v1.gorm.io) Stable branch) +- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2](https://v2.gorm.io) Development branch) ## 2. Getting started diff --git a/README.md b/README.md index b81d9f08..57f979f6 100644 --- a/README.md +++ b/README.md @@ -57,15 +57,9 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm ### 1.3 版本列表 - master: 2.0, 用于生产环境 - - develop: 2.0, 用于测试环境 - -- [gin-vue-admin_v2.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) （v2.0 不再兼容 v1.0） - -- [gin-vue-admin_v1.0_stable](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_stable) （v1.0停止维护） - -- [gin-vue-admin_v1.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_dev) （v1.0停止维护） - +- [gin-vue-admin_v2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) (v2.0 [GormV1版本](https://v1.gorm.io)稳定分支) +- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2版本](https://v2.gorm.io)开发分支) ## 2. 使用说明 @@ -116,8 +110,8 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm - 如果server的177.7.0.12这个容器内部ip被占用了,需要修改地方为 - - docker-compose.yaml的第39行的177.7.0.12更换为你想要的ip - - .docker-compose/nginx/conf.d/my.conf的第20行的177.7.0.12更换为你想要的ip + - [docker-compose.yaml](./docker-compose.yaml)的第39行的177.7.0.12更换为你想要的ip + - [.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf)的第20行的177.7.0.12更换为你想要的ip - docker-compose使用自定义的一个docker网络 @@ -134,7 +128,7 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm - 默认的network名为gin-vue-admin_network,默认是bridge模式 - - 如果修改了子网,对应的每个service的ipv4_address都需要修改,还有.docker-compose/nginx/conf.d/my.conf的第20行的server的ip也需要修改 + - 如果修改了子网,对应的每个service的ipv4_address都需要修改,还有[.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf)的第20行的server的ip也需要修改 ### 2.1 web端 -- GitLab