重命名model模块，尽量避免包名冲突

server/admin/common/album/service.go

@@ -6,7 +6,7 @@ import (
 	"x_admin/config"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/common"
+	"x_admin/model/common_model"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -40,7 +40,7 @@ func (albSrv albumService) AlbumList(page request.PageReq, listReq CommonAlbumLi
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
 	// 查询
-	albumModel := albSrv.db.Model(&common.Album{}).Where("is_delete = ?", 0)
+	albumModel := albSrv.db.Model(&common_model.Album{}).Where("is_delete = ?", 0)
 	if listReq.Cid > 0 {
 		albumModel = albumModel.Where("cid = ?", listReq.Cid)
 	}
@@ -57,7 +57,7 @@ func (albSrv albumService) AlbumList(page request.PageReq, listReq CommonAlbumLi
 		return
 	}
 	// 数据
-	var albums []common.Album
+	var albums []common_model.Album
 	err = albumModel.Limit(limit).Offset(offset).Order("id desc").Find(&albums).Error
 	if e = response.CheckErr(err, "AlbumList Find err"); e != nil {
 		return
@@ -85,7 +85,7 @@ func (albSrv albumService) AlbumList(page request.PageReq, listReq CommonAlbumLi
 
 // AlbumRename 相册文件重命名
 func (albSrv albumService) AlbumRename(id uint, name string) (e error) {
-	var album common.Album
+	var album common_model.Album
 	err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&album).Error
 	if e = response.CheckErrDBNotRecord(err, "文件丢失！"); e != nil {
 		return
@@ -101,7 +101,7 @@ func (albSrv albumService) AlbumRename(id uint, name string) (e error) {
 
 // AlbumMove 相册文件移动
 func (albSrv albumService) AlbumMove(ids []uint, cid int) (e error) {
-	var albums []common.Album
+	var albums []common_model.Album
 	err := albSrv.db.Where("id in ? AND is_delete = ?", ids, 0).Find(&albums).Error
 	if e = response.CheckErr(err, "AlbumMove Find err"); e != nil {
 		return
@@ -110,7 +110,7 @@ func (albSrv albumService) AlbumMove(ids []uint, cid int) (e error) {
 		return response.AssertArgumentError.Make("文件丢失！")
 	}
 	if cid > 0 {
-		err = albSrv.db.Where("id = ? AND is_delete = ?", cid, 0).Limit(1).First(&common.AlbumCate{}).Error
+		err = albSrv.db.Where("id = ? AND is_delete = ?", cid, 0).Limit(1).First(&common_model.AlbumCate{}).Error
 		if e = response.CheckErrDBNotRecord(err, "类目已不存在！"); e != nil {
 			return
 		}
@@ -118,14 +118,14 @@ func (albSrv albumService) AlbumMove(ids []uint, cid int) (e error) {
 			return
 		}
 	}
-	err = albSrv.db.Model(&common.Album{}).Where("id in ?", ids).UpdateColumn("cid", cid).Error
+	err = albSrv.db.Model(&common_model.Album{}).Where("id in ?", ids).UpdateColumn("cid", cid).Error
 	e = response.CheckErr(err, "AlbumMove UpdateColumn err")
 	return
 }
 
 // AlbumAdd 相册文件新增
 func (albSrv albumService) AlbumAdd(addReq CommonAlbumAddReq) (res uint, e error) {
-	var alb common.Album
+	var alb common_model.Album
 	//var params map[string]interface{}
 	//if err := mapstructure.Decode(params, &alb); err != nil {
 	//	core.Logger.Errorf("AlbumAdd Decode err: err=[%+v]", err)
@@ -141,7 +141,7 @@ func (albSrv albumService) AlbumAdd(addReq CommonAlbumAddReq) (res uint, e error
 
 // AlbumDel 相册文件删除
 func (albSrv albumService) AlbumDel(ids []uint) (e error) {
-	var albums []common.Album
+	var albums []common_model.Album
 	err := albSrv.db.Where("id in ? AND is_delete = ?", ids, 0).Find(&albums).Error
 	if e = response.CheckErr(err, "AlbumDel Find err"); e != nil {
 		return
@@ -149,15 +149,15 @@ func (albSrv albumService) AlbumDel(ids []uint) (e error) {
 	if len(albums) == 0 {
 		return response.AssertArgumentError.Make("文件丢失！")
 	}
-	err = albSrv.db.Model(&common.Album{}).Where("id in ?", ids).Updates(
+	err = albSrv.db.Model(&common_model.Album{}).Where("id in ?", ids).Updates(
-		common.Album{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
+		common_model.Album{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
 	e = response.CheckErr(err, "AlbumDel UpdateColumn err")
 	return
 }
 
 // CateList 相册分类列表
 func (albSrv albumService) CateList(listReq CommonCateListReq) (mapList []interface{}, e error) {
-	var cates []common.AlbumCate
+	var cates []common_model.AlbumCate
 	cateModel := albSrv.db.Where("is_delete = ?", 0).Order("id desc")
 	if listReq.Type > 0 {
 		cateModel = cateModel.Where("type = ?", listReq.Type)
@@ -177,7 +177,7 @@ func (albSrv albumService) CateList(listReq CommonCateListReq) (mapList []interf
 
 // CateAdd 分类新增
 func (albSrv albumService) CateAdd(addReq CommonCateAddReq) (e error) {
-	var cate common.AlbumCate
+	var cate common_model.AlbumCate
 	response.Copy(&cate, addReq)
 	err := albSrv.db.Create(&cate).Error
 	e = response.CheckErr(err, "CateAdd Create err")
@@ -186,7 +186,7 @@ func (albSrv albumService) CateAdd(addReq CommonCateAddReq) (e error) {
 
 // CateRename 分类重命名
 func (albSrv albumService) CateRename(id uint, name string) (e error) {
-	var cate common.AlbumCate
+	var cate common_model.AlbumCate
 	err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&cate).Error
 	if e = response.CheckErrDBNotRecord(err, "分类已不存在！"); e != nil {
 		return
@@ -202,7 +202,7 @@ func (albSrv albumService) CateRename(id uint, name string) (e error) {
 
 // CateDel 分类删除
 func (albSrv albumService) CateDel(id uint) (e error) {
-	var cate common.AlbumCate
+	var cate common_model.AlbumCate
 	err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&cate).Error
 	if e = response.CheckErrDBNotRecord(err, "分类已不存在！"); e != nil {
 		return
@@ -210,7 +210,7 @@ func (albSrv albumService) CateDel(id uint) (e error) {
 	if e = response.CheckErr(err, "CateDel First err"); e != nil {
 		return
 	}
-	r := albSrv.db.Where("cid = ? AND is_delete = ?", id, 0).Limit(1).Find(&common.Album{})
+	r := albSrv.db.Where("cid = ? AND is_delete = ?", id, 0).Limit(1).Find(&common_model.Album{})
 	if e = response.CheckErr(r.Error, "CateDel Find err"); e != nil {
 		return
 	}

server/admin/setting/dict_data/service.go

@@ -4,7 +4,7 @@ import (
 	"time"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/setting"
+	"x_admin/model/setting_model"
 
 	"gorm.io/gorm"
 )
@@ -30,7 +30,7 @@ type settingDictDataService struct {
 
 // All 字典数据所有
 func (ddSrv settingDictDataService) All(allReq SettingDictDataListReq) (res []SettingDictDataResp, e error) {
-	var dictType setting.DictType
+	var dictType setting_model.DictType
 	err := ddSrv.db.Where("dict_type = ? AND is_delete = ?", allReq.DictType, 0).Limit(1).First(&dictType).Error
 	if e = response.CheckErrDBNotRecord(err, "该字典类型不存在！"); e != nil {
 		return
@@ -48,7 +48,7 @@ func (ddSrv settingDictDataService) All(allReq SettingDictDataListReq) (res []Se
 	if allReq.Status >= 0 {
 		ddModel = ddModel.Where("status = ?", allReq.Status)
 	}
-	var dictDatas []setting.DictData
+	var dictDatas []setting_model.DictData
 	err = ddModel.Order("id desc").Find(&dictDatas).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
@@ -62,7 +62,7 @@ func (ddSrv settingDictDataService) All(allReq SettingDictDataListReq) (res []Se
 func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDictDataListReq) (res response.PageResp, e error) {
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
-	var dictType setting.DictType
+	var dictType setting_model.DictType
 	err := ddSrv.db.Where("dict_type = ? AND is_delete = ?", listReq.DictType, 0).Limit(1).First(&dictType).Error
 	if e = response.CheckErrDBNotRecord(err, "该字典类型不存在！"); e != nil {
 		return
@@ -70,7 +70,7 @@ func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDi
 	if e = response.CheckErr(err, "List First err"); e != nil {
 		return
 	}
-	ddModel := ddSrv.db.Model(&setting.DictData{}).Where("type_id = ? AND is_delete = ?", dictType.ID, 0)
+	ddModel := ddSrv.db.Model(&setting_model.DictData{}).Where("type_id = ? AND is_delete = ?", dictType.ID, 0)
 	if listReq.Name != "" {
 		ddModel = ddModel.Where("name like ?", "%"+listReq.Name+"%")
 	}
@@ -85,7 +85,7 @@ func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDi
 	if e = response.CheckErr(err, "List Count err"); e != nil {
 		return
 	}
-	var dds []setting.DictData
+	var dds []setting_model.DictData
 	err = ddModel.Limit(limit).Offset(offset).Order("id desc").Find(&dds).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -102,7 +102,7 @@ func (ddSrv settingDictDataService) List(page request.PageReq, listReq SettingDi
 
 // Detail 字典数据详情
 func (ddSrv settingDictDataService) Detail(id uint) (res SettingDictDataResp, e error) {
-	var dd setting.DictData
+	var dd setting_model.DictData
 	err := ddSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dd).Error
 	if e = response.CheckErrDBNotRecord(err, "字典数据不存在！"); e != nil {
 		return
@@ -116,10 +116,10 @@ func (ddSrv settingDictDataService) Detail(id uint) (res SettingDictDataResp, e
 
 // Add 字典数据新增
 func (ddSrv settingDictDataService) Add(addReq SettingDictDataAddReq) (e error) {
-	if r := ddSrv.db.Where("name = ? AND is_delete = ?", addReq.Name, 0).Limit(1).First(&setting.DictData{}); r.RowsAffected > 0 {
+	if r := ddSrv.db.Where("name = ? AND is_delete = ?", addReq.Name, 0).Limit(1).First(&setting_model.DictData{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典数据已存在！")
 	}
-	var dd setting.DictData
+	var dd setting_model.DictData
 	response.Copy(&dd, addReq)
 	err := ddSrv.db.Create(&dd).Error
 	e = response.CheckErr(err, "Add Create err")
@@ -128,17 +128,17 @@ func (ddSrv settingDictDataService) Add(addReq SettingDictDataAddReq) (e error)
 
 // Edit 字典数据编辑
 func (ddSrv settingDictDataService) Edit(editReq SettingDictDataEditReq) (e error) {
-	err := ddSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&setting.DictData{}).Error
+	err := ddSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&setting_model.DictData{}).Error
 	if e = response.CheckErrDBNotRecord(err, "字典数据不存在！"); e != nil {
 		return
 	}
 	if e = response.CheckErr(err, "Edit First err"); e != nil {
 		return
 	}
-	if r := ddSrv.db.Where("id != ? AND name = ? AND is_delete = ?", editReq.ID, editReq.Name, 0).Limit(1).First(&setting.DictData{}); r.RowsAffected > 0 {
+	if r := ddSrv.db.Where("id != ? AND name = ? AND is_delete = ?", editReq.ID, editReq.Name, 0).Limit(1).First(&setting_model.DictData{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典数据已存在！")
 	}
-	var dd setting.DictData
+	var dd setting_model.DictData
 	response.Copy(&dd, editReq)
 	err = ddSrv.db.Save(&dd).Error
 	e = response.CheckErr(err, "Edit Save err")
@@ -147,7 +147,7 @@ func (ddSrv settingDictDataService) Edit(editReq SettingDictDataEditReq) (e erro
 
 // Del 字典数据删除
 func (ddSrv settingDictDataService) Del(delReq SettingDictDataDelReq) (e error) {
-	err := ddSrv.db.Model(&setting.DictData{}).Where("id IN ?", delReq.Ids).Updates(
+	err := ddSrv.db.Model(&setting_model.DictData{}).Where("id IN ?", delReq.Ids).Updates(
-		setting.DictData{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
+		setting_model.DictData{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
 	return response.CheckErr(err, "Del Update err")
 }

server/admin/setting/dict_type/service.go

@@ -4,7 +4,7 @@ import (
 	"time"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/setting"
+	"x_admin/model/setting_model"
 
 	"gorm.io/gorm"
 )
@@ -30,7 +30,7 @@ type settingDictTypeService struct {
 
 // All 字典类型所有
 func (dtSrv settingDictTypeService) All() (res []SettingDictTypeResp, e error) {
-	var dictTypes []setting.DictType
+	var dictTypes []setting_model.DictType
 	err := dtSrv.db.Where("is_delete = ?", 0).Order("id desc").Find(&dictTypes).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
@@ -44,7 +44,7 @@ func (dtSrv settingDictTypeService) All() (res []SettingDictTypeResp, e error) {
 func (dtSrv settingDictTypeService) List(page request.PageReq, listReq SettingDictTypeListReq) (res response.PageResp, e error) {
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
-	dtModel := dtSrv.db.Model(&setting.DictType{}).Where("is_delete = ?", 0)
+	dtModel := dtSrv.db.Model(&setting_model.DictType{}).Where("is_delete = ?", 0)
 	if listReq.DictName != "" {
 		dtModel = dtModel.Where("dict_name like ?", "%"+listReq.DictName+"%")
 	}
@@ -59,7 +59,7 @@ func (dtSrv settingDictTypeService) List(page request.PageReq, listReq SettingDi
 	if e = response.CheckErr(err, "List Count err"); e != nil {
 		return
 	}
-	var dts []setting.DictType
+	var dts []setting_model.DictType
 	err = dtModel.Limit(limit).Offset(offset).Order("id desc").Find(&dts).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -76,7 +76,7 @@ func (dtSrv settingDictTypeService) List(page request.PageReq, listReq SettingDi
 
 // Detail 字典类型详情
 func (dtSrv settingDictTypeService) Detail(id uint) (res SettingDictTypeResp, e error) {
-	var dt setting.DictType
+	var dt setting_model.DictType
 	err := dtSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dt).Error
 	if e = response.CheckErrDBNotRecord(err, "字典类型不存在！"); e != nil {
 		return
@@ -90,13 +90,13 @@ func (dtSrv settingDictTypeService) Detail(id uint) (res SettingDictTypeResp, e
 
 // Add 字典类型新增
 func (dtSrv settingDictTypeService) Add(addReq SettingDictTypeAddReq) (e error) {
-	if r := dtSrv.db.Where("dict_name = ? AND is_delete = ?", addReq.DictName, 0).Limit(1).First(&setting.DictType{}); r.RowsAffected > 0 {
+	if r := dtSrv.db.Where("dict_name = ? AND is_delete = ?", addReq.DictName, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典名称已存在！")
 	}
-	if r := dtSrv.db.Where("dict_type = ? AND is_delete = ?", addReq.DictType, 0).Limit(1).First(&setting.DictType{}); r.RowsAffected > 0 {
+	if r := dtSrv.db.Where("dict_type = ? AND is_delete = ?", addReq.DictType, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典类型已存在！")
 	}
-	var dt setting.DictType
+	var dt setting_model.DictType
 	response.Copy(&dt, addReq)
 	err := dtSrv.db.Create(&dt).Error
 	e = response.CheckErr(err, "Add Create err")
@@ -105,20 +105,20 @@ func (dtSrv settingDictTypeService) Add(addReq SettingDictTypeAddReq) (e error)
 
 // Edit 字典类型编辑
 func (dtSrv settingDictTypeService) Edit(editReq SettingDictTypeEditReq) (e error) {
-	err := dtSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&setting.DictType{}).Error
+	err := dtSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&setting_model.DictType{}).Error
 	if e = response.CheckErrDBNotRecord(err, "字典类型不存在！"); e != nil {
 		return
 	}
 	if e = response.CheckErr(err, "Edit First err"); e != nil {
 		return
 	}
-	if r := dtSrv.db.Where("id != ? AND dict_name = ? AND is_delete = ?", editReq.ID, editReq.DictName, 0).Limit(1).First(&setting.DictType{}); r.RowsAffected > 0 {
+	if r := dtSrv.db.Where("id != ? AND dict_name = ? AND is_delete = ?", editReq.ID, editReq.DictName, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典名称已存在！")
 	}
-	if r := dtSrv.db.Where("id != ? AND dict_type = ? AND is_delete = ?", editReq.ID, editReq.DictType, 0).Limit(1).First(&setting.DictType{}); r.RowsAffected > 0 {
+	if r := dtSrv.db.Where("id != ? AND dict_type = ? AND is_delete = ?", editReq.ID, editReq.DictType, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("字典类型已存在！")
 	}
-	var dt setting.DictType
+	var dt setting_model.DictType
 	response.Copy(&dt, editReq)
 	err = dtSrv.db.Save(&dt).Error
 	e = response.CheckErr(err, "Edit Save err")
@@ -127,7 +127,7 @@ func (dtSrv settingDictTypeService) Edit(editReq SettingDictTypeEditReq) (e erro
 
 // Del 字典类型删除
 func (dtSrv settingDictTypeService) Del(delReq SettingDictTypeDelReq) (e error) {
-	err := dtSrv.db.Model(&setting.DictType{}).Where("id IN ?", delReq.Ids).Updates(
+	err := dtSrv.db.Model(&setting_model.DictType{}).Where("id IN ?", delReq.Ids).Updates(
-		setting.DictType{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
+		setting_model.DictType{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
 	return response.CheckErr(err, "Del Update err")
 }

server/admin/system/admin/service.go

@@ -11,7 +11,7 @@ import (
 	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"github.com/fatih/structs"
@@ -20,7 +20,7 @@ import (
 )
 
 type ISystemAuthAdminService interface {
-	FindByUsername(username string) (admin system.SystemAuthAdmin, err error)
+	FindByUsername(username string) (admin system_model.SystemAuthAdmin, err error)
 	Self(adminId uint) (res SystemAuthAdminSelfResp, e error)
 	List(page request.PageReq, listReq SystemAuthAdminListReq) (res response.PageResp, e error)
 	Detail(id uint) (res SystemAuthAdminResp, e error)
@@ -45,7 +45,7 @@ type systemAuthAdminService struct {
 }
 
 // FindByUsername 根据账号查找管理员
-func (adminSrv systemAuthAdminService) FindByUsername(username string) (admin system.SystemAuthAdmin, err error) {
+func (adminSrv systemAuthAdminService) FindByUsername(username string) (admin system_model.SystemAuthAdmin, err error) {
 	err = adminSrv.db.Where("username = ?", username).Limit(1).First(&admin).Error
 	return
 }
@@ -53,7 +53,7 @@ func (adminSrv systemAuthAdminService) FindByUsername(username string) (admin sy
 // Self 当前管理员
 func (adminSrv systemAuthAdminService) Self(adminId uint) (res SystemAuthAdminSelfResp, e error) {
 	// 管理员信息
-	var sysAdmin system.SystemAuthAdmin
+	var sysAdmin system_model.SystemAuthAdmin
 	err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&sysAdmin).Error
 	if e = response.CheckErr(err, "Self First err"); e != nil {
 		return
@@ -67,7 +67,7 @@ func (adminSrv systemAuthAdminService) Self(adminId uint) (res SystemAuthAdminSe
 			return
 		}
 		if len(menuIds) > 0 {
-			var menus []system.SystemAuthMenu
+			var menus []system_model.SystemAuthMenu
 			err := adminSrv.db.Where(
 				"id in ? AND is_disable = ? AND menu_type in ?", menuIds, 0, []string{"C", "A"}).Order(
 				"menu_sort, id").Find(&menus).Error
@@ -99,9 +99,9 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq System
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
 	// 查询
-	adminTbName := core.DBTableName(&system.SystemAuthAdmin{})
+	adminTbName := core.DBTableName(&system_model.SystemAuthAdmin{})
-	roleTbName := core.DBTableName(&system.SystemAuthRole{})
+	roleTbName := core.DBTableName(&system_model.SystemAuthRole{})
-	deptTbName := core.DBTableName(&system.SystemAuthDept{})
+	deptTbName := core.DBTableName(&system_model.SystemAuthDept{})
 	adminModel := adminSrv.db.Table(adminTbName+" AS admin").Where("admin.is_delete = ?", 0).Joins(
 		fmt.Sprintf("LEFT JOIN %s ON admin.role = %s.id", roleTbName, roleTbName)).Joins(
 		fmt.Sprintf("LEFT JOIN %s ON admin.dept_id = %s.id", deptTbName, deptTbName)).Select(
@@ -144,7 +144,7 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq System
 
 // Detail 管理员详细
 func (adminSrv systemAuthAdminService) Detail(id uint) (res SystemAuthAdminResp, e error) {
-	var sysAdmin system.SystemAuthAdmin
+	var sysAdmin system_model.SystemAuthAdmin
 	err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&sysAdmin).Error
 	if e = response.CheckErrDBNotRecord(err, "账号已不存在！"); e != nil {
 		return
@@ -162,7 +162,7 @@ func (adminSrv systemAuthAdminService) Detail(id uint) (res SystemAuthAdminResp,
 
 // Add 管理员新增
 func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e error) {
-	var sysAdmin system.SystemAuthAdmin
+	var sysAdmin system_model.SystemAuthAdmin
 	// 检查username
 	r := adminSrv.db.Where("username = ? AND is_delete = ?", addReq.Username, 0).Limit(1).Find(&sysAdmin)
 	err := r.Error
@@ -209,7 +209,7 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro
 // Edit 管理员编辑
 func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAdminEditReq) (e error) {
 	// 检查id
-	err := adminSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&system.SystemAuthAdmin{}).Error
+	err := adminSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&system_model.SystemAuthAdmin{}).Error
 	if e = response.CheckErrDBNotRecord(err, "账号不存在了!"); e != nil {
 		return
 	}
@@ -217,7 +217,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd
 		return
 	}
 	// 检查username
-	var admin system.SystemAuthAdmin
+	var admin system_model.SystemAuthAdmin
 	r := adminSrv.db.Where("username = ? AND is_delete = ? AND id != ?", editReq.Username, 0, editReq.ID).Find(&admin)
 	err = r.Error
 	if e = response.CheckErr(err, "Edit Find by username err"); e != nil {
@@ -292,7 +292,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd
 // Update 管理员更新
 func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq SystemAuthAdminUpdateReq, adminId uint) (e error) {
 	// 检查id
-	var admin system.SystemAuthAdmin
+	var admin system_model.SystemAuthAdmin
 	err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&admin).Error
 	if e = response.CheckErrDBNotRecord(err, "账号不存在了!"); e != nil {
 		return
@@ -350,7 +350,7 @@ func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq SystemAu
 
 // Del 管理员删除
 func (adminSrv systemAuthAdminService) Del(c *gin.Context, id uint) (e error) {
-	var admin system.SystemAuthAdmin
+	var admin system_model.SystemAuthAdmin
 	err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&admin).Error
 	if e = response.CheckErrDBNotRecord(err, "账号已不存在!"); e != nil {
 		return
@@ -364,14 +364,14 @@ func (adminSrv systemAuthAdminService) Del(c *gin.Context, id uint) (e error) {
 	if id == config.AdminConfig.GetAdminId(c) {
 		return response.AssertArgumentError.Make("不能删除自己!")
 	}
-	err = adminSrv.db.Model(&admin).Updates(system.SystemAuthAdmin{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
+	err = adminSrv.db.Model(&admin).Updates(system_model.SystemAuthAdmin{IsDelete: 1, DeleteTime: time.Now().Unix()}).Error
 	e = response.CheckErr(err, "Del Updates err")
 	return
 }
 
 // Disable 管理员状态切换
 func (adminSrv systemAuthAdminService) Disable(c *gin.Context, id uint) (e error) {
-	var admin system.SystemAuthAdmin
+	var admin system_model.SystemAuthAdmin
 	err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).Find(&admin).Error
 	if e = response.CheckErr(err, "Disable Find err"); e != nil {
 		return
@@ -386,14 +386,14 @@ func (adminSrv systemAuthAdminService) Disable(c *gin.Context, id uint) (e error
 	if admin.IsDisable == 0 {
 		isDisable = 1
 	}
-	err = adminSrv.db.Model(&admin).Updates(system.SystemAuthAdmin{IsDisable: isDisable, UpdateTime: time.Now().Unix()}).Error
+	err = adminSrv.db.Model(&admin).Updates(system_model.SystemAuthAdmin{IsDisable: isDisable, UpdateTime: time.Now().Unix()}).Error
 	e = response.CheckErr(err, "Disable Updates err")
 	return
 }
 
 // CacheAdminUserByUid 缓存管理员
 func (adminSrv systemAuthAdminService) CacheAdminUserByUid(id uint) (err error) {
-	var admin system.SystemAuthAdmin
+	var admin system_model.SystemAuthAdmin
 	err = adminSrv.db.Where("id = ?", id).Limit(1).First(&admin).Error
 	if err != nil {
 		return

server/admin/system/dept/service.go

@@ -2,7 +2,7 @@ package dept
 
 import (
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -29,7 +29,7 @@ type systemAuthDeptService struct {
 
 // All 部门所有
 func (deptSrv systemAuthDeptService) All() (res []SystemAuthDeptResp, e error) {
-	var depts []system.SystemAuthDept
+	var depts []system_model.SystemAuthDept
 	err := deptSrv.db.Where("pid > ? AND is_delete = ?", 0, 0).Order("sort desc, id desc").Find(&depts).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
@@ -48,7 +48,7 @@ func (deptSrv systemAuthDeptService) List(listReq SystemAuthDeptListReq) (mapLis
 	if listReq.IsStop >= 0 {
 		deptModel = deptModel.Where("is_stop = ?", listReq.IsStop)
 	}
-	var depts []system.SystemAuthDept
+	var depts []system_model.SystemAuthDept
 	err := deptModel.Order("sort desc, id desc").Find(&depts).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -62,7 +62,7 @@ func (deptSrv systemAuthDeptService) List(listReq SystemAuthDeptListReq) (mapLis
 
 // Detail 部门详情
 func (deptSrv systemAuthDeptService) Detail(id uint) (res SystemAuthDeptResp, e error) {
-	var dept system.SystemAuthDept
+	var dept system_model.SystemAuthDept
 	err := deptSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dept).Error
 	if e = response.CheckErrDBNotRecord(err, "部门已不存在!"); e != nil {
 		return
@@ -77,7 +77,7 @@ func (deptSrv systemAuthDeptService) Detail(id uint) (res SystemAuthDeptResp, e
 // Add 部门新增
 func (deptSrv systemAuthDeptService) Add(addReq SystemAuthDeptAddReq) (e error) {
 	if addReq.Pid == 0 {
-		r := deptSrv.db.Where("pid = ? AND is_delete = ?", 0, 0).Limit(1).Find(&system.SystemAuthDept{})
+		r := deptSrv.db.Where("pid = ? AND is_delete = ?", 0, 0).Limit(1).Find(&system_model.SystemAuthDept{})
 		if e = response.CheckErr(r.Error, "Add Find err"); e != nil {
 			return
 		}
@@ -85,7 +85,7 @@ func (deptSrv systemAuthDeptService) Add(addReq SystemAuthDeptAddReq) (e error)
 			return response.AssertArgumentError.Make("顶级部门只允许有一个!")
 		}
 	}
-	var dept system.SystemAuthDept
+	var dept system_model.SystemAuthDept
 	response.Copy(&dept, addReq)
 	err := deptSrv.db.Create(&dept).Error
 	e = response.CheckErr(err, "Add Create err")
@@ -94,7 +94,7 @@ func (deptSrv systemAuthDeptService) Add(addReq SystemAuthDeptAddReq) (e error)
 
 // Edit 部门编辑
 func (deptSrv systemAuthDeptService) Edit(editReq SystemAuthDeptEditReq) (e error) {
-	var dept system.SystemAuthDept
+	var dept system_model.SystemAuthDept
 	err := deptSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&dept).Error
 	// 校验
 	if e = response.CheckErrDBNotRecord(err, "部门不存在!"); e != nil {
@@ -118,7 +118,7 @@ func (deptSrv systemAuthDeptService) Edit(editReq SystemAuthDeptEditReq) (e erro
 
 // Del 部门删除
 func (deptSrv systemAuthDeptService) Del(id uint) (e error) {
-	var dept system.SystemAuthDept
+	var dept system_model.SystemAuthDept
 	err := deptSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dept).Error
 	// 校验
 	if e = response.CheckErrDBNotRecord(err, "部门不存在!"); e != nil {
@@ -130,14 +130,14 @@ func (deptSrv systemAuthDeptService) Del(id uint) (e error) {
 	if dept.Pid == 0 {
 		return response.AssertArgumentError.Make("顶级部门不能删除!")
 	}
-	r := deptSrv.db.Where("pid = ? AND is_delete = ?", id, 0).Limit(1).Find(&system.SystemAuthDept{})
+	r := deptSrv.db.Where("pid = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthDept{})
 	if e = response.CheckErr(r.Error, "Del Find dept err"); e != nil {
 		return
 	}
 	if r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("请先删除子级部门!")
 	}
-	r = deptSrv.db.Where("dept_id = ? AND is_delete = ?", id, 0).Limit(1).Find(&system.SystemAuthAdmin{})
+	r = deptSrv.db.Where("dept_id = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthAdmin{})
 	if e = response.CheckErr(r.Error, "Del Find admin err"); e != nil {
 		return
 	}

server/admin/system/log/service.go

@@ -5,7 +5,7 @@ import (
 	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 
 	"gorm.io/gorm"
 )
@@ -31,8 +31,8 @@ func (logSrv systemLogsServer) Operate(page request.PageReq, logReq SystemLogOpe
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
 	// 查询
-	logTbName := core.DBTableName(&system.SystemLogOperate{})
+	logTbName := core.DBTableName(&system_model.SystemLogOperate{})
-	adminTbName := core.DBTableName(&system.SystemAuthAdmin{})
+	adminTbName := core.DBTableName(&system_model.SystemAuthAdmin{})
 	logModel := logSrv.db.Table(logTbName + " AS log").Joins(
 		fmt.Sprintf("LEFT JOIN %s AS admin ON log.admin_id = admin.id", adminTbName)).Select(
 		"log.*, admin.username, admin.nickname")
@@ -87,7 +87,7 @@ func (logSrv systemLogsServer) Login(page request.PageReq, logReq SystemLogLogin
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
 	// 查询
-	logModel := logSrv.db.Model(&system.SystemLogLogin{})
+	logModel := logSrv.db.Model(&system_model.SystemLogLogin{})
 	// 条件
 	if logReq.Username != "" {
 		logModel = logModel.Where("username like ?", "%"+logReq.Username+"%")

server/admin/system/login/service.go

@@ -9,7 +9,7 @@ import (
 	"x_admin/config"
 	"x_admin/core"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -110,7 +110,7 @@ func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (r
 
 	// 更新登录信息
 	err = loginSrv.db.Model(&sysAdmin).Updates(
-		system.SystemAuthAdmin{LastLoginIp: c.ClientIP(), LastLoginTime: time.Now().Unix()}).Error
+		system_model.SystemAuthAdmin{LastLoginIp: c.ClientIP(), LastLoginTime: time.Now().Unix()}).Error
 	if err != nil {
 		if e = loginSrv.RecordLoginLog(c, sysAdmin.ID, req.Username, response.SystemError.Msg()); e != nil {
 			return
@@ -140,7 +140,7 @@ func (loginSrv systemLoginService) RecordLoginLog(c *gin.Context, adminId uint,
 	if errStr == "" {
 		status = 1
 	}
-	err := loginSrv.db.Create(&system.SystemLogLogin{
+	err := loginSrv.db.Create(&system_model.SystemLogLogin{
 		AdminId: adminId, Username: username, Ip: c.ClientIP(), Os: ua.Os.Family,
 		Browser: ua.UserAgent.Family, Status: status}).Error
 	e = response.CheckErr(err, "RecordLoginLog Create err")

server/admin/system/menu/service.go

@@ -4,7 +4,7 @@ import (
 	"x_admin/admin/system/role"
 	"x_admin/config"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"github.com/fatih/structs"
@@ -49,7 +49,7 @@ func (menuSrv systemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId u
 	if adminId != config.AdminConfig.SuperAdminId {
 		chain = chain.Where("id in ?", menuIds)
 	}
-	var menus []system.SystemAuthMenu
+	var menus []system_model.SystemAuthMenu
 	err := chain.Order("menu_sort desc, id").Find(&menus).Error
 	if e = response.CheckErr(err, "SelectMenuByRoleId Find err"); e != nil {
 		return
@@ -63,7 +63,7 @@ func (menuSrv systemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId u
 
 // List 菜单列表
 func (menuSrv systemAuthMenuService) List() (res []interface{}, e error) {
-	var menus []system.SystemAuthMenu
+	var menus []system_model.SystemAuthMenu
 	err := menuSrv.db.Order("menu_sort desc, id").Find(&menus).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -76,7 +76,7 @@ func (menuSrv systemAuthMenuService) List() (res []interface{}, e error) {
 
 // Detail 菜单详情
 func (menuSrv systemAuthMenuService) Detail(id uint) (res SystemAuthMenuResp, e error) {
-	var menu system.SystemAuthMenu
+	var menu system_model.SystemAuthMenu
 	err := menuSrv.db.Where("id = ?", id).Limit(1).First(&menu).Error
 	if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {
 		return
@@ -89,7 +89,7 @@ func (menuSrv systemAuthMenuService) Detail(id uint) (res SystemAuthMenuResp, e
 }
 
 func (menuSrv systemAuthMenuService) Add(addReq SystemAuthMenuAddReq) (e error) {
-	var menu system.SystemAuthMenu
+	var menu system_model.SystemAuthMenu
 	response.Copy(&menu, addReq)
 	err := menuSrv.db.Create(&menu).Error
 	if e = response.CheckErr(err, "Add Create err"); e != nil {
@@ -100,7 +100,7 @@ func (menuSrv systemAuthMenuService) Add(addReq SystemAuthMenuAddReq) (e error)
 }
 
 func (menuSrv systemAuthMenuService) Edit(editReq SystemAuthMenuEditReq) (e error) {
-	var menu system.SystemAuthMenu
+	var menu system_model.SystemAuthMenu
 	err := menuSrv.db.Where("id = ?", editReq.ID).Limit(1).Find(&menu).Error
 	if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {
 		return
@@ -119,7 +119,7 @@ func (menuSrv systemAuthMenuService) Edit(editReq SystemAuthMenuEditReq) (e erro
 
 // Del 删除菜单
 func (menuSrv systemAuthMenuService) Del(id uint) (e error) {
-	var menu system.SystemAuthMenu
+	var menu system_model.SystemAuthMenu
 	err := menuSrv.db.Where("id = ?", id).Limit(1).First(&menu).Error
 	if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {
 		return
@@ -127,7 +127,7 @@ func (menuSrv systemAuthMenuService) Del(id uint) (e error) {
 	if e = response.CheckErr(err, "Delete First err"); e != nil {
 		return
 	}
-	r := menuSrv.db.Where("pid = ?", id).Limit(1).Find(&system.SystemAuthMenu{})
+	r := menuSrv.db.Where("pid = ?", id).Limit(1).Find(&system_model.SystemAuthMenu{})
 	err = r.Error
 	if e = response.CheckErr(err, "Delete Find by pid err"); e != nil {
 		return

server/admin/system/post/service.go

@@ -3,7 +3,7 @@ package post
 import (
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 
 	"gorm.io/gorm"
 )
@@ -29,7 +29,7 @@ type systemAuthPostService struct {
 
 // All 岗位所有
 func (postSrv systemAuthPostService) All() (res []SystemAuthPostResp, e error) {
-	var posts []system.SystemAuthPost
+	var posts []system_model.SystemAuthPost
 	err := postSrv.db.Where("is_delete = ?", 0).Order("sort desc, id desc").Find(&posts).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
@@ -45,7 +45,7 @@ func (postSrv systemAuthPostService) List(page request.PageReq, listReq SystemAu
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
 	// 查询
-	postModel := postSrv.db.Model(&system.SystemAuthPost{}).Where("is_delete = ?", 0)
+	postModel := postSrv.db.Model(&system_model.SystemAuthPost{}).Where("is_delete = ?", 0)
 	if listReq.Code != "" {
 		postModel = postModel.Where("code like ?", "%"+listReq.Code+"%")
 	}
@@ -62,7 +62,7 @@ func (postSrv systemAuthPostService) List(page request.PageReq, listReq SystemAu
 		return
 	}
 	// 数据
-	var posts []system.SystemAuthPost
+	var posts []system_model.SystemAuthPost
 	err = postModel.Limit(limit).Offset(offset).Order("id desc").Find(&posts).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -79,7 +79,7 @@ func (postSrv systemAuthPostService) List(page request.PageReq, listReq SystemAu
 
 // Detail 部门详情
 func (postSrv systemAuthPostService) Detail(id uint) (res SystemAuthPostResp, e error) {
-	var post system.SystemAuthPost
+	var post system_model.SystemAuthPost
 	err := postSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&post).Error
 	if e = response.CheckErrDBNotRecord(err, "岗位不存在!"); e != nil {
 		return
@@ -93,14 +93,14 @@ func (postSrv systemAuthPostService) Detail(id uint) (res SystemAuthPostResp, e
 
 // Add 部门新增
 func (postSrv systemAuthPostService) Add(addReq SystemAuthPostAddReq) (e error) {
-	r := postSrv.db.Where("(code = ? OR name = ?) AND is_delete = ?", addReq.Code, addReq.Name, 0).Limit(1).Find(&system.SystemAuthPost{})
+	r := postSrv.db.Where("(code = ? OR name = ?) AND is_delete = ?", addReq.Code, addReq.Name, 0).Limit(1).Find(&system_model.SystemAuthPost{})
 	if e = response.CheckErr(r.Error, "Add Find err"); e != nil {
 		return
 	}
 	if r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("该岗位已存在!")
 	}
-	var post system.SystemAuthPost
+	var post system_model.SystemAuthPost
 	response.Copy(&post, addReq)
 	err := postSrv.db.Create(&post).Error
 	e = response.CheckErr(err, "Add Create err")
@@ -109,7 +109,7 @@ func (postSrv systemAuthPostService) Add(addReq SystemAuthPostAddReq) (e error)
 
 // Edit 部门编辑
 func (postSrv systemAuthPostService) Edit(editReq SystemAuthPostEditReq) (e error) {
-	var post system.SystemAuthPost
+	var post system_model.SystemAuthPost
 	err := postSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&post).Error
 	// 校验
 	if e = response.CheckErrDBNotRecord(err, "部门不存在!"); e != nil {
@@ -118,7 +118,7 @@ func (postSrv systemAuthPostService) Edit(editReq SystemAuthPostEditReq) (e erro
 	if e = response.CheckErr(err, "Edit First err"); e != nil {
 		return
 	}
-	r := postSrv.db.Where("(code = ? OR name = ?) AND id != ? AND is_delete = ?", editReq.Code, editReq.Name, editReq.ID, 0).Limit(1).Find(&system.SystemAuthPost{})
+	r := postSrv.db.Where("(code = ? OR name = ?) AND id != ? AND is_delete = ?", editReq.Code, editReq.Name, editReq.ID, 0).Limit(1).Find(&system_model.SystemAuthPost{})
 	if e = response.CheckErr(r.Error, "Add Find err"); e != nil {
 		return
 	}
@@ -134,7 +134,7 @@ func (postSrv systemAuthPostService) Edit(editReq SystemAuthPostEditReq) (e erro
 
 // Del 部门删除
 func (postSrv systemAuthPostService) Del(id uint) (e error) {
-	var post system.SystemAuthPost
+	var post system_model.SystemAuthPost
 	err := postSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&post).Error
 	// 校验
 	if e = response.CheckErrDBNotRecord(err, "部门不存在!"); e != nil {
@@ -143,7 +143,7 @@ func (postSrv systemAuthPostService) Del(id uint) (e error) {
 	if e = response.CheckErr(err, "Del First err"); e != nil {
 		return
 	}
-	r := postSrv.db.Where("post_id = ? AND is_delete = ?", id, 0).Limit(1).Find(&system.SystemAuthAdmin{})
+	r := postSrv.db.Where("post_id = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthAdmin{})
 	if e = response.CheckErr(r.Error, "Del Find err"); e != nil {
 		return
 	}

server/admin/system/role/authPermService.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"x_admin/config"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -31,12 +31,12 @@ type systemAuthPermService struct {
 
 // SelectMenuIdsByRoleId 根据角色ID获取菜单ID
 func (permSrv systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
-	var role system.SystemAuthRole
+	var role system_model.SystemAuthRole
 	err := permSrv.db.Where("id = ? AND is_disable = ?", roleId, 0).Limit(1).First(&role).Error
 	if e = response.CheckErr(err, "SelectMenuIdsByRoleId First err"); e != nil {
 		return []uint{}, e
 	}
-	var perms []system.SystemAuthPerm
+	var perms []system_model.SystemAuthPerm
 	err = permSrv.db.Where("role_id = ?", role.ID).Find(&perms).Error
 	if e = response.CheckErr(err, "SelectMenuIdsByRoleId Find err"); e != nil {
 		return []uint{}, e
@@ -49,7 +49,7 @@ func (permSrv systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds
 
 // CacheRoleMenusByRoleId 缓存角色菜单
 func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
-	var perms []system.SystemAuthPerm
+	var perms []system_model.SystemAuthPerm
 	err := permSrv.db.Where("role_id = ?", roleId).Find(&perms).Error
 	if e = response.CheckErr(err, "CacheRoleMenusByRoleId Find perms err"); e != nil {
 		return
@@ -58,7 +58,7 @@ func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e erro
 	for _, perm := range perms {
 		menuIds = append(menuIds, perm.MenuId)
 	}
-	var menus []system.SystemAuthMenu
+	var menus []system_model.SystemAuthMenu
 	err = permSrv.db.Where(
 		"is_disable = ? and id in ? and menu_type in ?", 0, menuIds, []string{"C", "A"}).Order(
 		"menu_sort, id").Find(&menus).Error
@@ -84,10 +84,10 @@ func (permSrv systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds str
 		db = permSrv.db
 	}
 	err := db.Transaction(func(tx *gorm.DB) error {
-		var perms []system.SystemAuthPerm
+		var perms []system_model.SystemAuthPerm
 		for _, menuIdStr := range strings.Split(menuIds, ",") {
 			menuId, _ := strconv.ParseUint(menuIdStr, 10, 32)
-			perms = append(perms, system.SystemAuthPerm{ID: util.ToolsUtil.MakeUuid(), RoleId: roleId, MenuId: uint(menuId)})
+			perms = append(perms, system_model.SystemAuthPerm{ID: util.ToolsUtil.MakeUuid(), RoleId: roleId, MenuId: uint(menuId)})
 		}
 		txErr := tx.Create(&perms).Error
 		var te error
@@ -103,14 +103,14 @@ func (permSrv systemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.D
 	if db == nil {
 		db = permSrv.db
 	}
-	err := db.Delete(&system.SystemAuthPerm{}, "role_id = ?", roleId).Error
+	err := db.Delete(&system_model.SystemAuthPerm{}, "role_id = ?", roleId).Error
 	e = response.CheckErr(err, "BatchDeleteByRoleId Delete err")
 	return
 }
 
 // BatchDeleteByMenuId 批量删除角色菜单(根据菜单ID)
 func (permSrv systemAuthPermService) BatchDeleteByMenuId(menuId uint) (e error) {
-	err := permSrv.db.Delete(&system.SystemAuthPerm{}, "menu_id = ?", menuId).Error
+	err := permSrv.db.Delete(&system_model.SystemAuthPerm{}, "menu_id = ?", menuId).Error
 	e = response.CheckErr(err, "BatchDeleteByMenuId Delete err")
 	return
 }

server/admin/system/role/service.go

@@ -6,7 +6,7 @@ import (
 	"x_admin/config"
 	"x_admin/core/request"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"github.com/fatih/structs"
@@ -35,7 +35,7 @@ type systemAuthRoleService struct {
 
 // All 角色所有
 func (roleSrv systemAuthRoleService) All() (res []SystemAuthRoleSimpleResp, e error) {
-	var roles []system.SystemAuthRole
+	var roles []system_model.SystemAuthRole
 	err := roleSrv.db.Order("sort desc, id desc").Find(&roles).Error
 	if e = response.CheckErr(err, "All Find err"); e != nil {
 		return
@@ -48,13 +48,13 @@ func (roleSrv systemAuthRoleService) All() (res []SystemAuthRoleSimpleResp, e er
 func (roleSrv systemAuthRoleService) List(page request.PageReq) (res response.PageResp, e error) {
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
-	roleModel := roleSrv.db.Model(&system.SystemAuthRole{})
+	roleModel := roleSrv.db.Model(&system_model.SystemAuthRole{})
 	var count int64
 	err := roleModel.Count(&count).Error
 	if e = response.CheckErr(err, "List Count err"); e != nil {
 		return
 	}
-	var roles []system.SystemAuthRole
+	var roles []system_model.SystemAuthRole
 	err = roleModel.Limit(limit).Offset(offset).Order("sort desc, id desc").Find(&roles).Error
 	if e = response.CheckErr(err, "List Find err"); e != nil {
 		return
@@ -75,7 +75,7 @@ func (roleSrv systemAuthRoleService) List(page request.PageReq) (res response.Pa
 
 // Detail 角色详情
 func (roleSrv systemAuthRoleService) Detail(id uint) (res SystemAuthRoleResp, e error) {
-	var role system.SystemAuthRole
+	var role system_model.SystemAuthRole
 	err := roleSrv.db.Where("id = ?", id).Limit(1).First(&role).Error
 	if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
 		return
@@ -91,14 +91,14 @@ func (roleSrv systemAuthRoleService) Detail(id uint) (res SystemAuthRoleResp, e
 
 // getMemberCnt 根据角色ID获取成员数量
 func (roleSrv systemAuthRoleService) getMemberCnt(roleId uint) (count int64) {
-	roleSrv.db.Model(&system.SystemAuthAdmin{}).Where(
+	roleSrv.db.Model(&system_model.SystemAuthAdmin{}).Where(
 		"role = ? AND is_delete = ?", roleId, 0).Count(&count)
 	return
 }
 
 // Add 新增角色
 func (roleSrv systemAuthRoleService) Add(addReq SystemAuthRoleAddReq) (e error) {
-	var role system.SystemAuthRole
+	var role system_model.SystemAuthRole
 	if r := roleSrv.db.Where("name = ?", strings.Trim(addReq.Name, " ")).Limit(1).First(&role); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("角色名称已存在!")
 	}
@@ -120,14 +120,14 @@ func (roleSrv systemAuthRoleService) Add(addReq SystemAuthRoleAddReq) (e error)
 
 // Edit 编辑角色
 func (roleSrv systemAuthRoleService) Edit(editReq SystemAuthRoleEditReq) (e error) {
-	err := roleSrv.db.Where("id = ?", editReq.ID).Limit(1).First(&system.SystemAuthRole{}).Error
+	err := roleSrv.db.Where("id = ?", editReq.ID).Limit(1).First(&system_model.SystemAuthRole{}).Error
 	if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
 		return
 	}
 	if e = response.CheckErr(err, "Edit First err"); e != nil {
 		return
 	}
-	var role system.SystemAuthRole
+	var role system_model.SystemAuthRole
 	if r := roleSrv.db.Where("id != ? AND name = ?", editReq.ID, strings.Trim(editReq.Name, " ")).Limit(1).First(&role); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("角色名称已存在!")
 	}
@@ -158,19 +158,19 @@ func (roleSrv systemAuthRoleService) Edit(editReq SystemAuthRoleEditReq) (e erro
 
 // Del 删除角色
 func (roleSrv systemAuthRoleService) Del(id uint) (e error) {
-	err := roleSrv.db.Where("id = ?", id).Limit(1).First(&system.SystemAuthRole{}).Error
+	err := roleSrv.db.Where("id = ?", id).Limit(1).First(&system_model.SystemAuthRole{}).Error
 	if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
 		return
 	}
 	if e = response.CheckErr(err, "Del First err"); e != nil {
 		return
 	}
-	if r := roleSrv.db.Where("role = ? AND is_delete = ?", id, 0).Limit(1).Find(&system.SystemAuthAdmin{}); r.RowsAffected > 0 {
+	if r := roleSrv.db.Where("role = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthAdmin{}); r.RowsAffected > 0 {
 		return response.AssertArgumentError.Make("角色已被管理员使用,请先移除!")
 	}
 	// 事务
 	err = roleSrv.db.Transaction(func(tx *gorm.DB) error {
-		txErr := tx.Delete(&system.SystemAuthRole{}, "id = ?", id).Error
+		txErr := tx.Delete(&system_model.SystemAuthRole{}, "id = ?", id).Error
 		var te error
 		if te = response.CheckErr(txErr, "Del Delete in tx err"); te != nil {
 			return te

server/generator/gen/service.go

@@ -6,10 +6,10 @@ import (
 	"x_admin/config"
 	"x_admin/core/request"
 	"x_admin/core/response"
+	"x_admin/model/gen_model"
 
 	"strings"
 	"x_admin/generator/tpl_utils"
-	"x_admin/model/gen"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -69,7 +69,7 @@ func (genSrv generateService) List(page request.PageReq, listReq ListTableReq) (
 	// 分页信息
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
-	genModel := genSrv.db.Model(&gen.GenTable{})
+	genModel := genSrv.db.Model(&gen_model.GenTable{})
 	if listReq.TableName != "" {
 		genModel = genModel.Where("table_name like ?", "%"+listReq.TableName+"%")
 	}
@@ -104,7 +104,7 @@ func (genSrv generateService) List(page request.PageReq, listReq ListTableReq) (
 
 // Detail 生成详情
 func (genSrv generateService) Detail(id uint) (res GenTableDetailResp, e error) {
-	var genTb gen.GenTable
+	var genTb gen_model.GenTable
 	err := genSrv.db.Where("id = ?", id).Limit(1).First(&genTb).Error
 	if e = response.CheckErrDBNotRecord(err, "查询的数据不存在!"); e != nil {
 		return
@@ -112,7 +112,7 @@ func (genSrv generateService) Detail(id uint) (res GenTableDetailResp, e error)
 	if e = response.CheckErr(err, "Detail Find err"); e != nil {
 		return
 	}
-	var columns []gen.GenTableColumn
+	var columns []gen_model.GenTableColumn
 	err = genSrv.db.Where("table_id = ?", id).Order("sort").Find(&columns).Error
 	if e = response.CheckErr(err, "Detail Find err"); e != nil {
 		return
@@ -137,7 +137,7 @@ func (genSrv generateService) ImportTable(tableNames []string) (e error) {
 	if e = response.CheckErr(err, "ImportTable Find tables err"); e != nil {
 		return
 	}
-	var tables []gen.GenTable
+	var tables []gen_model.GenTable
 	response.Copy(&tables, dbTbs)
 	if len(tables) == 0 {
 		e = response.AssertArgumentError.Make("表不存在!")
@@ -152,7 +152,7 @@ func (genSrv generateService) ImportTable(tableNames []string) (e error) {
 				return te
 			}
 			// 生成列信息
-			var columns []gen.GenTableColumn
+			var columns []gen_model.GenTableColumn
 			txErr = tpl_utils.GenUtil.GetDbTableColumnsQueryByName(genSrv.db, tables[i].TableName).Find(&columns).Error
 			if te := response.CheckErr(txErr, "ImportTable Find columns err"); te != nil {
 				return te
@@ -174,7 +174,7 @@ func (genSrv generateService) ImportTable(tableNames []string) (e error) {
 // SyncTable 同步表结构
 func (genSrv generateService) SyncTable(id uint) (e error) {
 	//旧数据
-	var genTable gen.GenTable
+	var genTable gen_model.GenTable
 	err := genSrv.db.Where("id = ?", id).Limit(1).First(&genTable).Error
 	if e = response.CheckErrDBNotRecord(err, "生成数据不存在！"); e != nil {
 		return
@@ -182,7 +182,7 @@ func (genSrv generateService) SyncTable(id uint) (e error) {
 	if e = response.CheckErr(err, "SyncTable First err"); e != nil {
 		return
 	}
-	var genTableCols []gen.GenTableColumn
+	var genTableCols []gen_model.GenTableColumn
 	err = genSrv.db.Where("table_id = ?", id).Order("sort").Find(&genTableCols).Error
 	if e = response.CheckErr(err, "SyncTable Find err"); e != nil {
 		return
@@ -191,12 +191,12 @@ func (genSrv generateService) SyncTable(id uint) (e error) {
 		e = response.AssertArgumentError.Make("旧数据异常！")
 		return
 	}
-	prevColMap := make(map[string]gen.GenTableColumn)
+	prevColMap := make(map[string]gen_model.GenTableColumn)
 	for i := 0; i < len(genTableCols); i++ {
 		prevColMap[genTableCols[i].ColumnName] = genTableCols[i]
 	}
 	//新数据
-	var columns []gen.GenTableColumn
+	var columns []gen_model.GenTableColumn
 	err = tpl_utils.GenUtil.GetDbTableColumnsQueryByName(genSrv.db, genTable.TableName).Find(&columns).Error
 	if e = response.CheckErr(err, "SyncTable Find new err"); e != nil {
 		return
@@ -244,7 +244,7 @@ func (genSrv generateService) SyncTable(id uint) (e error) {
 				delColIds = append(delColIds, prevCol.ID)
 			}
 		}
-		txErr := tx.Delete(&gen.GenTableColumn{}, "id in ?", delColIds).Error
+		txErr := tx.Delete(&gen_model.GenTableColumn{}, "id in ?", delColIds).Error
 		if te := response.CheckErr(txErr, "SyncTable Delete err"); te != nil {
 			return te
 		}
@@ -266,7 +266,7 @@ func (genSrv generateService) EditTable(editReq EditTableReq) (e error) {
 			return
 		}
 	}
-	var genTable gen.GenTable
+	var genTable gen_model.GenTable
 	err := genSrv.db.Where("id = ?", editReq.ID).Limit(1).First(&genTable).Error
 	if e = response.CheckErrDBNotRecord(err, "数据已丢失！"); e != nil {
 		return
@@ -282,7 +282,7 @@ func (genSrv generateService) EditTable(editReq EditTableReq) (e error) {
 			return te
 		}
 		for i := 0; i < len(editReq.Columns); i++ {
-			var col gen.GenTableColumn
+			var col gen_model.GenTableColumn
 			response.Copy(&col, editReq.Columns[i])
 			txErr = tx.Save(&col).Error
 			if te := response.CheckErr(txErr, "EditTable Save GenTableColumn err"); te != nil {
@@ -298,11 +298,11 @@ func (genSrv generateService) EditTable(editReq EditTableReq) (e error) {
 // DelTable 删除表结构
 func (genSrv generateService) DelTable(ids []uint) (e error) {
 	err := genSrv.db.Transaction(func(tx *gorm.DB) error {
-		txErr := tx.Delete(&gen.GenTable{}, "id in ?", ids).Error
+		txErr := tx.Delete(&gen_model.GenTable{}, "id in ?", ids).Error
 		if te := response.CheckErr(txErr, "DelTable Delete GenTable err"); te != nil {
 			return te
 		}
-		txErr = tx.Delete(&gen.GenTableColumn{}, "table_id in ?", ids).Error
+		txErr = tx.Delete(&gen_model.GenTableColumn{}, "table_id in ?", ids).Error
 		if te := response.CheckErr(txErr, "DelTable Delete GenTableColumn err"); te != nil {
 			return te
 		}
@@ -313,11 +313,11 @@ func (genSrv generateService) DelTable(ids []uint) (e error) {
 }
 
 // getSubTableInfo 根据主表获取子表主键和列信息
-func (genSrv generateService) getSubTableInfo(genTable gen.GenTable) (pkCol gen.GenTableColumn, cols []gen.GenTableColumn, e error) {
+func (genSrv generateService) getSubTableInfo(genTable gen_model.GenTable) (pkCol gen_model.GenTableColumn, cols []gen_model.GenTableColumn, e error) {
 	if genTable.SubTableName == "" || genTable.SubTableFk == "" {
 		return
 	}
-	var table gen.GenTable
+	var table gen_model.GenTable
 	err := genSrv.db.Where("table_name = ?", genTable.SubTableName).Limit(1).First(&table).Error
 	if e = response.CheckErrDBNotRecord(err, "子表记录丢失！"); e != nil {
 		return
@@ -334,8 +334,8 @@ func (genSrv generateService) getSubTableInfo(genTable gen.GenTable) (pkCol gen.
 }
 
 // renderCodeByTable 根据主表和模板文件渲染模板代码
-func (genSrv generateService) renderCodeByTable(genTable gen.GenTable) (res map[string]string, e error) {
+func (genSrv generateService) renderCodeByTable(genTable gen_model.GenTable) (res map[string]string, e error) {
-	var columns []gen.GenTableColumn
+	var columns []gen_model.GenTableColumn
 	err := genSrv.db.Where("table_id = ?", genTable.ID).Order("sort").Find(&columns).Error
 	if e = response.CheckErr(err, "renderCodeByTable Find err"); e != nil {
 		return
@@ -362,7 +362,7 @@ func (genSrv generateService) renderCodeByTable(genTable gen.GenTable) (res map[
 
 // PreviewCode 预览代码
 func (genSrv generateService) PreviewCode(id uint) (res map[string]string, e error) {
-	var genTable gen.GenTable
+	var genTable gen_model.GenTable
 	err := genSrv.db.Where("id = ?", id).Limit(1).First(&genTable).Error
 	if e = response.CheckErrDBNotRecord(err, "记录丢失！"); e != nil {
 		return
@@ -384,7 +384,7 @@ func (genSrv generateService) PreviewCode(id uint) (res map[string]string, e err
 
 // GenCode 生成代码 (自定义路径)
 func (genSrv generateService) GenCode(tableName string) (e error) {
-	var genTable gen.GenTable
+	var genTable gen_model.GenTable
 	err := genSrv.db.Where("table_name = ?", tableName).Order("id desc").Limit(1).First(&genTable).Error
 	if e = response.CheckErrDBNotRecord(err, "记录丢失！"); e != nil {
 		return
@@ -409,7 +409,7 @@ func (genSrv generateService) GenCode(tableName string) (e error) {
 
 // genZipCode 生成代码 (压缩包下载)
 func (genSrv generateService) genZipCode(zipWriter *zip.Writer, tableName string) (e error) {
-	var genTable gen.GenTable
+	var genTable gen_model.GenTable
 	err := genSrv.db.Where("table_name = ?", tableName).Order("id desc").Limit(1).First(&genTable).Error
 	if e = response.CheckErrDBNotRecord(err, "记录丢失！"); e != nil {
 		return

server/generator/tpl_utils/tpl.go

@@ -10,7 +10,7 @@ import (
 	"text/template"
 	"x_admin/config"
 	"x_admin/core/response"
-	"x_admin/model/gen"
+	"x_admin/model/gen_model"
 	"x_admin/util"
 )
 
@@ -58,7 +58,7 @@ type TplVars struct {
 	PrimaryKey      string
 	PrimaryField    string
 	AllFields       []string
-	SubPriCol       gen.GenTableColumn
+	SubPriCol       gen_model.GenTableColumn
 	SubPriField     string
 	SubTableFields  []string
 	ListFields      []string
@@ -66,9 +66,9 @@ type TplVars struct {
 	DictFields      []string
 	IsSearch        bool
 	ModelOprMap     map[string]string
-	Table           gen.GenTable
+	Table           gen_model.GenTable
-	Columns         []gen.GenTableColumn
+	Columns         []gen_model.GenTableColumn
-	SubColumns      []gen.GenTableColumn
+	SubColumns      []gen_model.GenTableColumn
 	//ModelTypeMap    map[string]string
 }
 
@@ -79,8 +79,8 @@ type templateUtil struct {
 }
 
 // PrepareVars 获取模板变量信息
-func (tu templateUtil) PrepareVars(table gen.GenTable, columns []gen.GenTableColumn,
+func (tu templateUtil) PrepareVars(table gen_model.GenTable, columns []gen_model.GenTableColumn,
-	oriSubPriCol gen.GenTableColumn, oriSubCols []gen.GenTableColumn) TplVars {
+	oriSubPriCol gen_model.GenTableColumn, oriSubCols []gen_model.GenTableColumn) TplVars {
 	subPriField := "id"
 	isSearch := false
 	primaryKey := "id"
@@ -91,7 +91,7 @@ func (tu templateUtil) PrepareVars(table gen.GenTable, columns []gen.GenTableCol
 	var listFields []string
 	var detailFields []string
 	var dictFields []string
-	var subColumns []gen.GenTableColumn
+	var subColumns []gen_model.GenTableColumn
 	var oriSubColNames []string
 	for _, column := range oriSubCols {
 		oriSubColNames = append(oriSubColNames, column.ColumnName)
@@ -191,7 +191,7 @@ func (tu templateUtil) Render(tplPath string, tplVars TplVars) (res string, e er
 }
 
 // GetGenPath 获取生成路径
-func (tu templateUtil) GetGenPath(table gen.GenTable) string {
+func (tu templateUtil) GetGenPath(table gen_model.GenTable) string {
 	if table.GenPath == "/" {
 		//return path.Join(config.Config.RootPath, config.GenConfig.GenRootPath)
 		return config.GenConfig.GenRootPath

server/generator/tpl_utils/utils.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 	"x_admin/config"
-	"x_admin/model/gen"
+	"x_admin/model/gen_model"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -59,8 +59,8 @@ func (gu genUtil) GetDbTableColumnsQueryByName(db *gorm.DB, tableName string) *g
 }
 
 // InitTable 初始化表
-func (gu genUtil) InitTable(table gen.GenTable) gen.GenTable {
+func (gu genUtil) InitTable(table gen_model.GenTable) gen_model.GenTable {
-	return gen.GenTable{
+	return gen_model.GenTable{
 		TableName:    table.TableName,
 		TableComment: table.TableComment,
 		AuthorName:   "",
@@ -73,10 +73,10 @@ func (gu genUtil) InitTable(table gen.GenTable) gen.GenTable {
 }
 
 // InitColumn 初始化字段列
-func (gu genUtil) InitColumn(tableId uint, column gen.GenTableColumn) gen.GenTableColumn {
+func (gu genUtil) InitColumn(tableId uint, column gen_model.GenTableColumn) gen_model.GenTableColumn {
 	columnType := gu.GetDbType(column.ColumnType)
 	columnLen := gu.GetColumnLength(column.ColumnType)
-	col := gen.GenTableColumn{
+	col := gen_model.GenTableColumn{
 		TableID:       tableId,
 		ColumnName:    column.ColumnName,
 		ColumnComment: column.ColumnComment,
@@ -203,7 +203,7 @@ func (gu genUtil) GetColumnLength(columnType string) int {
 }
 
 // GetTablePriCol 获取主键列名称
-func (gu genUtil) GetTablePriCol(columns []gen.GenTableColumn) (res gen.GenTableColumn) {
+func (gu genUtil) GetTablePriCol(columns []gen_model.GenTableColumn) (res gen_model.GenTableColumn) {
 	for _, col := range columns {
 		if col.IsPk == 1 {
 			res = col

server/middleware/auth.go

@@ -8,7 +8,8 @@ import (
 	"x_admin/config"
 	"x_admin/core"
 	"x_admin/core/response"
-	sysModel "x_admin/model/system"
+	"x_admin/model/system_model"
+
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -78,7 +79,7 @@ func TokenAuth() gin.HandlerFunc {
 		}
 
 		// 校验用户被删除
-		var mapping sysModel.SystemAuthAdmin
+		var mapping system_model.SystemAuthAdmin
 		err := util.ToolsUtil.JsonToObj(util.RedisUtil.HGet(config.AdminConfig.BackstageManageKey, uidStr), &mapping)
 		if err != nil {
 			core.Logger.Errorf("TokenAuth Unmarshal err: err=[%+v]", err)

server/middleware/log.go

@@ -8,7 +8,7 @@ import (
 	"x_admin/config"
 	"x_admin/core"
 	"x_admin/core/response"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -93,7 +93,7 @@ func RecordLog(title string, reqTypes ...requestType) gin.HandlerFunc {
 				urlPath := c.Request.URL.Path
 				ip := c.ClientIP()
 				method := c.HandlerName()
-				err := core.GetDB().Create(&system.SystemLogOperate{
+				err := core.GetDB().Create(&system_model.SystemLogOperate{
 					AdminId: adminId, Type: reqMethod, Title: title, Ip: ip,
 					Url: urlPath, Method: method, Args: args, Error: errStr, Status: status,
 					StartTime: startTime / 1000, EndTime: endTime / 1000, TaskTime: taskTime,
@@ -119,7 +119,7 @@ func RecordLog(title string, reqTypes ...requestType) gin.HandlerFunc {
 		urlPath := c.Request.URL.Path
 		ip := c.ClientIP()
 		method := c.HandlerName()
-		err := core.GetDB().Create(&system.SystemLogOperate{
+		err := core.GetDB().Create(&system_model.SystemLogOperate{
 			AdminId: adminId, Type: reqMethod, Title: title, Ip: ip,
 			Url: urlPath, Method: method, Args: args, Error: errStr, Status: status,
 			StartTime: startTime / 1000, EndTime: endTime / 1000, TaskTime: taskTime,

server/model/common_model/album.go

@@ -1,4 +1,4 @@
-package common
+package common_model
 
 //Album 相册实体
 type Album struct {

server/model/gen_model/gen.go

@@ -1,4 +1,4 @@
-package gen
+package gen_model
 
 //GenTable 代码生成业务实体
 type GenTable struct {

server/model/setting_model/dict_data.go

@@ -1,4 +1,4 @@
-package setting
+package setting_model
 
 //DictData 字典数据实体
 type DictData struct {

server/model/setting_model/dict_type.go

@@ -1,4 +1,4 @@
-package setting
+package setting_model
 
 //DictType 字典类型实体
 type DictType struct {

server/model/system_model/system.go

@@ -1,4 +1,4 @@
-package system
+package system_model
 
 //SystemConfig 系统配置实体
 type SystemConfig struct {

server/util/config.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	"errors"
-	"x_admin/model/system"
+	"x_admin/model/system_model"
 
 	"gorm.io/gorm"
 )
@@ -18,7 +18,8 @@ func (cu configUtil) Get(db *gorm.DB, cnfType string, names ...string) (data map
 	if len(names) > 0 {
 		chain.Where("name = ?", names[0])
 	}
-	var configs []system.SystemConfig
+
+	var configs []system_model.SystemConfig
 	err = chain.Find(&configs).Error
 	if err != nil {
 		return nil, err
@@ -58,7 +59,7 @@ func (cu configUtil) GetMap(db *gorm.DB, cnfType string, name string) (data map[
 
 // Set 设置配置的值
 func (cu configUtil) Set(db *gorm.DB, cnfType string, name string, val string) (err error) {
-	var config system.SystemConfig
+	var config system_model.SystemConfig
 	err = db.Where("type = ? AND name = ?", cnfType, name).First(&config).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		if err = db.Create(&config).Error; err != nil {