Browse Source

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Add version list to README.md
# Conflicts:
#	README-zh_CN.md
rainyan 5 years ago
parent
commit
c93629ad7b
2 changed files with 23 additions and 1 deletions
  1. 12 1
      README-zh_CN.md
  2. 11 0
      README.md

+ 12 - 1
README-zh_CN.md

@@ -19,8 +19,19 @@
 - 后台框架:[gin](https://github.com/gin-gonic/gin) 
 
 ## 1. 基本介绍
+
+### 1.1 项目介绍
+
 [在线预览](http://qmplus.henrongyi.top/)
-> Gin-vue-admin是一个基于vue和gin开发的全栈前后端分离的后台管理系统,拥有jwt鉴权,动态路由,动态菜单,casbin鉴权,表单生成器,代码生成器等功能,提供多种示例文件,让您把更多时间专注在业务开发上。
+> Gin-vue-admin是一个基于vue和gin开发的全栈前后端分离的后台管理系统,集成jwt鉴权,动态路由,动态菜单,casbin鉴权,表单生成器,代码生成器等功能,提供多种示例文件,让您把更多时间专注在业务开发上。
+
+### 1.2 版本列表
+
+master:2.0开发版代码
+
+[gin-vue-adminv 1.0稳定版](https://github.com/piexlmax/gin-vue-admin/tree/gin-vue-admin_v1_stable) (v1.0保持更新和维护)
+
+[gin-vue-adminv 2.0开发版](https://github.com/piexlmax/gin-vue-admin) (v2.0不再兼容v1.0)
 
 ## 2. 使用说明
 

+ 11 - 0
README.md

@@ -19,10 +19,21 @@ Online Documentation [http://doc.henrongyi.top/](http://doc.henrongyi.top/)
 - Server Framework:[gin](https://github.com/gin-gonic/gin) 
 
 ## 1. Basic Introduction
+
+### 1.1 Project Introduction
+
 [Online Demo](http://qmplus.henrongyi.top/)
 > Gin-vue-admin is a full-stack (frontend and backend separation) framework designed for management system. 
 > It integrates multiple functions, such as JWT authentication, dynamic routing, dynamic menu, casbin authentication, form generator, code generator, etc. So that you can focus more time on your business Requirements.
 
+### 1.2 Version list
+
+master: 2.0 dev code
+
+[gin-vue-adminv 1.0 stable](https://github.com/piexlmax/gin-vue-admin/tree/gin-vue-admin_v1_stable) (v1.0 is kept up to date and maintained)
+
+[gin-vue-adminv 2.0 dev](https://github.com/piexlmax/gin-vue-admin) (v2.0 is no longer compatible with v1.0)
+
 ## 2. Getting started
 ```
 - node version > v8.6.0