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

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
This commit is contained in:
rainyan
2020-04-06 00:47:46 +08:00
28 changed files with 259 additions and 315 deletions
+4 -13
View File
@@ -16,9 +16,6 @@ type ExaFileUploadAndDownload struct {
// @title Upload
// @description 删除文件切片记录
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
func (f *ExaFileUploadAndDownload) Upload() error {
err := global.GVA_DB.Create(f).Error
@@ -28,9 +25,6 @@ func (f *ExaFileUploadAndDownload) Upload() error {
// @title DeleteFile
// @description 删除文件切片记录
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
func (f *ExaFileUploadAndDownload) DeleteFile() error {
err := global.GVA_DB.Where("id = ?", f.ID).Unscoped().Delete(f).Error
@@ -40,9 +34,6 @@ func (f *ExaFileUploadAndDownload) DeleteFile() error {
// @title FindFile
// @description 删除文件切片记录
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
func (f *ExaFileUploadAndDownload) FindFile() (error, ExaFileUploadAndDownload) {
var file ExaFileUploadAndDownload
@@ -53,10 +44,10 @@ func (f *ExaFileUploadAndDownload) FindFile() (error, ExaFileUploadAndDownload)
// @title GetInfoList
// @description 分页获取数据
// @auth (2020/04/05 20:22 )
// @param FileMd5 string
// @param FileName string
// @param FilePath string
// @return error
// @param info PageInfo
// @return err error
// @return list error
// @return total error
func (f *ExaFileUploadAndDownload) GetInfoList(info PageInfo) (err error, list interface{}, total int) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)