模块化变更

server/service/exa_breakpoint_continue.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/example"
 	"gorm.io/gorm"
 )
 
@@ -13,8 +13,8 @@ import (
 //@param: fileMd5 string, fileName string, chunkTotal int
 //@return: err error, file model.ExaFile
 
-func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err error, file model.ExaFile) {
-	var cfile model.ExaFile
+func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err error, file example.ExaFile) {
+	var cfile example.ExaFile
 	cfile.FileMd5 = fileMd5
 	cfile.FileName = fileName
 	cfile.ChunkTotal = chunkTotal
@@ -36,7 +36,7 @@ func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err erro
 //@return: error
 
 func CreateFileChunk(id uint, fileChunkPath string, fileChunkNumber int) error {
-	var chunk model.ExaFileChunk
+	var chunk example.ExaFileChunk
 	chunk.FileChunkPath = fileChunkPath
 	chunk.ExaFileID = id
 	chunk.FileChunkNumber = fileChunkNumber
@@ -51,8 +51,8 @@ func CreateFileChunk(id uint, fileChunkPath string, fileChunkNumber int) error {
 //@return: error
 
 func DeleteFileChunk(fileMd5 string, fileName string, filePath string) error {
-	var chunks []model.ExaFileChunk
-	var file model.ExaFile
+	var chunks []example.ExaFileChunk
+	var file example.ExaFile
 	err := global.GVA_DB.Where("file_md5 = ? AND file_name = ?", fileMd5, fileName).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
 	err = global.GVA_DB.Where("exa_file_id = ?", file.ID).Delete(&chunks).Unscoped().Error
 	return err

server/service/exa_customer.go

@@ -2,8 +2,9 @@ package service
 
 import (
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/example"
+	"gin-vue-admin/model/example/request"
+	"gin-vue-admin/model/system"
 )
 
 //@author: [piexlmax](https://github.com/piexlmax)
@@ -12,7 +13,7 @@ import (
 //@param: e model.ExaCustomer
 //@return: err error
 
-func CreateExaCustomer(e model.ExaCustomer) (err error) {
+func CreateExaCustomer(e example.ExaCustomer) (err error) {
 	err = global.GVA_DB.Create(&e).Error
 	return err
 }
@@ -23,7 +24,7 @@ func CreateExaCustomer(e model.ExaCustomer) (err error) {
 //@param: e model.ExaCustomer
 //@return: err error
 
-func DeleteExaCustomer(e model.ExaCustomer) (err error) {
+func DeleteExaCustomer(e example.ExaCustomer) (err error) {
 	err = global.GVA_DB.Delete(&e).Error
 	return err
 }
@@ -34,7 +35,7 @@ func DeleteExaCustomer(e model.ExaCustomer) (err error) {
 //@param: e *model.ExaCustomer
 //@return: err error
 
-func UpdateExaCustomer(e *model.ExaCustomer) (err error) {
+func UpdateExaCustomer(e *example.ExaCustomer) (err error) {
 	err = global.GVA_DB.Save(e).Error
 	return err
 }
@@ -45,7 +46,7 @@ func UpdateExaCustomer(e *model.ExaCustomer) (err error) {
 //@param: id uint
 //@return: err error, customer model.ExaCustomer
 
-func GetExaCustomer(id uint) (err error, customer model.ExaCustomer) {
+func GetExaCustomer(id uint) (err error, customer example.ExaCustomer) {
 	err = global.GVA_DB.Where("id = ?", id).First(&customer).Error
 	return
 }
@@ -59,15 +60,15 @@ func GetExaCustomer(id uint) (err error, customer model.ExaCustomer) {
 func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err error, list interface{}, total int64) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
-	db := global.GVA_DB.Model(&model.ExaCustomer{})
-	var a model.SysAuthority
+	db := global.GVA_DB.Model(&example.ExaCustomer{})
+	var a system.SysAuthority
 	a.AuthorityId = sysUserAuthorityID
 	err, auth := GetAuthorityInfo(a)
 	var dataId []string
 	for _, v := range auth.DataAuthorityId {
 		dataId = append(dataId, v.AuthorityId)
 	}
-	var CustomerList []model.ExaCustomer
+	var CustomerList []example.ExaCustomer
 	err = db.Where("sys_user_authority_id in ?", dataId).Count(&total).Error
 	if err != nil {
 		return err, CustomerList, total

server/service/exa_excel_parse.go

@@ -4,12 +4,12 @@ import (
 	"errors"
 	"fmt"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/system"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 	"strconv"
 )
 
-func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error {
+func ParseInfoList2Excel(infoList []system.SysBaseMenu, filePath string) error {
 	excel := excelize.NewFile()
 	excel.SetSheetRow("Sheet1", "A1", &[]string{"ID", "路由Name", "路由Path", "是否隐藏", "父节点", "排序", "文件名称"})
 	for i, menu := range infoList {
@@ -28,14 +28,14 @@ func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error {
 	return err
 }
 
-func ParseExcel2InfoList() ([]model.SysBaseMenu, error) {
+func ParseExcel2InfoList() ([]system.SysBaseMenu, error) {
 	skipHeader := true
 	fixedHeader := []string{"ID", "路由Name", "路由Path", "是否隐藏", "父节点", "排序", "文件名称"}
 	file, err := excelize.OpenFile(global.GVA_CONFIG.Excel.Dir + "ExcelImport.xlsx")
 	if err != nil {
 		return nil, err
 	}
-	menus := make([]model.SysBaseMenu, 0)
+	menus := make([]system.SysBaseMenu, 0)
 	rows, err := file.Rows("Sheet1")
 	if err != nil {
 		return nil, err
@@ -59,7 +59,7 @@ func ParseExcel2InfoList() ([]model.SysBaseMenu, error) {
 		id, _ := strconv.Atoi(row[0])
 		hidden, _ := strconv.ParseBool(row[3])
 		sort, _ := strconv.Atoi(row[5])
-		menu := model.SysBaseMenu{
+		menu := system.SysBaseMenu{
 			GVA_MODEL: global.GVA_MODEL{
 				ID: uint(id),
 			},

server/service/exa_file_upload_download.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/example"
+	"gin-vue-admin/model/example/request"
 	"gin-vue-admin/utils/upload"
 	"mime/multipart"
 	"strings"
@@ -16,7 +16,7 @@ import (
 //@param: file model.ExaFileUploadAndDownload
 //@return: error
 
-func Upload(file model.ExaFileUploadAndDownload) error {
+func Upload(file example.ExaFileUploadAndDownload) error {
 	return global.GVA_DB.Create(&file).Error
 }
 
@@ -26,8 +26,8 @@ func Upload(file model.ExaFileUploadAndDownload) error {
 //@param: id uint
 //@return: error, model.ExaFileUploadAndDownload
 
-func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
-	var file model.ExaFileUploadAndDownload
+func FindFile(id uint) (error, example.ExaFileUploadAndDownload) {
+	var file example.ExaFileUploadAndDownload
 	err := global.GVA_DB.Where("id = ?", id).First(&file).Error
 	return err, file
 }
@@ -38,8 +38,8 @@ func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
 //@param: file model.ExaFileUploadAndDownload
 //@return: err error
 
-func DeleteFile(file model.ExaFileUploadAndDownload) (err error) {
-	var fileFromDb model.ExaFileUploadAndDownload
+func DeleteFile(file example.ExaFileUploadAndDownload) (err error) {
+	var fileFromDb example.ExaFileUploadAndDownload
 	err, fileFromDb = FindFile(file.ID)
 	oss := upload.NewOss()
 	if err = oss.DeleteFile(fileFromDb.Key); err != nil {
@@ -59,7 +59,7 @@ func GetFileRecordInfoList(info request.PageInfo) (err error, list interface{},
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB
-	var fileLists []model.ExaFileUploadAndDownload
+	var fileLists []example.ExaFileUploadAndDownload
 	err = db.Find(&fileLists).Count(&total).Error
 	err = db.Limit(limit).Offset(offset).Order("updated_at desc").Find(&fileLists).Error
 	return err, fileLists, total
@@ -71,7 +71,7 @@ func GetFileRecordInfoList(info request.PageInfo) (err error, list interface{},
 //@param: header *multipart.FileHeader, noSave string
 //@return: err error, file model.ExaFileUploadAndDownload
 
-func UploadFile(header *multipart.FileHeader, noSave string) (err error, file model.ExaFileUploadAndDownload) {
+func UploadFile(header *multipart.FileHeader, noSave string) (err error, file example.ExaFileUploadAndDownload) {
 	oss := upload.NewOss()
 	filePath, key, uploadErr := oss.UploadFile(header)
 	if uploadErr != nil {
@@ -79,7 +79,7 @@ func UploadFile(header *multipart.FileHeader, noSave string) (err error, file mo
 	}
 	if noSave == "0" {
 		s := strings.Split(header.Filename, ".")
-		f := model.ExaFileUploadAndDownload{
+		f := example.ExaFileUploadAndDownload{
 			Url:  filePath,
 			Name: header.Filename,
 			Tag:  s[len(s)-1],

server/service/exa_simple_uploader.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/example"
 	"gorm.io/gorm"
 	"io/ioutil"
 	"os"
@@ -17,7 +17,7 @@ import (
 //@param: uploader model.ExaSimpleUploader
 //@return: err error
 
-func SaveChunk(uploader model.ExaSimpleUploader) (err error) {
+func SaveChunk(uploader example.ExaSimpleUploader) (err error) {
 	return global.GVA_DB.Create(uploader).Error
 }
 
@@ -27,9 +27,9 @@ func SaveChunk(uploader model.ExaSimpleUploader) (err error) {
 //@param: md5 string
 //@return: err error, uploads []model.ExaSimpleUploader, isDone bool
 
-func CheckFileMd5(md5 string) (err error, uploads []model.ExaSimpleUploader, isDone bool) {
+func CheckFileMd5(md5 string) (err error, uploads []example.ExaSimpleUploader, isDone bool) {
 	err = global.GVA_DB.Find(&uploads, "identifier = ? AND is_done = ?", md5, false).Error
-	isDone = errors.Is(global.GVA_DB.First(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound)
+	isDone = errors.Is(global.GVA_DB.First(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound)
 	return err, uploads, !isDone
 }
 
@@ -43,7 +43,7 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
 	finishDir := "./finish/"
 	dir := "./chunk/" + md5
 	// 如果文件上传成功 不做后续操作 通知成功即可
-	if !errors.Is(global.GVA_DB.First(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound) {
+	if !errors.Is(global.GVA_DB.First(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound) {
 		return nil
 	}
 
@@ -71,11 +71,11 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
 	}
 	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
 		// 删除切片信息
-		if err = tx.Delete(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, false).Error; err != nil {
+		if err = tx.Delete(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, false).Error; err != nil {
 			fmt.Println(err)
 			return err
 		}
-		data := model.ExaSimpleUploader{
+		data := example.ExaSimpleUploader{
 			Identifier: md5,
 			IsDone:     true,
 			FilePath:   finishDir + fileName,

server/service/jwt_black_list.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/system"
 	"time"
 
 	"gorm.io/gorm"
@@ -16,7 +16,7 @@ import (
 //@param: jwtList model.JwtBlacklist
 //@return: err error
 
-func JsonInBlacklist(jwtList model.JwtBlacklist) (err error) {
+func JsonInBlacklist(jwtList system.JwtBlacklist) (err error) {
 	err = global.GVA_DB.Create(&jwtList).Error
 	return
 }
@@ -28,7 +28,7 @@ func JsonInBlacklist(jwtList model.JwtBlacklist) (err error) {
 //@return: bool
 
 func IsBlacklist(jwt string) bool {
-	err := global.GVA_DB.Where("jwt = ?", jwt).First(&model.JwtBlacklist{}).Error
+	err := global.GVA_DB.Where("jwt = ?", jwt).First(&system.JwtBlacklist{}).Error
 	isNotFound := errors.Is(err, gorm.ErrRecordNotFound)
 	return !isNotFound
 }

server/service/sys_api.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 
 	"gorm.io/gorm"
 )
@@ -15,8 +15,8 @@ import (
 //@param: api model.SysApi
 //@return: err error
 
-func CreateApi(api model.SysApi) (err error) {
-	if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&model.SysApi{}).Error, gorm.ErrRecordNotFound) {
+func CreateApi(api system.SysApi) (err error) {
+	if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) {
 		return errors.New("存在相同api")
 	}
 	return global.GVA_DB.Create(&api).Error
@@ -28,7 +28,7 @@ func CreateApi(api model.SysApi) (err error) {
 //@param: api model.SysApi
 //@return: err error
 
-func DeleteApi(api model.SysApi) (err error) {
+func DeleteApi(api system.SysApi) (err error) {
 	err = global.GVA_DB.Delete(&api).Error
 	ClearCasbin(1, api.Path, api.Method)
 	return err
@@ -40,11 +40,11 @@ func DeleteApi(api model.SysApi) (err error) {
 //@param: api model.SysApi, info request.PageInfo, order string, desc bool
 //@return: err error
 
-func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
+func GetAPIInfoList(api system.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
-	db := global.GVA_DB.Model(&model.SysApi{})
-	var apiList []model.SysApi
+	db := global.GVA_DB.Model(&system.SysApi{})
+	var apiList []system.SysApi
 
 	if api.Path != "" {
 		db = db.Where("path LIKE ?", "%"+api.Path+"%")
@@ -88,7 +88,7 @@ func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc
 //@description: 获取所有的api
 //@return: err error, apis []model.SysApi
 
-func GetAllApis() (err error, apis []model.SysApi) {
+func GetAllApis() (err error, apis []system.SysApi) {
 	err = global.GVA_DB.Find(&apis).Error
 	return
 }
@@ -99,7 +99,7 @@ func GetAllApis() (err error, apis []model.SysApi) {
 //@param: id float64
 //@return: err error, api model.SysApi
 
-func GetApiById(id float64) (err error, api model.SysApi) {
+func GetApiById(id float64) (err error, api system.SysApi) {
 	err = global.GVA_DB.Where("id = ?", id).First(&api).Error
 	return
 }
@@ -110,11 +110,11 @@ func GetApiById(id float64) (err error, api model.SysApi) {
 //@param: api model.SysApi
 //@return: err error
 
-func UpdateApi(api model.SysApi) (err error) {
-	var oldA model.SysApi
+func UpdateApi(api system.SysApi) (err error) {
+	var oldA system.SysApi
 	err = global.GVA_DB.Where("id = ?", api.ID).First(&oldA).Error
 	if oldA.Path != api.Path || oldA.Method != api.Method {
-		if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&model.SysApi{}).Error, gorm.ErrRecordNotFound) {
+		if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) {
 			return errors.New("存在相同api路径")
 		}
 	}
@@ -138,10 +138,10 @@ func UpdateApi(api model.SysApi) (err error) {
 //@return: err error
 
 func DeleteApisByIds(ids request.IdsReq) (err error) {
-	err = global.GVA_DB.Delete(&[]model.SysApi{}, "id in ?", ids.Ids).Error
+	err = global.GVA_DB.Delete(&[]system.SysApi{}, "id in ?", ids.Ids).Error
 	return err
 }
 
 func DeleteApiByIds(ids []string) (err error) {
-	return global.GVA_DB.Delete(model.SysApi{}, ids).Error
+	return global.GVA_DB.Delete(system.SysApi{}, ids).Error
 }

server/service/sys_authority.go

@@ -3,9 +3,9 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
+	"gin-vue-admin/model/system/response"
 	"gorm.io/gorm"
 	"strconv"
 )
@@ -16,8 +16,8 @@ import (
 //@param: auth model.SysAuthority
 //@return: err error, authority model.SysAuthority
 
-func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
-	var authorityBox model.SysAuthority
+func CreateAuthority(auth system.SysAuthority) (err error, authority system.SysAuthority) {
+	var authorityBox system.SysAuthority
 	if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
 		return errors.New("存在相同角色id"), auth
 	}
@@ -31,14 +31,14 @@ func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
 //@param: copyInfo response.SysAuthorityCopyResponse
 //@return: err error, authority model.SysAuthority
 
-func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, authority model.SysAuthority) {
-	var authorityBox model.SysAuthority
+func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, authority system.SysAuthority) {
+	var authorityBox system.SysAuthority
 	if !errors.Is(global.GVA_DB.Where("authority_id = ?", copyInfo.Authority.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
 		return errors.New("存在相同角色id"), authority
 	}
-	copyInfo.Authority.Children = []model.SysAuthority{}
+	copyInfo.Authority.Children = []system.SysAuthority{}
 	err, menus := GetMenuAuthority(&request.GetAuthorityId{AuthorityId: copyInfo.OldAuthorityId})
-	var baseMenu []model.SysBaseMenu
+	var baseMenu []system.SysBaseMenu
 	for _, v := range menus {
 		intNum, _ := strconv.Atoi(v.MenuId)
 		v.SysBaseMenu.ID = uint(intNum)
@@ -61,8 +61,8 @@ func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, autho
 //@param: auth model.SysAuthority
 //@return: err error, authority model.SysAuthority
 
-func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
-	err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Updates(&auth).Error
+func UpdateAuthority(auth system.SysAuthority) (err error, authority system.SysAuthority) {
+	err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&system.SysAuthority{}).Updates(&auth).Error
 	return err, auth
 }
 
@@ -72,11 +72,11 @@ func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
 //@param: auth *model.SysAuthority
 //@return: err error
 
-func DeleteAuthority(auth *model.SysAuthority) (err error) {
-	if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysUser{}).Error, gorm.ErrRecordNotFound) {
+func DeleteAuthority(auth *system.SysAuthority) (err error) {
+	if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&system.SysUser{}).Error, gorm.ErrRecordNotFound) {
 		return errors.New("此角色有用户正在使用禁止删除")
 	}
-	if !errors.Is(global.GVA_DB.Where("parent_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Error, gorm.ErrRecordNotFound) {
+	if !errors.Is(global.GVA_DB.Where("parent_id = ?", auth.AuthorityId).First(&system.SysAuthority{}).Error, gorm.ErrRecordNotFound) {
 		return errors.New("此角色存在子角色不允许删除")
 	}
 	db := global.GVA_DB.Preload("SysBaseMenus").Where("authority_id = ?", auth.AuthorityId).First(auth)
@@ -101,7 +101,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB
-	var authority []model.SysAuthority
+	var authority []system.SysAuthority
 	err = db.Limit(limit).Offset(offset).Preload("DataAuthorityId").Where("parent_id = 0").Find(&authority).Error
 	if len(authority) > 0 {
 		for k := range authority {
@@ -117,7 +117,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
 //@param: auth model.SysAuthority
 //@return: err error, sa model.SysAuthority
 
-func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority) {
+func GetAuthorityInfo(auth system.SysAuthority) (err error, sa system.SysAuthority) {
 	err = global.GVA_DB.Preload("DataAuthorityId").Where("authority_id = ?", auth.AuthorityId).First(&sa).Error
 	return err, sa
 }
@@ -128,8 +128,8 @@ func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority
 //@param: auth model.SysAuthority
 //@return: error
 
-func SetDataAuthority(auth model.SysAuthority) error {
-	var s model.SysAuthority
+func SetDataAuthority(auth system.SysAuthority) error {
+	var s system.SysAuthority
 	global.GVA_DB.Preload("DataAuthorityId").First(&s, "authority_id = ?", auth.AuthorityId)
 	err := global.GVA_DB.Model(&s).Association("DataAuthorityId").Replace(&auth.DataAuthorityId)
 	return err
@@ -141,8 +141,8 @@ func SetDataAuthority(auth model.SysAuthority) error {
 //@param: auth *model.SysAuthority
 //@return: error
 
-func SetMenuAuthority(auth *model.SysAuthority) error {
-	var s model.SysAuthority
+func SetMenuAuthority(auth *system.SysAuthority) error {
+	var s system.SysAuthority
 	global.GVA_DB.Preload("SysBaseMenus").First(&s, "authority_id = ?", auth.AuthorityId)
 	err := global.GVA_DB.Model(&s).Association("SysBaseMenus").Replace(&auth.SysBaseMenus)
 	return err
@@ -154,7 +154,7 @@ func SetMenuAuthority(auth *model.SysAuthority) error {
 //@param: authority *model.SysAuthority
 //@return: err error
 
-func findChildrenAuthority(authority *model.SysAuthority) (err error) {
+func findChildrenAuthority(authority *system.SysAuthority) (err error) {
 	err = global.GVA_DB.Preload("DataAuthorityId").Where("parent_id = ?", authority.AuthorityId).Find(&authority.Children).Error
 	if len(authority.Children) > 0 {
 		for k := range authority.Children {

server/service/sys_auto_code.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"gin-vue-admin/utils"
 	"io/ioutil"
 	"os"
@@ -36,7 +36,7 @@ type tplData struct {
 //@param: model.AutoCodeStruct
 //@return: map[string]string, error
 
-func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
+func PreviewTemp(autoCode system.AutoCodeStruct) (map[string]string, error) {
 	dataList, _, needMkdir, err := getNeedList(&autoCode)
 	if err != nil {
 		return nil, err
@@ -101,7 +101,7 @@ func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
 //@param: model.AutoCodeStruct
 //@return: err error
 
-func CreateTemp(autoCode model.AutoCodeStruct, ids ...uint) (err error) {
+func CreateTemp(autoCode system.AutoCodeStruct, ids ...uint) (err error) {
 	dataList, fileList, needMkdir, err := getNeedList(&autoCode)
 	if err != nil {
 		return err
@@ -325,8 +325,8 @@ func addAutoMoveFile(data *tplData) {
 //@param: a *model.AutoCodeStruct
 //@return: err error
 
-func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
-	var apiList = []model.SysApi{
+func AutoCreateApi(a *system.AutoCodeStruct) (ids []uint, err error) {
+	var apiList = []system.SysApi{
 		{
 			Path:        "/" + a.Abbreviation + "/" + "create" + a.StructName,
 			Description: "新增" + a.Description,
@@ -367,7 +367,7 @@ func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
 	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
 
 		for _, v := range apiList {
-			var api model.SysApi
+			var api system.SysApi
 			if errors.Is(tx.Where("path = ? AND method = ?", v.Path, v.Method).First(&api).Error, gorm.ErrRecordNotFound) {
 				if err = tx.Create(&v).Error; err != nil { // 遇到错误时回滚事务
 					return err
@@ -381,7 +381,7 @@ func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
 	return ids, err
 }
 
-func getNeedList(autoCode *model.AutoCodeStruct) (dataList []tplData, fileList []string, needMkdir []string, err error) {
+func getNeedList(autoCode *system.AutoCodeStruct) (dataList []tplData, fileList []string, needMkdir []string, err error) {
 	// 去除所有空格
 	utils.TrimSpace(autoCode)
 	for _, field := range autoCode.Fields {

server/service/sys_autocode_history.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
 	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
 	"gin-vue-admin/utils"
 	"strings"
 
@@ -12,7 +12,7 @@ import (
 
 // CreateAutoCodeHistory RouterPath : RouterPath@RouterString;RouterPath2@RouterString2
 func CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string) error {
-	return global.GVA_DB.Create(&model.SysAutoCodeHistory{
+	return global.GVA_DB.Create(&system.SysAutoCodeHistory{
 		RequestMeta:   meta,
 		AutoCodePath:  autoCodePath,
 		InjectionMeta: injectionMeta,
@@ -25,7 +25,7 @@ func CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string,
 
 // RollBack 回滚
 func RollBack(id uint) error {
-	md := model.SysAutoCodeHistory{}
+	md := system.SysAutoCodeHistory{}
 	if err := global.GVA_DB.First(&md, id).Error; err != nil {
 		return err
 	}
@@ -67,7 +67,7 @@ func RollBack(id uint) error {
 
 func GetMeta(id uint) (string, error) {
 	var meta string
-	return meta, global.GVA_DB.Model(model.SysAutoCodeHistory{}).Select("request_meta").First(&meta, id).Error
+	return meta, global.GVA_DB.Model(system.SysAutoCodeHistory{}).Select("request_meta").First(&meta, id).Error
 }
 
 // GetSysHistoryPage  获取系统历史数据
@@ -75,7 +75,7 @@ func GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, tota
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	db := global.GVA_DB
-	var fileLists []model.SysAutoCodeHistory
+	var fileLists []system.SysAutoCodeHistory
 	err = db.Find(&fileLists).Count(&total).Error
 	err = db.Limit(limit).Offset(offset).Order("updated_at desc").Select("id,created_at,updated_at,struct_name,struct_cn_name,flag,table_name").Find(&fileLists).Error
 	return err, fileLists, total
@@ -83,5 +83,5 @@ func GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, tota
 
 // DeletePage 删除历史数据
 func DeletePage(id uint) error {
-	return global.GVA_DB.Delete(model.SysAutoCodeHistory{}, id).Error
+	return global.GVA_DB.Delete(system.SysAutoCodeHistory{}, id).Error
 }

server/service/sys_base_menu.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/system"
 	"gorm.io/gorm"
 )
 
@@ -14,11 +14,11 @@ import (
 //@return: err error
 
 func DeleteBaseMenu(id float64) (err error) {
-	err = global.GVA_DB.Preload("Parameters").Where("parent_id = ?", id).First(&model.SysBaseMenu{}).Error
+	err = global.GVA_DB.Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
 	if err != nil {
-		var menu model.SysBaseMenu
+		var menu system.SysBaseMenu
 		db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)
-		err = global.GVA_DB.Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
+		err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
 		if len(menu.SysAuthoritys) > 0 {
 			err = global.GVA_DB.Model(&menu).Association("SysAuthoritys").Delete(&menu.SysAuthoritys)
 		} else {
@@ -36,8 +36,8 @@ func DeleteBaseMenu(id float64) (err error) {
 //@param: menu model.SysBaseMenu
 //@return: err error
 
-func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
-	var oldMenu model.SysBaseMenu
+func UpdateBaseMenu(menu system.SysBaseMenu) (err error) {
+	var oldMenu system.SysBaseMenu
 	upDateMap := make(map[string]interface{})
 	upDateMap["keep_alive"] = menu.KeepAlive
 	upDateMap["close_tab"] = menu.CloseTab
@@ -54,12 +54,12 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
 	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
 		db := tx.Where("id = ?", menu.ID).Find(&oldMenu)
 		if oldMenu.Name != menu.Name {
-			if !errors.Is(tx.Where("id <> ? AND name = ?", menu.ID, menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
+			if !errors.Is(tx.Where("id <> ? AND name = ?", menu.ID, menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
 				global.GVA_LOG.Debug("存在相同name修改失败")
 				return errors.New("存在相同name修改失败")
 			}
 		}
-		txErr := tx.Unscoped().Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
+		txErr := tx.Unscoped().Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
 		if txErr != nil {
 			global.GVA_LOG.Debug(txErr.Error())
 			return txErr
@@ -91,7 +91,7 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
 //@param: id float64
 //@return: err error, menu model.SysBaseMenu
 
-func GetBaseMenuById(id float64) (err error, menu model.SysBaseMenu) {
+func GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
 	err = global.GVA_DB.Preload("Parameters").Where("id = ?", id).First(&menu).Error
 	return
 }

server/service/sys_casbin.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"github.com/casbin/casbin/v2"
 	"github.com/casbin/casbin/v2/util"
 	gormadapter "github.com/casbin/gorm-adapter/v3"
@@ -23,7 +23,7 @@ func UpdateCasbin(authorityId string, casbinInfos []request.CasbinInfo) error {
 	ClearCasbin(0, authorityId)
 	rules := [][]string{}
 	for _, v := range casbinInfos {
-		cm := model.CasbinModel{
+		cm := system.CasbinModel{
 			Ptype:       "p",
 			AuthorityId: authorityId,
 			Path:        v.Path,
@@ -46,7 +46,7 @@ func UpdateCasbin(authorityId string, casbinInfos []request.CasbinInfo) error {
 //@return: error
 
 func UpdateCasbinApi(oldPath string, newPath string, oldMethod string, newMethod string) error {
-	err := global.GVA_DB.Table("casbin_rule").Model(&model.CasbinModel{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
+	err := global.GVA_DB.Table("casbin_rule").Model(&system.CasbinModel{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
 		"v1": newPath,
 		"v2": newMethod,
 	}).Error

server/service/sys_dictionary.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"gorm.io/gorm"
 )
 
@@ -14,8 +14,8 @@ import (
 //@param: sysDictionary model.SysDictionary
 //@return: err error
 
-func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
-	if (!errors.Is(global.GVA_DB.First(&model.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
+func CreateSysDictionary(sysDictionary system.SysDictionary) (err error) {
+	if (!errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
 		return errors.New("存在相同的type，不允许创建")
 	}
 	err = global.GVA_DB.Create(&sysDictionary).Error
@@ -28,7 +28,7 @@ func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
 //@param: sysDictionary model.SysDictionary
 //@return: err error
 
-func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) {
+func DeleteSysDictionary(sysDictionary system.SysDictionary) (err error) {
 	err = global.GVA_DB.Delete(&sysDictionary).Delete(&sysDictionary.SysDictionaryDetails).Error
 	return err
 }
@@ -39,8 +39,8 @@ func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) {
 //@param: sysDictionary *model.SysDictionary
 //@return: err error
 
-func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
-	var dict model.SysDictionary
+func UpdateSysDictionary(sysDictionary *system.SysDictionary) (err error) {
+	var dict system.SysDictionary
 	sysDictionaryMap := map[string]interface{}{
 		"Name":   sysDictionary.Name,
 		"Type":   sysDictionary.Type,
@@ -51,7 +51,7 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
 	if dict.Type == sysDictionary.Type {
 		err = db.Updates(sysDictionaryMap).Error
 	} else {
-		if (!errors.Is(global.GVA_DB.First(&model.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
+		if (!errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
 			return errors.New("存在相同的type，不允许创建")
 		}
 		err = db.Updates(sysDictionaryMap).Error
@@ -66,7 +66,7 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
 //@param: Type string, Id uint
 //@return: err error, sysDictionary model.SysDictionary
 
-func GetSysDictionary(Type string, Id uint) (err error, sysDictionary model.SysDictionary) {
+func GetSysDictionary(Type string, Id uint) (err error, sysDictionary system.SysDictionary) {
 	err = global.GVA_DB.Where("type = ? OR id = ?", Type, Id).Preload("SysDictionaryDetails").First(&sysDictionary).Error
 	return
 }
@@ -82,8 +82,8 @@ func GetSysDictionaryInfoList(info request.SysDictionarySearch) (err error, list
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	// 创建db
-	db := global.GVA_DB.Model(&model.SysDictionary{})
-	var sysDictionarys []model.SysDictionary
+	db := global.GVA_DB.Model(&system.SysDictionary{})
+	var sysDictionarys []system.SysDictionary
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if info.Name != "" {
 		db = db.Where("`name` LIKE ?", "%"+info.Name+"%")

server/service/sys_dictionary_detail.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 )
 
 //@author: [piexlmax](https://github.com/piexlmax)
@@ -12,7 +12,7 @@ import (
 //@param: sysDictionaryDetail model.SysDictionaryDetail
 //@return: err error
 
-func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
+func CreateSysDictionaryDetail(sysDictionaryDetail system.SysDictionaryDetail) (err error) {
 	err = global.GVA_DB.Create(&sysDictionaryDetail).Error
 	return err
 }
@@ -23,7 +23,7 @@ func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
 //@param: sysDictionaryDetail model.SysDictionaryDetail
 //@return: err error
 
-func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
+func DeleteSysDictionaryDetail(sysDictionaryDetail system.SysDictionaryDetail) (err error) {
 	err = global.GVA_DB.Delete(&sysDictionaryDetail).Error
 	return err
 }
@@ -34,7 +34,7 @@ func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
 //@param: sysDictionaryDetail *model.SysDictionaryDetail
 //@return: err error
 
-func UpdateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (err error) {
+func UpdateSysDictionaryDetail(sysDictionaryDetail *system.SysDictionaryDetail) (err error) {
 	err = global.GVA_DB.Save(sysDictionaryDetail).Error
 	return err
 }
@@ -45,7 +45,7 @@ func UpdateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (
 //@param: id uint
 //@return: err error, sysDictionaryDetail model.SysDictionaryDetail
 
-func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDictionaryDetail) {
+func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail system.SysDictionaryDetail) {
 	err = global.GVA_DB.Where("id = ?", id).First(&sysDictionaryDetail).Error
 	return
 }
@@ -60,8 +60,8 @@ func GetSysDictionaryDetailInfoList(info request.SysDictionaryDetailSearch) (err
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	// 创建db
-	db := global.GVA_DB.Model(&model.SysDictionaryDetail{})
-	var sysDictionaryDetails []model.SysDictionaryDetail
+	db := global.GVA_DB.Model(&system.SysDictionaryDetail{})
+	var sysDictionaryDetails []system.SysDictionaryDetail
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if info.Label != "" {
 		db = db.Where("label LIKE ?", "%"+info.Label+"%")

server/service/sys_initdb.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"gin-vue-admin/config"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/example"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"gin-vue-admin/source"
 	"gin-vue-admin/utils"
 	"path/filepath"
@@ -55,7 +56,7 @@ func createTable(dsn string, driver string, createSql string) error {
 	return err
 }
 
-func initDB(InitDBFunctions ...model.InitDBFunc) (err error) {
+func initDB(InitDBFunctions ...system.InitDBFunc) (err error) {
 	for _, v := range InitDBFunctions {
 		err = v.Init()
 		if err != nil {
@@ -117,21 +118,21 @@ func InitDB(conf request.InitDB) error {
 	}
 
 	err := global.GVA_DB.AutoMigrate(
-		model.SysUser{},
-		model.SysAuthority{},
-		model.SysApi{},
-		model.SysBaseMenu{},
-		model.SysBaseMenuParameter{},
-		model.JwtBlacklist{},
-		model.SysDictionary{},
-		model.SysDictionaryDetail{},
-		model.ExaFileUploadAndDownload{},
-		model.ExaFile{},
-		model.ExaFileChunk{},
-		model.ExaSimpleUploader{},
-		model.ExaCustomer{},
-		model.SysOperationRecord{},
-		model.SysAutoCodeHistory{},
+		system.SysUser{},
+		system.SysAuthority{},
+		system.SysApi{},
+		system.SysBaseMenu{},
+		system.SysBaseMenuParameter{},
+		system.JwtBlacklist{},
+		system.SysDictionary{},
+		system.SysDictionaryDetail{},
+		example.ExaFileUploadAndDownload{},
+		example.ExaFile{},
+		example.ExaFileChunk{},
+		example.ExaSimpleUploader{},
+		example.ExaCustomer{},
+		system.SysOperationRecord{},
+		system.SysAutoCodeHistory{},
 	)
 	if err != nil {
 		global.GVA_DB = nil

server/service/sys_menu.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"gorm.io/gorm"
 	"strconv"
 )
@@ -15,9 +15,9 @@ import (
 //@param: authorityId string
 //@return: err error, treeMap map[string][]model.SysMenu
 
-func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.SysMenu) {
-	var allMenus []model.SysMenu
-	treeMap = make(map[string][]model.SysMenu)
+func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]system.SysMenu) {
+	var allMenus []system.SysMenu
+	treeMap = make(map[string][]system.SysMenu)
 	err = global.GVA_DB.Where("authority_id = ?", authorityId).Order("sort").Preload("Parameters").Find(&allMenus).Error
 	for _, v := range allMenus {
 		treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
@@ -31,7 +31,7 @@ func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.S
 //@param: authorityId string
 //@return: err error, menus []model.SysMenu
 
-func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
+func GetMenuTree(authorityId string) (err error, menus []system.SysMenu) {
 	err, menuTree := getMenuTreeMap(authorityId)
 	menus = menuTree["0"]
 	for i := 0; i < len(menus); i++ {
@@ -46,7 +46,7 @@ func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
 //@param: menu *model.SysMenu, treeMap map[string][]model.SysMenu
 //@return: err error
 
-func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (err error) {
+func getChildrenList(menu *system.SysMenu, treeMap map[string][]system.SysMenu) (err error) {
 	menu.Children = treeMap[menu.MenuId]
 	for i := 0; i < len(menu.Children); i++ {
 		err = getChildrenList(&menu.Children[i], treeMap)
@@ -60,7 +60,7 @@ func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (e
 //@return: err error, list interface{}, total int64
 
 func GetInfoList() (err error, list interface{}, total int64) {
-	var menuList []model.SysBaseMenu
+	var menuList []system.SysBaseMenu
 	err, treeMap := getBaseMenuTreeMap()
 	menuList = treeMap["0"]
 	for i := 0; i < len(menuList); i++ {
@@ -75,7 +75,7 @@ func GetInfoList() (err error, list interface{}, total int64) {
 //@param: menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu
 //@return: err error
 
-func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu) (err error) {
+func getBaseChildrenList(menu *system.SysBaseMenu, treeMap map[string][]system.SysBaseMenu) (err error) {
 	menu.Children = treeMap[strconv.Itoa(int(menu.ID))]
 	for i := 0; i < len(menu.Children); i++ {
 		err = getBaseChildrenList(&menu.Children[i], treeMap)
@@ -89,8 +89,8 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
 //@param: menu model.SysBaseMenu
 //@return: error
 
-func AddBaseMenu(menu model.SysBaseMenu) error {
-	if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
+func AddBaseMenu(menu system.SysBaseMenu) error {
+	if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
 		return errors.New("存在重复name，请修改name")
 	}
 	return global.GVA_DB.Create(&menu).Error
@@ -101,9 +101,9 @@ func AddBaseMenu(menu model.SysBaseMenu) error {
 //@description: 获取路由总树map
 //@return: err error, treeMap map[string][]model.SysBaseMenu
 
-func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
-	var allMenus []model.SysBaseMenu
-	treeMap = make(map[string][]model.SysBaseMenu)
+func getBaseMenuTreeMap() (err error, treeMap map[string][]system.SysBaseMenu) {
+	var allMenus []system.SysBaseMenu
+	treeMap = make(map[string][]system.SysBaseMenu)
 	err = global.GVA_DB.Order("sort").Preload("Parameters").Find(&allMenus).Error
 	for _, v := range allMenus {
 		treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
@@ -116,7 +116,7 @@ func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
 //@description: 获取基础路由树
 //@return: err error, menus []model.SysBaseMenu
 
-func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
+func GetBaseMenuTree() (err error, menus []system.SysBaseMenu) {
 	err, treeMap := getBaseMenuTreeMap()
 	menus = treeMap["0"]
 	for i := 0; i < len(menus); i++ {
@@ -131,8 +131,8 @@ func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
 //@param: menus []model.SysBaseMenu, authorityId string
 //@return: err error
 
-func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error) {
-	var auth model.SysAuthority
+func AddMenuAuthority(menus []system.SysBaseMenu, authorityId string) (err error) {
+	var auth system.SysAuthority
 	auth.AuthorityId = authorityId
 	auth.SysBaseMenus = menus
 	err = SetMenuAuthority(&auth)
@@ -145,7 +145,7 @@ func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error)
 //@param: info *request.GetAuthorityId
 //@return: err error, menus []model.SysMenu
 
-func GetMenuAuthority(info *request.GetAuthorityId) (err error, menus []model.SysMenu) {
+func GetMenuAuthority(info *request.GetAuthorityId) (err error, menus []system.SysMenu) {
 	err = global.GVA_DB.Where("authority_id = ? ", info.AuthorityId).Order("sort").Find(&menus).Error
 	//sql := "SELECT authority_menu.keep_alive,authority_menu.default_menu,authority_menu.created_at,authority_menu.updated_at,authority_menu.deleted_at,authority_menu.menu_level,authority_menu.parent_id,authority_menu.path,authority_menu.`name`,authority_menu.hidden,authority_menu.component,authority_menu.title,authority_menu.icon,authority_menu.sort,authority_menu.menu_id,authority_menu.authority_id FROM authority_menu WHERE authority_menu.authority_id = ? ORDER BY authority_menu.sort ASC"
 	//err = global.GVA_DB.Raw(sql, authorityId).Scan(&menus).Error

server/service/sys_operation_record.go

@@ -2,8 +2,8 @@ package service
 
 import (
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 )
 
 //@author: [granty1](https://github.com/granty1)
@@ -12,7 +12,7 @@ import (
 //@param: sysOperationRecord model.SysOperationRecord
 //@return: err error
 
-func CreateSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err error) {
+func CreateSysOperationRecord(sysOperationRecord system.SysOperationRecord) (err error) {
 	err = global.GVA_DB.Create(&sysOperationRecord).Error
 	return err
 }
@@ -25,7 +25,7 @@ func CreateSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err
 //@return: err error
 
 func DeleteSysOperationRecordByIds(ids request.IdsReq) (err error) {
-	err = global.GVA_DB.Delete(&[]model.SysOperationRecord{}, "id in (?)", ids.Ids).Error
+	err = global.GVA_DB.Delete(&[]system.SysOperationRecord{}, "id in (?)", ids.Ids).Error
 	return err
 }
 
@@ -35,7 +35,7 @@ func DeleteSysOperationRecordByIds(ids request.IdsReq) (err error) {
 //@param: sysOperationRecord model.SysOperationRecord
 //@return: err error
 
-func DeleteSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err error) {
+func DeleteSysOperationRecord(sysOperationRecord system.SysOperationRecord) (err error) {
 	err = global.GVA_DB.Delete(&sysOperationRecord).Error
 	return err
 }
@@ -46,7 +46,7 @@ func DeleteSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err
 //@param: id uint
 //@return: err error, sysOperationRecord model.SysOperationRecord
 
-func GetSysOperationRecord(id uint) (err error, sysOperationRecord model.SysOperationRecord) {
+func GetSysOperationRecord(id uint) (err error, sysOperationRecord system.SysOperationRecord) {
 	err = global.GVA_DB.Where("id = ?", id).First(&sysOperationRecord).Error
 	return
 }
@@ -62,8 +62,8 @@ func GetSysOperationRecordInfoList(info request.SysOperationRecordSearch) (err e
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 	// 创建db
-	db := global.GVA_DB.Model(&model.SysOperationRecord{})
-	var sysOperationRecords []model.SysOperationRecord
+	db := global.GVA_DB.Model(&system.SysOperationRecord{})
+	var sysOperationRecords []system.SysOperationRecord
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if info.Method != "" {
 		db = db.Where("method = ?", info.Method)

server/service/sys_system.go

@@ -3,7 +3,7 @@ package service
 import (
 	"gin-vue-admin/config"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
+	"gin-vue-admin/model/system"
 	"gin-vue-admin/utils"
 	"go.uber.org/zap"
 )
@@ -24,7 +24,7 @@ func GetSystemConfig() (err error, conf config.Server) {
 //@param: system model.System
 //@return: err error
 
-func SetSystemConfig(system model.System) (err error) {
+func SetSystemConfig(system system.System) (err error) {
 	cs := utils.StructToMap(system.Config)
 	for k, v := range cs {
 		global.GVA_VP.Set(k, v)

server/service/sys_user.go

@@ -3,8 +3,8 @@ package service
 import (
 	"errors"
 	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
+	"gin-vue-admin/model/system"
+	"gin-vue-admin/model/system/request"
 	"gin-vue-admin/utils"
 	uuid "github.com/satori/go.uuid"
 	"gorm.io/gorm"
@@ -16,8 +16,8 @@ import (
 //@param: u model.SysUser
 //@return: err error, userInter model.SysUser
 
-func Register(u model.SysUser) (err error, userInter model.SysUser) {
-	var user model.SysUser
+func Register(u system.SysUser) (err error, userInter system.SysUser) {
+	var user system.SysUser
 	if !errors.Is(global.GVA_DB.Where("username = ?", u.Username).First(&user).Error, gorm.ErrRecordNotFound) { // 判断用户名是否注册
 		return errors.New("用户名已注册"), userInter
 	}
@@ -34,8 +34,8 @@ func Register(u model.SysUser) (err error, userInter model.SysUser) {
 //@param: u *model.SysUser
 //@return: err error, userInter *model.SysUser
 
-func Login(u *model.SysUser) (err error, userInter *model.SysUser) {
-	var user model.SysUser
+func Login(u *system.SysUser) (err error, userInter *system.SysUser) {
+	var user system.SysUser
 	u.Password = utils.MD5V([]byte(u.Password))
 	err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).Preload("Authority").First(&user).Error
 	return err, &user
@@ -47,8 +47,8 @@ func Login(u *model.SysUser) (err error, userInter *model.SysUser) {
 //@param: u *model.SysUser, newPassword string
 //@return: err error, userInter *model.SysUser
 
-func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter *model.SysUser) {
-	var user model.SysUser
+func ChangePassword(u *system.SysUser, newPassword string) (err error, userInter *system.SysUser) {
+	var user system.SysUser
 	u.Password = utils.MD5V([]byte(u.Password))
 	err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Update("password", utils.MD5V([]byte(newPassword))).Error
 	return err, u
@@ -63,8 +63,8 @@ func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter
 func GetUserInfoList(info request.PageInfo) (err error, list interface{}, total int64) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
-	db := global.GVA_DB.Model(&model.SysUser{})
-	var userList []model.SysUser
+	db := global.GVA_DB.Model(&system.SysUser{})
+	var userList []system.SysUser
 	err = db.Count(&total).Error
 	err = db.Limit(limit).Offset(offset).Preload("Authority").Find(&userList).Error
 	return err, userList, total
@@ -77,7 +77,7 @@ func GetUserInfoList(info request.PageInfo) (err error, list interface{}, total
 //@return: err error
 
 func SetUserAuthority(uuid uuid.UUID, authorityId string) (err error) {
-	err = global.GVA_DB.Where("uuid = ?", uuid).First(&model.SysUser{}).Update("authority_id", authorityId).Error
+	err = global.GVA_DB.Where("uuid = ?", uuid).First(&system.SysUser{}).Update("authority_id", authorityId).Error
 	return err
 }
 
@@ -88,7 +88,7 @@ func SetUserAuthority(uuid uuid.UUID, authorityId string) (err error) {
 //@return: err error
 
 func DeleteUser(id float64) (err error) {
-	var user model.SysUser
+	var user system.SysUser
 	err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
 	return err
 }
@@ -99,7 +99,7 @@ func DeleteUser(id float64) (err error) {
 //@param: reqUser model.SysUser
 //@return: err error, user model.SysUser
 
-func SetUserInfo(reqUser model.SysUser) (err error, user model.SysUser) {
+func SetUserInfo(reqUser system.SysUser) (err error, user system.SysUser) {
 	err = global.GVA_DB.Updates(&reqUser).Error
 	return err, reqUser
 }
@@ -110,8 +110,8 @@ func SetUserInfo(reqUser model.SysUser) (err error, user model.SysUser) {
 //@param: id int
 //@return: err error, user *model.SysUser
 
-func FindUserById(id int) (err error, user *model.SysUser) {
-	var u model.SysUser
+func FindUserById(id int) (err error, user *system.SysUser) {
+	var u system.SysUser
 	err = global.GVA_DB.Where("`id` = ?", id).First(&u).Error
 	return err, &u
 }
@@ -122,8 +122,8 @@ func FindUserById(id int) (err error, user *model.SysUser) {
 //@param: uuid string
 //@return: err error, user *model.SysUser
 
-func FindUserByUuid(uuid string) (err error, user *model.SysUser) {
-	var u model.SysUser
+func FindUserByUuid(uuid string) (err error, user *system.SysUser) {
+	var u system.SysUser
 	if err = global.GVA_DB.Where("`uuid` = ?", uuid).First(&u).Error; err != nil {
 		return errors.New("用户不存在"), &u
 	}