简化代码

server/admin/article_collect/article_collect_ctl.go

@@ -35,6 +35,6 @@ func (hd ArticleCollectHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := hd.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }

server/admin/article_collect/article_collect_service.go

@@ -1,6 +1,7 @@
 package article_collect
 
 import (
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model"
@@ -16,9 +17,11 @@ type IArticleCollectService interface {
 	Del(id int) (e error)
 }
 
-// NewArticleCollectService 初始化
+var Service = NewArticleCollectService()
-func NewArticleCollectService(db *gorm.DB) ArticleCollectService {
 
+// NewArticleCollectService 初始化
+func NewArticleCollectService() ArticleCollectService {
+	db := core.GetDB()
 	return ArticleCollectService{db: db}
 }
 

server/admin/article_collect_route.go

@@ -2,7 +2,6 @@ package admin
 
 import (
 	"x_admin/admin/article_collect"
-	"x_admin/core"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"
@@ -11,11 +10,10 @@ import (
 // 请在 admin/entry.go 目录引入这个函数
 // ArticleCollectRoute(rg)
 func ArticleCollectRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
+	// server := article_collect.NewArticleCollectService(db)
 
-	server := article_collect.NewArticleCollectService(db)
+	handle := article_collect.ArticleCollectHandler{}
-
-	handle := article_collect.ArticleCollectHandler{Service: server}
 
 	rg = rg.Group("/", middleware.TokenAuth())
 

server/admin/common/album/route.go

@@ -1,7 +1,6 @@
 package album
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
@@ -11,15 +10,15 @@ import (
 )
 
 func AlbumRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewAlbumService(db)
+	// server := NewAlbumService(db)
 
-	handle := albumHandler{Service: server}
+	handle := albumHandler{}
 
 	rg = rg.Group("/common", middleware.TokenAuth())
 
@@ -33,9 +32,7 @@ func AlbumRoute(rg *gin.RouterGroup) {
 	rg.POST("/album/cateDel", middleware.RecordLog("相册分类删除"), handle.cateDel)
 }
 
-type albumHandler struct {
+type albumHandler struct{}
-	Service IAlbumService
-}
 
 // albumList 相册文件列表
 func (ah albumHandler) albumList(c *gin.Context) {
@@ -47,7 +44,7 @@ func (ah albumHandler) albumList(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := ah.Service.AlbumList(page, listReq)
+	res, err := Service.AlbumList(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -57,7 +54,7 @@ func (ah albumHandler) albumRename(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &rnReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.AlbumRename(rnReq.ID, rnReq.Name))
+	response.CheckAndResp(c, Service.AlbumRename(rnReq.ID, rnReq.Name))
 }
 
 // albumMove 相册文件移动
@@ -66,7 +63,7 @@ func (ah albumHandler) albumMove(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &mvReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.AlbumMove(mvReq.Ids, mvReq.Cid))
+	response.CheckAndResp(c, Service.AlbumMove(mvReq.Ids, mvReq.Cid))
 }
 
 // albumDel 相册文件删除
@@ -75,7 +72,7 @@ func (ah albumHandler) albumDel(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.AlbumDel(delReq.Ids))
+	response.CheckAndResp(c, Service.AlbumDel(delReq.Ids))
 }
 
 // cateList 类目列表
@@ -84,7 +81,7 @@ func (ah albumHandler) cateList(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := ah.Service.CateList(listReq)
+	res, err := Service.CateList(listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -94,7 +91,7 @@ func (ah albumHandler) cateAdd(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.CateAdd(addReq))
+	response.CheckAndResp(c, Service.CateAdd(addReq))
 }
 
 // cateRename 类目命名
@@ -103,7 +100,7 @@ func (ah albumHandler) cateRename(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &rnReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.CateRename(rnReq.ID, rnReq.Name))
+	response.CheckAndResp(c, Service.CateRename(rnReq.ID, rnReq.Name))
 }
 
 // cateDel 类目删除
@@ -112,5 +109,5 @@ func (ah albumHandler) cateDel(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.CateDel(delReq.ID))
+	response.CheckAndResp(c, Service.CateDel(delReq.ID))
 }

server/admin/common/album/service.go

@@ -4,6 +4,7 @@ import (
 	"path"
 	"time"
 	"x_admin/config"
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/common_model"
@@ -24,8 +25,11 @@ type IAlbumService interface {
 	CateDel(id uint) (e error)
 }
 
+var Service = NewAlbumService()
+
 // NewAlbumService 初始化
-func NewAlbumService(db *gorm.DB) IAlbumService {
+func NewAlbumService() IAlbumService {
+	db := core.GetDB()
 	return &albumService{db: db}
 }
 

server/admin/common/index/index.go

@@ -1,7 +1,6 @@
 package index
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 
@@ -9,33 +8,31 @@ import (
 )
 
 func IndexRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
 	// authSrv := system.NewSystemAuthMenuService(db, permSrv)
-	IndexService := NewIndexService(db)
+	// IndexService := NewIndexService()
-	handle := indexHandler{Service: IndexService}
+	handle := indexHandler{}
 
 	rg = rg.Group("/common", middleware.TokenAuth())
 	rg.GET("/index/console", handle.console)
 	rg.GET("/index/config", handle.config)
 }
 
-type indexHandler struct {
+type indexHandler struct{}
-	Service IIndexService
-}
 
 // console 控制台
 func (ih indexHandler) console(c *gin.Context) {
-	res, err := ih.Service.Console()
+	res, err := Service.Console()
 	response.CheckAndRespWithData(c, res, err)
 }
 
 // config 公共配置
 func (ih indexHandler) config(c *gin.Context) {
-	res, err := ih.Service.Config()
+	res, err := Service.Config()
 	response.CheckAndRespWithData(c, res, err)
 }

server/admin/common/index/service.go

@@ -15,8 +15,11 @@ type IIndexService interface {
 	Config() (res map[string]interface{}, e error)
 }
 
+var Service = NewIndexService()
+
 // NewIndexService 初始化
-func NewIndexService(db *gorm.DB) IIndexService {
+func NewIndexService() IIndexService {
+	db := core.GetDB()
 	return &indexService{db: db}
 }
 

server/admin/common/upload/service.go

@@ -12,15 +12,15 @@ type IUploadService interface {
 	UploadVideo(file *multipart.FileHeader, cid uint, aid uint) (res album.CommonUploadFileResp, e error)
 }
 
+var Service = NewUploadService()
+
 // NewUploadService 初始化
-func NewUploadService(albSrv album.IAlbumService) IUploadService {
+func NewUploadService() *uploadService {
-	return &uploadService{albSrv}
+	return &uploadService{}
 }
 
 // uploadService 上传服务实现类
-type uploadService struct {
+type uploadService struct{}
-	albSrv album.IAlbumService
-}
 
 // UploadImage 上传图片
 func (upSrv uploadService) UploadImage(file *multipart.FileHeader, cid uint, aid uint) (res album.CommonUploadFileResp, e error) {
@@ -43,7 +43,7 @@ func (upSrv uploadService) uploadFile(file *multipart.FileHeader, folder string,
 	addReq.Aid = aid
 	addReq.Cid = cid
 	var albumId uint
-	if albumId, e = upSrv.albSrv.AlbumAdd(addReq); e != nil {
+	if albumId, e = album.Service.AlbumAdd(addReq); e != nil {
 		return
 	}
 	response.Copy(&res, addReq)

server/admin/common/upload/upload.go

@@ -3,7 +3,6 @@ package upload
 import (
 	"x_admin/admin/common/album"
 	"x_admin/config"
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -12,24 +11,22 @@ import (
 )
 
 func UploadRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
-	AlbumServer := album.NewAlbumService(db)
+	// AlbumServer := album.NewAlbumService()
-	server := NewUploadService(AlbumServer)
+	// server := NewUploadService()
 
-	handle := uploadHandler{Service: server}
+	handle := uploadHandler{}
 
 	rg = rg.Group("/common", middleware.TokenAuth())
 	rg.POST("/upload/image", middleware.RecordLog("上传图片", middleware.RequestFile), handle.uploadImage)
 	rg.POST("/upload/video", middleware.RecordLog("上传视频", middleware.RequestFile), handle.uploadVideo)
 }
 
-type uploadHandler struct {
+type uploadHandler struct{}
-	Service IUploadService
-}
 
 // uploadImage 上传图片
 func (uh uploadHandler) uploadImage(c *gin.Context) {
@@ -41,7 +38,7 @@ func (uh uploadHandler) uploadImage(c *gin.Context) {
 	if response.IsFailWithResp(c, ve) {
 		return
 	}
-	res, err := uh.Service.UploadImage(file, uReq.Cid, config.AdminConfig.GetAdminId(c))
+	res, err := Service.UploadImage(file, uReq.Cid, config.AdminConfig.GetAdminId(c))
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -55,6 +52,6 @@ func (uh uploadHandler) uploadVideo(c *gin.Context) {
 	if response.IsFailWithResp(c, ve) {
 		return
 	}
-	res, err := uh.Service.UploadVideo(file, uReq.Cid, config.AdminConfig.GetAdminId(c))
+	res, err := Service.UploadVideo(file, uReq.Cid, config.AdminConfig.GetAdminId(c))
 	response.CheckAndRespWithData(c, res, err)
 }

server/admin/setting/copyright/copyright.go

@@ -1,7 +1,6 @@
 package copyright
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/util"
 
@@ -9,9 +8,9 @@ import (
 )
 
 func CopyrightRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
-	service := NewSettingCopyrightService(db)
+	// service := NewSettingCopyrightService(db)
-	handle := copyrightHandler{Service: service}
+	handle := copyrightHandler{}
 
 	rg = rg.Group("/setting")
 	rg.GET("/copyright/detail", handle.Detail)
@@ -19,12 +18,11 @@ func CopyrightRoute(rg *gin.RouterGroup) {
 }
 
 type copyrightHandler struct {
-	Service ISettingCopyrightService
 }
 
 // detail 获取备案信息
 func (ch copyrightHandler) Detail(c *gin.Context) {
-	res, err := ch.Service.Detail()
+	res, err := Service.Detail()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -34,5 +32,5 @@ func (ch copyrightHandler) save(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSONArray(c, &cReqs)) {
 		return
 	}
-	response.CheckAndResp(c, ch.Service.Save(cReqs))
+	response.CheckAndResp(c, Service.Save(cReqs))
 }

server/admin/setting/copyright/service.go

@@ -1,6 +1,7 @@
 package copyright
 
 import (
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/util"
 
@@ -12,8 +13,11 @@ type ISettingCopyrightService interface {
 	Save(cReqs []SettingCopyrightItemReq) (e error)
 }
 
+var Service = NewSettingCopyrightService()
+
 // NewSettingCopyrightService 初始化
-func NewSettingCopyrightService(db *gorm.DB) ISettingCopyrightService {
+func NewSettingCopyrightService() *settingCopyrightService {
+	db := core.GetDB()
 	return &settingCopyrightService{db: db}
 }
 

server/admin/setting/dict_data/dict_data.go

@@ -1,7 +1,6 @@
 package dict_data
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
@@ -11,15 +10,15 @@ import (
 )
 
 func DictDataRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	authSrv := NewSettingDictDataService(db)
+	// authSrv := NewSettingDictDataService(db)
 
-	handle := dictDataHandler{Service: authSrv}
+	handle := dictDataHandler{}
 
 	rg = rg.Group("/setting", middleware.TokenAuth())
 	rg.GET("/dict/data/all", handle.All)
@@ -30,9 +29,7 @@ func DictDataRoute(rg *gin.RouterGroup) {
 	rg.POST("/dict/data/del", handle.Del)
 }
 
-type dictDataHandler struct {
+type dictDataHandler struct{}
-	Service ISettingDictDataService
-}
 
 // all 字典数据所有
 func (ddh dictDataHandler) All(c *gin.Context) {
@@ -40,7 +37,7 @@ func (ddh dictDataHandler) All(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &allReq)) {
 		return
 	}
-	res, err := ddh.Service.All(allReq)
+	res, err := Service.All(allReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -54,7 +51,7 @@ func (ddh dictDataHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := ddh.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -64,7 +61,7 @@ func (ddh dictDataHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := ddh.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -74,7 +71,7 @@ func (ddh dictDataHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, ddh.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 字典数据编辑
@@ -83,7 +80,7 @@ func (ddh dictDataHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, ddh.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 字典数据删除
@@ -92,5 +89,5 @@ func (ddh dictDataHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, ddh.Service.Del(delReq))
+	response.CheckAndResp(c, Service.Del(delReq))
 }

server/admin/setting/dict_data/service.go

@@ -2,6 +2,7 @@ package dict_data
 
 import (
 	"time"
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/setting_model"
@@ -18,8 +19,11 @@ type ISettingDictDataService interface {
 	Del(delReq SettingDictDataDelReq) (e error)
 }
 
+var Service = NewSettingDictDataService()
+
 // NewSettingDictDataService 初始化
-func NewSettingDictDataService(db *gorm.DB) ISettingDictDataService {
+func NewSettingDictDataService() ISettingDictDataService {
+	db := core.GetDB()
 	return &settingDictDataService{db: db}
 }
 

server/admin/setting/dict_type/dict_type.go

@@ -1,7 +1,6 @@
 package dict_type
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
@@ -11,15 +10,15 @@ import (
 )
 
 func DictTypeRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewSettingDictTypeService(db)
+	// server := NewSettingDictTypeService(db)
 
-	handle := dictTypeHandler{Service: server}
+	handle := dictTypeHandler{}
 
 	rg = rg.Group("/setting", middleware.TokenAuth())
 	rg.GET("/dict/type/all", handle.All)
@@ -30,13 +29,11 @@ func DictTypeRoute(rg *gin.RouterGroup) {
 	rg.POST("/dict/type/del", handle.Del)
 }
 
-type dictTypeHandler struct {
+type dictTypeHandler struct{}
-	Service ISettingDictTypeService
-}
 
 // all 字典类型所有
 func (dth dictTypeHandler) All(c *gin.Context) {
-	res, err := dth.Service.All()
+	res, err := Service.All()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -50,7 +47,7 @@ func (dth dictTypeHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := dth.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -60,7 +57,7 @@ func (dth dictTypeHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := dth.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -70,7 +67,7 @@ func (dth dictTypeHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, dth.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 字典类型编辑
@@ -79,7 +76,7 @@ func (dth dictTypeHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, dth.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 字典类型删除
@@ -88,5 +85,5 @@ func (dth dictTypeHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, dth.Service.Del(delReq))
+	response.CheckAndResp(c, Service.Del(delReq))
 }

server/admin/setting/dict_type/service.go

@@ -2,6 +2,7 @@ package dict_type
 
 import (
 	"time"
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/setting_model"
@@ -18,8 +19,11 @@ type ISettingDictTypeService interface {
 	Del(delReq SettingDictTypeDelReq) (e error)
 }
 
+var Service = NewSettingDictTypeService()
+
 // NewSettingDictTypeService 初始化
-func NewSettingDictTypeService(db *gorm.DB) ISettingDictTypeService {
+func NewSettingDictTypeService() ISettingDictTypeService {
+	db := core.GetDB()
 	return &settingDictTypeService{db: db}
 }
 

server/admin/setting/protocol/protocol.go

@@ -1,7 +1,6 @@
 package protocol
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -10,15 +9,15 @@ import (
 )
 
 func ProtocolRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewSettingProtocolService(db)
+	// server := NewSettingProtocolService(db)
 
-	handle := protocolHandler{Service: server}
+	handle := protocolHandler{}
 
 	rg = rg.Group("/setting", middleware.TokenAuth())
 	rg.GET("/protocol/detail", handle.Detail)
@@ -26,12 +25,11 @@ func ProtocolRoute(rg *gin.RouterGroup) {
 }
 
 type protocolHandler struct {
-	Service ISettingProtocolService
 }
 
 // detail 获取政策信息
 func (ph protocolHandler) Detail(c *gin.Context) {
-	res, err := ph.Service.Detail()
+	res, err := Service.Detail()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -41,5 +39,5 @@ func (ph protocolHandler) save(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &pReq)) {
 		return
 	}
-	response.CheckAndResp(c, ph.Service.Save(pReq))
+	response.CheckAndResp(c, Service.Save(pReq))
 }

server/admin/setting/protocol/service.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/util"
 
@@ -12,8 +13,11 @@ type ISettingProtocolService interface {
 	Save(pReq SettingProtocolReq) (e error)
 }
 
+var Service = NewSettingProtocolService()
+
 // NewSettingProtocolService 初始化
-func NewSettingProtocolService(db *gorm.DB) ISettingProtocolService {
+func NewSettingProtocolService() ISettingProtocolService {
+	db := core.GetDB()
 	return &settingProtocolService{db: db}
 }
 

server/admin/setting/storage/service.go

@@ -2,6 +2,7 @@ package storage
 
 import (
 	"fmt"
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/util"
 
@@ -15,8 +16,11 @@ type ISettingStorageService interface {
 	Change(alias string, status int) (e error)
 }
 
+var Service = NewSettingStorageService()
+
 // NewSettingStorageService 初始化
-func NewSettingStorageService(db *gorm.DB) ISettingStorageService {
+func NewSettingStorageService() ISettingStorageService {
+	db := core.GetDB()
 	return &settingStorageService{db: db}
 }
 

server/admin/setting/storage/storage.go

@@ -1,7 +1,6 @@
 package storage
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -10,15 +9,15 @@ import (
 )
 
 func StorageRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewSettingStorageService(db)
+	// server := NewSettingStorageService()
 
-	handle := storageHandler{Service: server}
+	handle := storageHandler{}
 
 	rg = rg.Group("/setting", middleware.TokenAuth())
 	rg.GET("/storage/list", handle.List)
@@ -28,12 +27,11 @@ func StorageRoute(rg *gin.RouterGroup) {
 }
 
 type storageHandler struct {
-	Service ISettingStorageService
 }
 
 // list 存储列表
 func (sh storageHandler) List(c *gin.Context) {
-	res, err := sh.Service.List()
+	res, err := Service.List()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -43,7 +41,7 @@ func (sh storageHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := sh.Service.Detail(detailReq.Alias)
+	res, err := Service.Detail(detailReq.Alias)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -53,7 +51,7 @@ func (sh storageHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, sh.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // change 存储切换
@@ -62,5 +60,5 @@ func (sh storageHandler) change(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &changeReq)) {
 		return
 	}
-	response.CheckAndResp(c, sh.Service.Change(changeReq.Alias, changeReq.Status))
+	response.CheckAndResp(c, Service.Change(changeReq.Alias, changeReq.Status))
 }

server/admin/setting/website/service.go

@@ -1,6 +1,7 @@
 package website
 
 import (
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/util"
 
@@ -12,8 +13,11 @@ type ISettingWebsiteService interface {
 	Save(wsReq SettingWebsiteReq) (e error)
 }
 
+var Service = NewSettingWebsiteService()
+
 // NewSettingWebsiteService 初始化
-func NewSettingWebsiteService(db *gorm.DB) ISettingWebsiteService {
+func NewSettingWebsiteService() ISettingWebsiteService {
+	db := core.GetDB()
 	return &settingWebsiteService{db: db}
 }
 

server/admin/setting/website/website.go

@@ -1,7 +1,6 @@
 package website
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -10,28 +9,26 @@ import (
 )
 
 func WebsiteRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewSettingWebsiteService(db)
+	// server := NewSettingWebsiteService(db)
 
-	handle := websiteHandler{Service: server}
+	handle := websiteHandler{}
 
 	rg = rg.Group("/setting", middleware.TokenAuth())
 	rg.GET("/website/detail", handle.Detail)
 	rg.POST("/website/save", handle.save)
 }
 
-type websiteHandler struct {
+type websiteHandler struct{}
-	Service ISettingWebsiteService
-}
 
 // detail 获取网站信息
 func (wh websiteHandler) Detail(c *gin.Context) {
-	res, err := wh.Service.Detail()
+	res, err := Service.Detail()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -41,5 +38,5 @@ func (wh websiteHandler) save(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &wsReq)) {
 		return
 	}
-	response.CheckAndResp(c, wh.Service.Save(wsReq))
+	response.CheckAndResp(c, Service.Save(wsReq))
 }

server/admin/system/admin/admin.go

@@ -33,13 +33,13 @@ import (
 // }
 
 type AdminHandler struct {
-	Service ISystemAuthAdminService
+	// Service ISystemAuthAdminService
 }
 
 // self 管理员信息
 func (ah AdminHandler) Self(c *gin.Context) {
 	adminId := config.AdminConfig.GetAdminId(c)
-	res, err := ah.Service.Self(adminId)
+	res, err := Service.Self(adminId)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -53,7 +53,7 @@ func (ah AdminHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := ah.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -63,7 +63,7 @@ func (ah AdminHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := ah.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -73,7 +73,7 @@ func (ah AdminHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 管理员编辑
@@ -82,7 +82,7 @@ func (ah AdminHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.Edit(c, editReq))
+	response.CheckAndResp(c, Service.Edit(c, editReq))
 }
 
 // upInfo 管理员更新
@@ -91,7 +91,7 @@ func (ah AdminHandler) UpInfo(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &updateReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.Update(
+	response.CheckAndResp(c, Service.Update(
 		c, updateReq, config.AdminConfig.GetAdminId(c)))
 }
 
@@ -101,7 +101,7 @@ func (ah AdminHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.Del(c, delReq.ID))
+	response.CheckAndResp(c, Service.Del(c, delReq.ID))
 }
 
 // disable 管理员状态切换
@@ -110,5 +110,5 @@ func (ah AdminHandler) Disable(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &disableReq)) {
 		return
 	}
-	response.CheckAndResp(c, ah.Service.Disable(c, disableReq.ID))
+	response.CheckAndResp(c, Service.Disable(c, disableReq.ID))
 }

server/admin/system/admin/service.go

@@ -32,16 +32,17 @@ type ISystemAuthAdminService interface {
 	CacheAdminUserByUid(id uint) (err error)
 }
 
+var Service = NewSystemAuthAdminService()
+
 // NewSystemAuthAdminService 初始化
-func NewSystemAuthAdminService(db *gorm.DB, permSrv role.ISystemAuthPermService, roleSrv role.ISystemAuthRoleService) ISystemAuthAdminService {
+func NewSystemAuthAdminService() *systemAuthAdminService {
-	return &systemAuthAdminService{db: db, permSrv: permSrv, roleSrv: roleSrv}
+	db := core.GetDB()
+	return &systemAuthAdminService{db: db}
 }
 
 // systemAuthAdminService 系统管理员服务实现类
 type systemAuthAdminService struct {
-	db      *gorm.DB
+	db *gorm.DB
-	permSrv role.ISystemAuthPermService
-	roleSrv role.ISystemAuthRoleService
 }
 
 // FindByUsername 根据账号查找管理员
@@ -63,7 +64,7 @@ func (adminSrv systemAuthAdminService) Self(adminId uint) (res SystemAuthAdminSe
 	if adminId > 1 {
 		roleId, _ := strconv.ParseUint(sysAdmin.Role, 10, 32)
 		var menuIds []uint
-		if menuIds, e = adminSrv.permSrv.SelectMenuIdsByRoleId(uint(roleId)); e != nil {
+		if menuIds, e = role.PermService.SelectMenuIdsByRoleId(uint(roleId)); e != nil {
 			return
 		}
 		if len(menuIds) > 0 {
@@ -211,7 +212,7 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro
 		return response.AssertArgumentError.Make("昵称已存在换一个吧！")
 	}
 	var roleResp role.SystemAuthRoleResp
-	if roleResp, e = adminSrv.roleSrv.Detail(addReq.Role); e != nil {
+	if roleResp, e = role.Service.Detail(addReq.Role); e != nil {
 		return
 	}
 	if roleResp.IsDisable > 0 {
@@ -266,7 +267,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd
 	}
 	// 检查role
 	if editReq.Role > 0 && editReq.ID != 1 {
-		if _, e = adminSrv.roleSrv.Detail(editReq.Role); e != nil {
+		if _, e = role.Service.Detail(editReq.Role); e != nil {
 			return
 		}
 	}

server/admin/system/dept/dept.go

@@ -1,7 +1,6 @@
 package dept
 
 import (
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -10,14 +9,14 @@ import (
 )
 
 func DeptRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 	// authSrv := system.NewSystemAuthMenuService(db, permSrv)
-	Dept := NewSystemAuthDeptService(db)
+
-	handle := deptHandler{Service: Dept}
+	handle := deptHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.GET("/dept/all", handle.All)
@@ -29,12 +28,11 @@ func DeptRoute(rg *gin.RouterGroup) {
 }
 
 type deptHandler struct {
-	Service ISystemAuthDeptService
 }
 
 // all 部门所有
 func (dh deptHandler) All(c *gin.Context) {
-	res, err := dh.Service.All()
+	res, err := Service.All()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -44,7 +42,7 @@ func (dh deptHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := dh.Service.List(listReq)
+	res, err := Service.List(listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -54,7 +52,7 @@ func (dh deptHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := dh.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -64,7 +62,7 @@ func (dh deptHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, dh.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 部门编辑
@@ -73,7 +71,7 @@ func (dh deptHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, dh.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 部门删除
@@ -82,5 +80,5 @@ func (dh deptHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, dh.Service.Del(delReq.ID))
+	response.CheckAndResp(c, Service.Del(delReq.ID))
 }

server/admin/system/dept/service.go

@@ -1,6 +1,7 @@
 package dept
 
 import (
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/model/system_model"
 	"x_admin/util"
@@ -17,8 +18,11 @@ type ISystemAuthDeptService interface {
 	Del(id uint) (e error)
 }
 
+var Service = NewSystemAuthDeptService()
+
 // NewSystemAuthDeptService 初始化
-func NewSystemAuthDeptService(db *gorm.DB) ISystemAuthDeptService {
+func NewSystemAuthDeptService() *systemAuthDeptService {
+	db := core.GetDB()
 	return &systemAuthDeptService{db: db}
 }
 

server/admin/system/enter.go

@@ -3,21 +3,20 @@ package system
 import (
 	"x_admin/admin/system/admin"
 	"x_admin/admin/system/role"
-	"x_admin/core"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"
 )
 
 func AdminRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 
-	permSrv := role.NewSystemAuthPermService(db)
+	// permSrv := role.NewSystemAuthPermService(db)
-	roleSrv := role.NewSystemAuthRoleService(db, permSrv)
+	// roleSrv := role.NewSystemAuthRoleService(db, permSrv)
-	adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv)
+	// adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := NewSystemLoginService(db, adminSrv)
 
-	handle := admin.AdminHandler{Service: adminSrv}
+	handle := admin.AdminHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 
@@ -31,15 +30,15 @@ func AdminRoute(rg *gin.RouterGroup) {
 	rg.POST("/admin/disable", middleware.RecordLog("管理员状态切换"), handle.Disable)
 }
 func RoleRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
-	permSrv := role.NewSystemAuthPermService(db)
+	// permSrv := role.NewSystemAuthPermService(db)
 	// roleSrv := NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := NewSystemLoginService(db, adminSrv)
 
-	server := role.NewSystemAuthRoleService(db, permSrv)
+	// server := role.NewSystemAuthRoleService()
 
-	handle := role.RoleHandler{Service: server}
+	handle := role.RoleHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.GET("/role/all", handle.All)

server/admin/system/log/log.go

@@ -1,7 +1,6 @@
 package log
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
@@ -11,15 +10,15 @@ import (
 )
 
 func LogRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := NewSystemAuthPermService(db)
 	// roleSrv := NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := NewSystemLoginService(db, adminSrv)
 
-	authSrv := NewSystemLogsServer(db)
+	// authSrv := NewSystemLogsServer(db)
 
-	handle := logHandler{Service: authSrv}
+	handle := logHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.GET("/log/operate", handle.operate)
@@ -27,7 +26,7 @@ func LogRoute(rg *gin.RouterGroup) {
 }
 
 type logHandler struct {
-	Service ISystemLogsServer
+	// Service ISystemLogsServer
 }
 
 // operate 操作日志
@@ -40,7 +39,7 @@ func (lh logHandler) operate(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &logReq)) {
 		return
 	}
-	res, err := lh.Service.Operate(page, logReq)
+	res, err := Service.Operate(page, logReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -54,6 +53,6 @@ func (lh logHandler) login(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &logReq)) {
 		return
 	}
-	res, err := lh.Service.Login(page, logReq)
+	res, err := Service.Login(page, logReq)
 	response.CheckAndRespWithData(c, res, err)
 }

server/admin/system/log/service.go

@@ -15,8 +15,11 @@ type ISystemLogsServer interface {
 	Login(page request.PageReq, logReq SystemLogLoginReq) (res response.PageResp, e error)
 }
 
+var Service = NewSystemLogsServer()
+
 // NewSystemLogsServer 初始化
-func NewSystemLogsServer(db *gorm.DB) ISystemLogsServer {
+func NewSystemLogsServer() ISystemLogsServer {
+	db := core.GetDB()
 	return &systemLogsServer{db: db}
 }
 

server/admin/system/login/login.go

@@ -2,9 +2,6 @@ package login
 
 import (
 	"x_admin/admin/common/captcha"
-	"x_admin/admin/system/admin"
-	"x_admin/admin/system/role"
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -13,22 +10,20 @@ import (
 )
 
 func LoginRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
-	permSrv := role.NewSystemAuthPermService(db)
+	// permSrv := role.NewSystemAuthPermService(db)
-	roleSrv := role.NewSystemAuthRoleService(db, permSrv)
+	// roleSrv := role.NewSystemAuthRoleService(db, permSrv)
-	adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv)
+	// adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv)
-	service := NewSystemLoginService(db, adminSrv)
+	// service := NewSystemLoginService(db, adminSrv)
 
-	handle := loginHandler{Service: service}
+	handle := loginHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.POST("/login", handle.login)
 	rg.POST("/logout", handle.logout)
 }
 
-type loginHandler struct {
+type loginHandler struct{}
-	Service ISystemLoginService
-}
 
 // login 登录系统
 func (lh loginHandler) login(c *gin.Context) {
@@ -46,7 +41,7 @@ func (lh loginHandler) login(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &loginReq)) {
 		return
 	}
-	res, err := lh.Service.Login(c, &loginReq)
+	res, err := Service.Login(c, &loginReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -56,5 +51,5 @@ func (lh loginHandler) logout(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyHeader(c, &logoutReq)) {
 		return
 	}
-	response.CheckAndResp(c, lh.Service.Logout(&logoutReq))
+	response.CheckAndResp(c, Service.Logout(&logoutReq))
 }

server/admin/system/login/service.go

@@ -22,20 +22,22 @@ type ISystemLoginService interface {
 	RecordLoginLog(c *gin.Context, adminId uint, username string, errStr string) (e error)
 }
 
+var Service = NewSystemLoginService()
+
 // NewSystemLoginService 初始化
-func NewSystemLoginService(db *gorm.DB, adminSrv admin.ISystemAuthAdminService) ISystemLoginService {
+func NewSystemLoginService() ISystemLoginService {
-	return &systemLoginService{db: db, adminSrv: adminSrv}
+	db := core.GetDB()
+	return &systemLoginService{db: db}
 }
 
 // systemLoginService 系统登录服务实现类
 type systemLoginService struct {
-	db       *gorm.DB
+	db *gorm.DB
-	adminSrv admin.ISystemAuthAdminService
 }
 
 // Login 登录
 func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (res SystemLoginResp, e error) {
-	sysAdmin, err := loginSrv.adminSrv.FindByUsername(req.Username)
+	sysAdmin, err := admin.Service.FindByUsername(req.Username)
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		if e = loginSrv.RecordLoginLog(c, 0, req.Username, response.LoginAccountError.Msg()); e != nil {
 			return
@@ -106,7 +108,7 @@ func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (r
 
 	// 缓存登录信息
 	util.RedisUtil.Set(config.AdminConfig.BackstageTokenKey+token, adminIdStr, 7200)
-	loginSrv.adminSrv.CacheAdminUserByUid(sysAdmin.ID)
+	admin.Service.CacheAdminUserByUid(sysAdmin.ID)
 
 	// 更新登录信息
 	err = loginSrv.db.Model(&sysAdmin).Updates(

server/admin/system/menu/menu.go

@@ -2,9 +2,7 @@ package menu
 
 import (
 	"strconv"
-	"x_admin/admin/system/role"
 	"x_admin/config"
-	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/middleware"
 	"x_admin/util"
@@ -13,15 +11,15 @@ import (
 )
 
 func MenuRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+
-	permSrv := role.NewSystemAuthPermService(db)
+	// permSrv := role.NewSystemAuthPermService()
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	authSrv := NewSystemAuthMenuService(db, permSrv)
+	// authSrv := NewSystemAuthMenuService()
 
-	handle := menuHandler{Service: authSrv}
+	handle := menuHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.GET("/menu/route", handle.route)
@@ -33,20 +31,19 @@ func MenuRoute(rg *gin.RouterGroup) {
 }
 
 type menuHandler struct {
-	Service ISystemAuthMenuService
 }
 
 // route 菜单路由
 func (mh menuHandler) route(c *gin.Context) {
 	roleId := config.AdminConfig.GetRoleId(c)
 	id, _ := strconv.ParseUint(roleId, 10, 64)
-	res, err := mh.Service.SelectMenuByRoleId(c, uint(id))
+	res, err := Service.SelectMenuByRoleId(c, uint(id))
 	response.CheckAndRespWithData(c, res, err)
 }
 
 // list 菜单列表
 func (mh menuHandler) List(c *gin.Context) {
-	res, err := mh.Service.List()
+	res, err := Service.List()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -56,7 +53,7 @@ func (mh menuHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := mh.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -66,7 +63,7 @@ func (mh menuHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, mh.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 编辑菜单
@@ -75,7 +72,7 @@ func (mh menuHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, mh.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 删除菜单
@@ -84,5 +81,5 @@ func (mh menuHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, mh.Service.Del(delReq.ID))
+	response.CheckAndResp(c, Service.Del(delReq.ID))
 }

server/admin/system/menu/service.go

@@ -3,6 +3,7 @@ package menu
 import (
 	"x_admin/admin/system/role"
 	"x_admin/config"
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/model/system_model"
 	"x_admin/util"
@@ -21,15 +22,17 @@ type ISystemAuthMenuService interface {
 	Del(id uint) (e error)
 }
 
+var Service = NewSystemAuthMenuService()
+
 // NewSystemAuthMenuService 初始化
-func NewSystemAuthMenuService(db *gorm.DB, permSrv role.ISystemAuthPermService) ISystemAuthMenuService {
+func NewSystemAuthMenuService() ISystemAuthMenuService {
-	return &systemAuthMenuService{db: db, permSrv: permSrv}
+	db := core.GetDB()
+	return &systemAuthMenuService{db: db}
 }
 
 // systemAuthMenuService 系统菜单服务实现类
 type systemAuthMenuService struct {
-	db      *gorm.DB
+	db *gorm.DB
-	permSrv role.ISystemAuthPermService
 }
 
 // SelectMenuByRoleId 根据角色ID获取菜单
@@ -39,7 +42,7 @@ func (menuSrv systemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId u
 	// 超管
 	if adminId == config.AdminConfig.SuperAdminId {
 		menuIds = []uint{0}
-	} else if menuIds, e = menuSrv.permSrv.SelectMenuIdsByRoleId(roleId); e != nil {
+	} else if menuIds, e = role.PermService.SelectMenuIdsByRoleId(roleId); e != nil {
 		return
 	}
 	if len(menuIds) == 0 {

server/admin/system/post/post.go

@@ -1,7 +1,6 @@
 package post
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
@@ -11,15 +10,15 @@ import (
 )
 
 func PostRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewSystemAuthPostService(db)
+	// server := NewSystemAuthPostService(db)
 
-	handle := postHandler{Service: server}
+	handle := postHandler{}
 
 	rg = rg.Group("/system", middleware.TokenAuth())
 	rg.GET("/post/all", handle.All)
@@ -31,12 +30,11 @@ func PostRoute(rg *gin.RouterGroup) {
 }
 
 type postHandler struct {
-	Service ISystemAuthPostService
 }
 
 // all 岗位所有
 func (ph postHandler) All(c *gin.Context) {
-	res, err := ph.Service.All()
+	res, err := Service.All()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -50,7 +48,7 @@ func (ph postHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := ph.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -60,7 +58,7 @@ func (ph postHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := ph.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -70,7 +68,7 @@ func (ph postHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, ph.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 岗位编辑
@@ -79,7 +77,7 @@ func (ph postHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, ph.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 岗位删除
@@ -88,5 +86,5 @@ func (ph postHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, ph.Service.Del(delReq.ID))
+	response.CheckAndResp(c, Service.Del(delReq.ID))
 }

server/admin/system/post/service.go

@@ -1,6 +1,7 @@
 package post
 
 import (
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/system_model"
@@ -17,8 +18,11 @@ type ISystemAuthPostService interface {
 	Del(id uint) (e error)
 }
 
+var Service = NewSystemAuthPostService()
+
 // NewSystemAuthPostService 初始化
-func NewSystemAuthPostService(db *gorm.DB) ISystemAuthPostService {
+func NewSystemAuthPostService() *systemAuthPostService {
+	db := core.GetDB()
 	return &systemAuthPostService{db: db}
 }
 

server/admin/system/role/perm_service.go

@@ -4,6 +4,7 @@ import (
 	"strconv"
 	"strings"
 	"x_admin/config"
+	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/model/system_model"
 	"x_admin/util"
@@ -19,8 +20,11 @@ type ISystemAuthPermService interface {
 	BatchDeleteByMenuId(menuId uint) (e error)
 }
 
+var PermService = NewSystemAuthPermService()
+
 // NewSystemAuthPermService 初始化
-func NewSystemAuthPermService(db *gorm.DB) ISystemAuthPermService {
+func NewSystemAuthPermService() *systemAuthPermService {
+	db := core.GetDB()
 	return &systemAuthPermService{db: db}
 }
 
@@ -30,14 +34,14 @@ type systemAuthPermService struct {
 }
 
 // SelectMenuIdsByRoleId 根据角色ID获取菜单ID
-func (permSrv systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
+func (service systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
 	var role system_model.SystemAuthRole
-	err := permSrv.db.Where("id = ? AND is_disable = ?", roleId, 0).Limit(1).First(&role).Error
+	err := service.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_model.SystemAuthPerm
-	err = permSrv.db.Where("role_id = ?", role.ID).Find(&perms).Error
+	err = service.db.Where("role_id = ?", role.ID).Find(&perms).Error
 	if e = response.CheckErr(err, "SelectMenuIdsByRoleId Find err"); e != nil {
 		return []uint{}, e
 	}
@@ -48,9 +52,9 @@ func (permSrv systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds
 }
 
 // CacheRoleMenusByRoleId 缓存角色菜单
-func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
+func (service systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
 	var perms []system_model.SystemAuthPerm
-	err := permSrv.db.Where("role_id = ?", roleId).Find(&perms).Error
+	err := service.db.Where("role_id = ?", roleId).Find(&perms).Error
 	if e = response.CheckErr(err, "CacheRoleMenusByRoleId Find perms err"); e != nil {
 		return
 	}
@@ -59,7 +63,7 @@ func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e erro
 		menuIds = append(menuIds, perm.MenuId)
 	}
 	var menus []system_model.SystemAuthMenu
-	err = permSrv.db.Where(
+	err = service.db.Where(
 		"is_disable = ? and id in ? and menu_type in ?", 0, menuIds, []string{"C", "A"}).Order(
 		"menu_sort, id").Find(&menus).Error
 	if e = response.CheckErr(err, "CacheRoleMenusByRoleId Find menus err"); e != nil {
@@ -76,12 +80,12 @@ func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e erro
 }
 
 // BatchSaveByMenuIds 批量写入角色菜单
-func (permSrv systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds string, db *gorm.DB) (e error) {
+func (service systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds string, db *gorm.DB) (e error) {
 	if menuIds == "" {
 		return
 	}
 	if db == nil {
-		db = permSrv.db
+		db = service.db
 	}
 	err := db.Transaction(func(tx *gorm.DB) error {
 		var perms []system_model.SystemAuthPerm
@@ -99,9 +103,9 @@ func (permSrv systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds str
 }
 
 // BatchDeleteByRoleId 批量删除角色菜单(根据角色ID)
-func (permSrv systemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.DB) (e error) {
+func (service systemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.DB) (e error) {
 	if db == nil {
-		db = permSrv.db
+		db = service.db
 	}
 	err := db.Delete(&system_model.SystemAuthPerm{}, "role_id = ?", roleId).Error
 	e = response.CheckErr(err, "BatchDeleteByRoleId Delete err")
@@ -109,8 +113,8 @@ func (permSrv systemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.D
 }
 
 // BatchDeleteByMenuId 批量删除角色菜单(根据菜单ID)
-func (permSrv systemAuthPermService) BatchDeleteByMenuId(menuId uint) (e error) {
+func (service systemAuthPermService) BatchDeleteByMenuId(menuId uint) (e error) {
-	err := permSrv.db.Delete(&system_model.SystemAuthPerm{}, "menu_id = ?", menuId).Error
+	err := service.db.Delete(&system_model.SystemAuthPerm{}, "menu_id = ?", menuId).Error
 	e = response.CheckErr(err, "BatchDeleteByMenuId Delete err")
 	return
 }

server/admin/system/role/role.go

@@ -29,12 +29,12 @@ import (
 // }
 
 type RoleHandler struct {
-	Service ISystemAuthRoleService
+	// Service ISystemAuthRoleService
 }
 
 // all 角色所有
 func (rh RoleHandler) All(c *gin.Context) {
-	res, err := rh.Service.All()
+	res, err := Service.All()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -44,7 +44,7 @@ func (rh RoleHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) {
 		return
 	}
-	res, err := rh.Service.List(page)
+	res, err := Service.List(page)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -54,7 +54,7 @@ func (rh RoleHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := rh.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -64,7 +64,7 @@ func (rh RoleHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, rh.Service.Add(addReq))
+	response.CheckAndResp(c, Service.Add(addReq))
 }
 
 // edit 编辑角色
@@ -73,7 +73,7 @@ func (rh RoleHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, rh.Service.Edit(editReq))
+	response.CheckAndResp(c, Service.Edit(editReq))
 }
 
 // del 删除角色
@@ -82,5 +82,5 @@ func (rh RoleHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, rh.Service.Del(delReq.ID))
+	response.CheckAndResp(c, Service.Del(delReq.ID))
 }

server/admin/system/role/service.go

@@ -4,6 +4,7 @@ import (
 	"strconv"
 	"strings"
 	"x_admin/config"
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/system_model"
@@ -22,15 +23,17 @@ type ISystemAuthRoleService interface {
 	Del(id uint) (e error)
 }
 
+var Service = NewSystemAuthRoleService()
+
 // NewSystemAuthRoleService 初始化
-func NewSystemAuthRoleService(db *gorm.DB, permSrv ISystemAuthPermService) ISystemAuthRoleService {
+func NewSystemAuthRoleService() ISystemAuthRoleService {
-	return &systemAuthRoleService{db: db, permSrv: permSrv}
+	db := core.GetDB()
+	return &systemAuthRoleService{db: db}
 }
 
 // systemAuthRoleService 系统角色服务实现类
 type systemAuthRoleService struct {
-	db      *gorm.DB
+	db *gorm.DB
-	permSrv ISystemAuthPermService
 }
 
 // All 角色所有
@@ -85,7 +88,7 @@ func (roleSrv systemAuthRoleService) Detail(id uint) (res SystemAuthRoleResp, e
 	}
 	response.Copy(&res, role)
 	res.Member = roleSrv.getMemberCnt(role.ID)
-	res.Menus, e = roleSrv.permSrv.SelectMenuIdsByRoleId(role.ID)
+	res.Menus, e = PermService.SelectMenuIdsByRoleId(role.ID)
 	return
 }
 
@@ -111,7 +114,7 @@ func (roleSrv systemAuthRoleService) Add(addReq SystemAuthRoleAddReq) (e error)
 		if te = response.CheckErr(txErr, "Add Create in tx err"); te != nil {
 			return te
 		}
-		te = roleSrv.permSrv.BatchSaveByMenuIds(role.ID, addReq.MenuIds, tx)
+		te = PermService.BatchSaveByMenuIds(role.ID, addReq.MenuIds, tx)
 		return te
 	})
 	e = response.CheckErr(err, "Add Transaction err")
@@ -143,13 +146,13 @@ func (roleSrv systemAuthRoleService) Edit(editReq SystemAuthRoleEditReq) (e erro
 		if te = response.CheckErr(txErr, "Edit Updates in tx err"); te != nil {
 			return te
 		}
-		if te = roleSrv.permSrv.BatchDeleteByRoleId(editReq.ID, tx); te != nil {
+		if te = PermService.BatchDeleteByRoleId(editReq.ID, tx); te != nil {
 			return te
 		}
-		if te = roleSrv.permSrv.BatchSaveByMenuIds(editReq.ID, editReq.MenuIds, tx); te != nil {
+		if te = PermService.BatchSaveByMenuIds(editReq.ID, editReq.MenuIds, tx); te != nil {
 			return te
 		}
-		te = roleSrv.permSrv.CacheRoleMenusByRoleId(editReq.ID)
+		te = PermService.CacheRoleMenusByRoleId(editReq.ID)
 		return te
 	})
 	e = response.CheckErr(err, "Edit Transaction err")
@@ -175,7 +178,7 @@ func (roleSrv systemAuthRoleService) Del(id uint) (e error) {
 		if te = response.CheckErr(txErr, "Del Delete in tx err"); te != nil {
 			return te
 		}
-		if te = roleSrv.permSrv.BatchDeleteByRoleId(id, tx); te != nil {
+		if te = PermService.BatchDeleteByRoleId(id, tx); te != nil {
 			return te
 		}
 		util.RedisUtil.HDel(config.AdminConfig.BackstageRolesKey, strconv.FormatUint(uint64(id), 10))

server/generator/gen/gen.go

@@ -1,7 +1,6 @@
 package gen
 
 import (
-	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 
@@ -14,15 +13,15 @@ import (
 )
 
 func GenRoute(rg *gin.RouterGroup) {
-	db := core.GetDB()
+	// db := core.GetDB()
 	// permSrv := system.NewSystemAuthPermService(db)
 	// roleSrv := system.NewSystemAuthRoleService(db, permSrv)
 	// adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv)
 	// service := system.NewSystemLoginService(db, adminSrv)
 
-	server := NewGenerateService(db)
+	// server := NewGenerateService()
 
-	handle := genHandler{Service: server}
+	handle := genHandler{}
 
 	rg = rg.Group("/gen", middleware.TokenAuth())
 	rg.GET("/db", handle.dbTables)
@@ -37,7 +36,7 @@ func GenRoute(rg *gin.RouterGroup) {
 }
 
 type genHandler struct {
-	Service IGenerateService
+	// Service IGenerateService
 }
 
 // dbTables 数据表列表
@@ -50,7 +49,7 @@ func (gh genHandler) dbTables(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &tbReq)) {
 		return
 	}
-	res, err := gh.Service.DbTables(page, tbReq)
+	res, err := Service.DbTables(page, tbReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -64,7 +63,7 @@ func (gh genHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := gh.Service.List(page, listReq)
+	res, err := Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -74,7 +73,7 @@ func (gh genHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := gh.Service.Detail(detailReq.ID)
+	res, err := Service.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -84,7 +83,7 @@ func (gh genHandler) importTable(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &importReq)) {
 		return
 	}
-	err := gh.Service.ImportTable(strings.Split(importReq.Tables, ","))
+	err := Service.ImportTable(strings.Split(importReq.Tables, ","))
 	response.CheckAndResp(c, err)
 }
 
@@ -94,7 +93,7 @@ func (gh genHandler) syncTable(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &syncReq)) {
 		return
 	}
-	err := gh.Service.SyncTable(syncReq.ID)
+	err := Service.SyncTable(syncReq.ID)
 	response.CheckAndResp(c, err)
 }
 
@@ -104,7 +103,7 @@ func (gh genHandler) editTable(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	err := gh.Service.EditTable(editReq)
+	err := Service.EditTable(editReq)
 	response.CheckAndResp(c, err)
 }
 
@@ -114,7 +113,7 @@ func (gh genHandler) delTable(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	err := gh.Service.DelTable(delReq.Ids)
+	err := Service.DelTable(delReq.Ids)
 	response.CheckAndResp(c, err)
 }
 
@@ -124,7 +123,7 @@ func (gh genHandler) previewCode(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &previewReq)) {
 		return
 	}
-	res, err := gh.Service.PreviewCode(previewReq.ID)
+	res, err := Service.PreviewCode(previewReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -135,7 +134,7 @@ func (gh genHandler) previewCode(c *gin.Context) {
 // 		return
 // 	}
 // 	for _, table := range strings.Split(genReq.Tables, ",") {
-// 		err := gh.Service.GenCode(table)
+// 		err := Service.GenCode(table)
 // 		if response.IsFailWithResp(c, err) {
 // 			return
 // 		}
@@ -149,7 +148,7 @@ func (gh genHandler) downloadCode(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &downloadReq)) {
 		return
 	}
-	zipBytes, err := gh.Service.DownloadCode(strings.Split(downloadReq.Tables, ","))
+	zipBytes, err := Service.DownloadCode(strings.Split(downloadReq.Tables, ","))
 	if response.IsFailWithResp(c, err) {
 		return
 	}

server/generator/gen/service.go

@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"bytes"
 	"x_admin/config"
+	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/gen_model"
@@ -28,8 +29,11 @@ type IGenerateService interface {
 	DownloadCode(tableNames []string) ([]byte, error)
 }
 
+var Service = NewGenerateService()
+
 // NewGenerateService 初始化
-func NewGenerateService(db *gorm.DB) IGenerateService {
+func NewGenerateService() *generateService {
+	db := core.GetDB()
 	return &generateService{db: db}
 }
 

server/middleware/auth.go

@@ -15,12 +15,6 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-var (
-	permSrv  = role.NewSystemAuthPermService(core.GetDB())
-	roleSrv  = role.NewSystemAuthRoleService(core.GetDB(), permSrv)
-	adminSrv = admin.NewSystemAuthAdminService(core.GetDB(), permSrv, roleSrv)
-)
-
 // TokenAuth Token认证中间件
 func TokenAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
@@ -69,7 +63,7 @@ func TokenAuth() gin.HandlerFunc {
 		}
 
 		if !util.RedisUtil.HExists(config.AdminConfig.BackstageManageKey, uidStr) {
-			err := adminSrv.CacheAdminUserByUid(uid)
+			err := admin.Service.CacheAdminUserByUid(uid)
 			if err != nil {
 				core.Logger.Errorf("TokenAuth CacheAdminUserByUid err: err=[%+v]", err)
 				response.Fail(c, response.SystemError)
@@ -129,7 +123,7 @@ func TokenAuth() gin.HandlerFunc {
 				c.Abort()
 				return
 			}
-			err = permSrv.CacheRoleMenusByRoleId(uint(i))
+			err = role.PermService.CacheRoleMenusByRoleId(uint(i))
 			if err != nil {
 				core.Logger.Errorf("TokenAuth CacheRoleMenusByRoleId err: err=[%+v]", err)
 				response.Fail(c, response.SystemError)