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

sun_song_1203 · sun_song_1203 · commit 3f79703f09de · 2020-04-10T14:32:14.000+08:00
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+    Copyright 2019 JiZhao Jiang
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -179,7 +179,8 @@ go run main.go;
 - api管理：不同用户可调用的api接口的权限不同。
 - 配置管理：配置文件可前台修改（测试环境不开放此功能）。
 - 富文本编辑器：MarkDown编辑器功能嵌入。
-- 条件搜索：增加条件搜索示例。 
+- 条件搜索：增加条件搜索示例。
+- restful示例：参考客户管理功能，customer组api。 
 ```
 前端文件参考: src\view\superAdmin\api\api.vue 
 后台文件参考: model\dnModel\api.go 
diff --git a/README.md b/README.md
@@ -177,6 +177,8 @@ go run main.go;
 - Configuration management: The configuration file can be modified in the web page (the test environment does not provide this function).
 - Rich text editor: Embed MarkDown editor function.
 - Conditional search: Add an example of conditional search.
+- Restful example: refer to customer management function and apidcustomer group.
+
 ```
 fontend code file: src\view\superAdmin\api\api.vue 
 backend code file: model\dnModel\api.go 
diff --git a/server/service/sys_api.go b/server/service/sys_api.go
@@ -61,6 +61,10 @@ func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc
 		db = db.Where("method = ?", api.Method)
 	}
 
+	if api.ApiGroup != "" {
+		db = db.Where("api_group = ?", api.ApiGroup)
+	}
+
 	err = db.Find(&apiList).Count(&total).Error
 
 	if err != nil {
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
@@ -8,6 +8,9 @@
         <el-form-item label="描述">
           <el-input placeholder="描述" v-model="searchInfo.description"></el-input>
         </el-form-item>
+        <el-form-item label="api组">
+          <el-input placeholder="api组" v-model="searchInfo.apiGroup"></el-input>
+        </el-form-item>
         <el-form-item label="请求">
           <el-select clearable placeholder="请选择" v-model="searchInfo.method">
             <el-option

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc`
`61`	`61`	`db = db.Where("method = ?", api.Method)`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ if api.ApiGroup != "" {`
	`65`	`+ db = db.Where("api_group = ?", api.ApiGroup)`
	`66`	`+ }`
	`67`	`+`
`64`	`68`	`err = db.Find(&apiList).Count(&total).Error`
`65`	`69`
`66`	`70`	`if err != nil {`