public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 10:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat✨ 结构统一调整

Browse Source
This commit is contained in:
wenjianzhang
2021-05-20 22:59:09 +08:00
parent 6b1c3d9226
commit 44545f3d5b
49 changed files with 330 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/other/apis/file.go
+2 -2
View File
@@ -8,11 +8,11 @@ import (
"strings"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/utils"
"github.com/google/uuid"
"go-admin/common/apis"
"go-admin/common/file_store"
)
@@ -27,7 +27,7 @@ type FileResponse struct {
const path = "static/uploadfile/"
type File struct {
apis.Api
api.Api
}
// UploadFile 上传图片
app/other/apis/server.go
+3 -4
View File
@@ -4,13 +4,12 @@ import (
"runtime"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/mem"
"go-admin/common/apis"
)
const (
@@ -21,7 +20,7 @@ const (
)
type Monitor struct {
apis.Api
api.Api
}
// ServerInfo 获取系统信息
@@ -74,4 +73,4 @@ func (e Monitor) ServerInfo(c *gin.Context) {
"cpu": cpuDic,
"disk": diskDic,
})
}
}
app/other/apis/sys_china_area_data.go
+2 -2
View File
@@ -7,14 +7,14 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/common/actions"
"go-admin/common/apis"
)
type SysChinaAreaData struct {
apis.Api
api.Api
}
func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
app/other/apis/sys_file_dir.go
+3 -3
View File
@@ -4,6 +4,7 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
@@ -11,11 +12,10 @@ import (
"go-admin/app/other/service"
"go-admin/app/other/service/dto"
"go-admin/common/actions"
"go-admin/common/apis"
)
type SysFileDir struct {
apis.Api
api.Api
}
func (e SysFileDir) GetSysFileDirList(c *gin.Context) {
@@ -195,4 +195,4 @@ func (e SysFileDir) DeleteSysFileDir(c *gin.Context) {
return
}
e.OK(control.Id, "删除成功")
}
}
app/other/apis/sys_file_info.go
+3 -3
View File
@@ -7,14 +7,14 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/common/actions"
"go-admin/common/apis"
)
type SysFileInfo struct {
apis.Api
api.Api
}
func (e SysFileInfo) GetSysFileInfoList(c *gin.Context) {
@@ -206,4 +206,4 @@ func (e SysFileInfo) DeleteSysFileInfo(c *gin.Context) {
return
}
e.OK(control.Id, "删除成功")
}
}
app/other/service/sys_china_area_data.go
+12 -12
View File
@@ -2,14 +2,14 @@ package service
import (
"errors"
models2 "go-admin/app/other/models"
dto2 "go-admin/app/other/service/dto"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/service"
)
type SysChinaAreaData struct {
@@ -17,8 +17,8 @@ type SysChinaAreaData struct {
}
// GetSysChinaAreaDataPage 获取SysChinaAreaData列表
func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto2.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models2.SysChinaAreaData, count *int64) error {
var data models2.SysChinaAreaData
func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
Scopes(
@@ -36,8 +36,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto2.SysChinaAreaDataSearc
}
// GetSysChinaAreaData 获取SysChinaAreaData对象
func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto2.SysChinaAreaDataById, p *actions.DataPermission, model *models2.SysChinaAreaData) error {
var data models2.SysChinaAreaData
func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
Scopes(
@@ -57,8 +57,8 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto2.SysChinaAreaDataById, p *
}
// InsertSysChinaAreaData 创建SysChinaAreaData对象
func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models2.SysChinaAreaData) error {
var data models2.SysChinaAreaData
func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error {
var data models.SysChinaAreaData
err := e.Orm.Model(&data).
Create(model).Error
@@ -70,7 +70,7 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models2.SysChinaAreaDat
}
// UpdateSysChinaAreaData 修改SysChinaAreaData对象
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models2.SysChinaAreaData, p *actions.DataPermission) error {
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
db := e.Orm.Model(c).
Scopes(
actions.Permission(c.TableName(), p),
@@ -86,9 +86,9 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models2.SysChinaAreaData, p
}
// RemoveSysChinaAreaData 删除SysChinaAreaData
func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto2.SysChinaAreaDataById, p *actions.DataPermission) error {
func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
var data models2.SysChinaAreaData
var data models.SysChinaAreaData
db := e.Orm.Model(&data).
Scopes(
app/other/service/sys_file_dir.go
+4 -4
View File
@@ -3,14 +3,14 @@ package service
import (
"errors"
"fmt"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/service"
)
type SysFileDir struct {
@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDir, m models.SysFileDir) models.SysFi
}
return m
}
}
app/other/service/sys_file_info.go
+15 -15
View File
@@ -2,14 +2,14 @@ package service
import (
"errors"
models2 "go-admin/app/other/models"
dto2 "go-admin/app/other/service/dto"
"gorm.io/gorm"
"go-admin/app/other/models"
"go-admin/app/other/service/dto"
"github.com/go-admin-team/go-admin-core/sdk/service"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/common/service"
"gorm.io/gorm"
)
type SysFileInfo struct {
@@ -17,9 +17,9 @@ type SysFileInfo struct {
}
// GetSysFileInfoPage 获取SysFileInfo列表
func (e *SysFileInfo) GetSysFileInfoPage(c *dto2.SysFileInfoSearch, p *actions.DataPermission, list *[]models2.SysFileInfo, count *int64) error {
func (e *SysFileInfo) GetSysFileInfoPage(c *dto.SysFileInfoSearch, p *actions.DataPermission, list *[]models.SysFileInfo, count *int64) error {
var err error
var data models2.SysFileInfo
var data models.SysFileInfo
err = e.Orm.Model(&data).
Scopes(
@@ -37,9 +37,9 @@ func (e *SysFileInfo) GetSysFileInfoPage(c *dto2.SysFileInfoSearch, p *actions.D
}
// GetSysFileInfo 获取SysFileInfo对象
func (e *SysFileInfo) GetSysFileInfo(d *dto2.SysFileInfoById, p *actions.DataPermission, model *models2.SysFileInfo) error {
func (e *SysFileInfo) GetSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPermission, model *models.SysFileInfo) error {
var err error
var data models2.SysFileInfo
var data models.SysFileInfo
db := e.Orm.Model(&data).
Scopes(
@@ -60,9 +60,9 @@ func (e *SysFileInfo) GetSysFileInfo(d *dto2.SysFileInfoById, p *actions.DataPer
}
// InsertSysFileInfo 创建SysFileInfo对象
func (e *SysFileInfo) InsertSysFileInfo(model *dto2.SysFileInfoControl) error {
func (e *SysFileInfo) InsertSysFileInfo(model *dto.SysFileInfoControl) error {
var err error
var data *models2.SysFileInfo
var data *models.SysFileInfo
data, err = model.Generate()
if err != nil {
@@ -80,9 +80,9 @@ func (e *SysFileInfo) InsertSysFileInfo(model *dto2.SysFileInfoControl) error {
}
// UpdateSysFileInfo 修改SysFileInfo对象
func (e *SysFileInfo) UpdateSysFileInfo(c *dto2.SysFileInfoControl, p *actions.DataPermission) error {
func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.DataPermission) error {
var err error
var data *models2.SysFileInfo
var data *models.SysFileInfo
data, err = c.Generate()
if err != nil {
@@ -105,9 +105,9 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto2.SysFileInfoControl, p *actions.D
}
// RemoveSysFileInfo 删除SysFileInfo
func (e *SysFileInfo) RemoveSysFileInfo(d *dto2.SysFileInfoById, p *actions.DataPermission) error {
func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataPermission) error {
var err error
var data models2.SysFileInfo
var data models.SysFileInfo
db := e.Orm.Model(&data).
Scopes(
@@ -123,4 +123,4 @@ func (e *SysFileInfo) RemoveSysFileInfo(d *dto2.SysFileInfoById, p *actions.Data
return err
}
return nil
}
}