estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V2.5.2beta (#1101)

Browse Source 
* fix: zap无法在运行时进行切割日志, config.docker.yaml与config.yaml同步 #1094

* feat: 为定时任务增加秒级控制

* feat: 调整代码结构，err更改为后置

* css 样式调整

Co-authored-by: SliverHorn <503551462@qq.com>
Co-authored-by: songzhibin97 <718428482@qq.com>
This commit is contained in:
奇淼（piexlmax
2022-05-28 19:22:23 +08:00
committed by GitHub
parent b25c128051
commit 83141b3564
49 changed files with 490 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/service/system/sys_api.go
View File

@@ -44,9 +44,9 @@ func (apiService *ApiService) DeleteApi(api system.SysApi) (err error) {
//@function: GetAPIInfoList
//@description: 分页获取数据,
//@param: api model.SysApi, info request.PageInfo, order string, desc bool
//@return: err error
//@return: list interface{}, total int64, err error
func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.PageInfo, order string, desc bool) (list interface{}, total int64, err error) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&system.SysApi{})
@@ -71,7 +71,7 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
err = db.Count(&total).Error
if err != nil {
return err, apiList, total
return apiList, total, err
} else {
db = db.Limit(limit).Offset(offset)
if order != "" {
@@ -92,7 +92,7 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
}
} else { // didn't matched any order key in `orderMap`
err = fmt.Errorf("非法的排序字段: %v", order)
return err, apiList, total
return apiList, total, err
}
err = db.Order(OrderStr).Find(&apiList).Error
@@ -100,15 +100,15 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
err = db.Order("api_group").Find(&apiList).Error
}
}
return err, apiList, total
return apiList, total, err
}
//@author: [piexlmax](https://github.com/piexlmax)
//@function: GetAllApis
//@description: 获取所有的api
//@return: err error, apis []model.SysApi
//@return: apis []model.SysApi, err error
func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
func (apiService *ApiService) GetAllApis() (apis []system.SysApi, err error) {
err = global.GVA_DB.Find(&apis).Error
return
}
@@ -117,9 +117,9 @@ func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
//@function: GetApiById
//@description: 根据id获取api
//@param: id float64
//@return: err error, api model.SysApi
//@return: api model.SysApi, err error
func (apiService *ApiService) GetApiById(id int) (err error, api system.SysApi) {
func (apiService *ApiService) GetApiById(id int) (api system.SysApi, err error) {
err = global.GVA_DB.Where("id = ?", id).First(&api).Error
return
}