From e9dda76e8f3487c498cb8779b724e5507e16ee2d Mon Sep 17 00:00:00 2001 From: xh <11675084@qq.com> Date: Tue, 24 Jun 2025 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B1=82=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/article_collect.ts | 26 ---- admin/src/api/setting/website.ts | 9 -- admin/src/views/article_collect/edit.vue | 117 ------------------ admin/src/views/article_collect/index.vue | 107 ---------------- admin/src/views/setting/website/protocol.vue | 59 --------- .../article_collect/article_collect_ctl.go | 40 ------ .../article_collect/article_collect_schema.go | 41 ------ .../article_collect_service.go | 68 ---------- .../flow/flow_history/flow_history_service.go | 26 ++-- server/admin/setting/protocol/protocol.go | 43 ------- server/admin/setting/protocol/schema.go | 13 -- server/admin/setting/protocol/service.go | 71 ----------- server/admin/system/enter.go | 57 --------- .../admin/systemController}/admin.go | 90 +++++++------- .../admin/systemController}/dept.go | 16 +-- .../admin/systemController}/log.go | 8 +- .../admin/systemController}/login.go | 13 +- .../admin/systemController}/menu.go | 24 ++-- .../admin/systemController}/post.go | 24 ++-- .../admin/systemController}/role.go | 44 +++---- .../setting}/copyright.go | 0 .../setting}/dict_data.go | 0 .../setting}/dict_type.go | 0 server/middleware/auth.go | 8 +- server/router/admin/article_collect_route.go | 20 --- server/router/admin/entry.go | 25 ++-- .../systemSchema/adminSchema.go} | 2 +- .../systemSchema/deptSchema.go} | 2 +- .../systemSchema/logSchema.go} | 35 +++--- .../systemSchema/loginSchema.go} | 11 +- .../systemSchema/menuSchema.go} | 2 +- .../systemSchema/postSchema.go} | 2 +- .../systemSchema/roleSchema.go} | 2 +- .../systemService/adminService.go} | 47 +++---- .../systemService/deptService.go} | 5 +- .../systemService/logService.go} | 13 +- .../systemService/loginService.go} | 20 ++- .../systemService/menuService.go} | 8 +- .../systemService/permService.go} | 10 +- .../systemService/postService.go} | 5 +- .../systemService/roleService.go} | 16 +-- 41 files changed, 202 insertions(+), 927 deletions(-) delete mode 100644 admin/src/api/article_collect.ts delete mode 100644 admin/src/views/article_collect/edit.vue delete mode 100644 admin/src/views/article_collect/index.vue delete mode 100644 admin/src/views/setting/website/protocol.vue delete mode 100644 server/admin/article_collect/article_collect_ctl.go delete mode 100644 server/admin/article_collect/article_collect_schema.go delete mode 100644 server/admin/article_collect/article_collect_service.go delete mode 100644 server/admin/setting/protocol/protocol.go delete mode 100644 server/admin/setting/protocol/schema.go delete mode 100644 server/admin/setting/protocol/service.go delete mode 100644 server/admin/system/enter.go rename server/{admin/system/admin => controller/admin/systemController}/admin.go (62%) rename server/{admin/system/dept => controller/admin/systemController}/dept.go (81%) rename server/{admin/system/log => controller/admin/systemController}/log.go (83%) rename server/{admin/system/login => controller/admin/systemController}/login.go (73%) rename server/{admin/system/menu => controller/admin/systemController}/menu.go (74%) rename server/{admin/system/post => controller/admin/systemController}/post.go (75%) rename server/{admin/system/role => controller/admin/systemController}/role.go (54%) rename server/{admin/setting/copyright => controller/setting}/copyright.go (100%) rename server/{admin/setting/dict_data => controller/setting}/dict_data.go (100%) rename server/{admin/setting/dict_type => controller/setting}/dict_type.go (100%) delete mode 100644 server/router/admin/article_collect_route.go rename server/{admin/system/admin/schema.go => schema/systemSchema/adminSchema.go} (99%) rename server/{admin/system/dept/schema.go => schema/systemSchema/deptSchema.go} (99%) rename server/{admin/system/log/schema.go => schema/systemSchema/logSchema.go} (66%) rename server/{admin/system/login/schema.go => schema/systemSchema/loginSchema.go} (75%) rename server/{admin/system/menu/schema.go => schema/systemSchema/menuSchema.go} (99%) rename server/{admin/system/post/schema.go => schema/systemSchema/postSchema.go} (99%) rename server/{admin/system/role/schema.go => schema/systemSchema/roleSchema.go} (99%) rename server/{admin/system/admin/service.go => service/systemService/adminService.go} (90%) rename server/{admin/system/dept/service.go => service/systemService/deptService.go} (97%) rename server/{admin/system/log/service.go => service/systemService/logService.go} (91%) rename server/{admin/system/login/service.go => service/systemService/loginService.go} (87%) rename server/{admin/system/menu/service.go => service/systemService/menuService.go} (95%) rename server/{admin/system/role/perm_service.go => service/systemService/permService.go} (91%) rename server/{admin/system/post/service.go => service/systemService/postService.go} (98%) rename server/{admin/system/role/service.go => service/systemService/roleService.go} (93%) diff --git a/admin/src/api/article_collect.ts b/admin/src/api/article_collect.ts deleted file mode 100644 index 66f1ae4..0000000 --- a/admin/src/api/article_collect.ts +++ /dev/null @@ -1,26 +0,0 @@ -import request from '@/utils/request' - -// 文章收藏列表 -export function article_collect_lists(params?: Record) { - return request.get({ url: '/article_collect/list', params }) -} - -// 文章收藏详情 -export function article_collect_detail(params: Record) { - return request.get({ url: '/article_collect/detail', params }) -} - -// 文章收藏新增 -export function article_collect_add(data: Record) { - return request.post({ url: '/article_collect/add', data }) -} - -// 文章收藏编辑 -export function article_collect_edit(data: Record) { - return request.post({ url: '/article_collect/edit', data }) -} - -// 文章收藏删除 -export function article_collect_delete(data: Record) { - return request.post({ url: '/article_collect/del', data }) -} diff --git a/admin/src/api/setting/website.ts b/admin/src/api/setting/website.ts index 186c51c..c4a21e6 100644 --- a/admin/src/api/setting/website.ts +++ b/admin/src/api/setting/website.ts @@ -17,15 +17,6 @@ export function setWebsite(data: any) { return request.post({ url: '/setting/website/save', data }) } -// 获取政策协议 -export function getProtocol() { - return request.get({ url: '/setting/protocol/detail' }) -} -// 设置政策协议 -export function setProtocol(data: any) { - return request.post({ url: '/setting/protocol/save', data }) -} - // 获取网站接口列表 export function getApiList() { return request.get({ url: '/apiList' }) diff --git a/admin/src/views/article_collect/edit.vue b/admin/src/views/article_collect/edit.vue deleted file mode 100644 index fb7e74d..0000000 --- a/admin/src/views/article_collect/edit.vue +++ /dev/null @@ -1,117 +0,0 @@ - - diff --git a/admin/src/views/article_collect/index.vue b/admin/src/views/article_collect/index.vue deleted file mode 100644 index 0bc2f0c..0000000 --- a/admin/src/views/article_collect/index.vue +++ /dev/null @@ -1,107 +0,0 @@ - - diff --git a/admin/src/views/setting/website/protocol.vue b/admin/src/views/setting/website/protocol.vue deleted file mode 100644 index 86dee45..0000000 --- a/admin/src/views/setting/website/protocol.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/server/admin/article_collect/article_collect_ctl.go b/server/admin/article_collect/article_collect_ctl.go deleted file mode 100644 index 8fd4087..0000000 --- a/server/admin/article_collect/article_collect_ctl.go +++ /dev/null @@ -1,40 +0,0 @@ -package article_collect - -import ( - "x_admin/core/request" - "x_admin/core/response" - "x_admin/util" - - "github.com/gin-gonic/gin" -) - -type ArticleCollectHandler struct { - Service ArticleCollectService -} - -// @Summary article_collect列表 -// @Tags article_collect文章 -// @Produce json -// @Param Token header string true "token" -// @Param PageNo query int true "页码" -// @Param PageSize query int true "每页大小" -// @Param userId query int false "用户ID" -// @Param articleId query int false "文章ID" -// @Success 200 {object} response.PageResp "成功" -// @Failure 400 {object} string "请求错误" -// @Failure 500 {object} string "内部错误" -// @Router /api/article_collect/list [get] -// -// list article_collect列表 -func (hd ArticleCollectHandler) List(c *gin.Context) { - var page request.PageReq - var listReq ArticleCollectListReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { - return - } - if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { - return - } - res, err := Service.List(page, listReq) - response.CheckAndRespWithData(c, res, err) -} diff --git a/server/admin/article_collect/article_collect_schema.go b/server/admin/article_collect/article_collect_schema.go deleted file mode 100644 index 2b4b949..0000000 --- a/server/admin/article_collect/article_collect_schema.go +++ /dev/null @@ -1,41 +0,0 @@ -package article_collect - -import "x_admin/core" - -//ArticleCollectListReq 文章收藏列表参数 -type ArticleCollectListReq struct { - UserId int `form:"userId"` // 用户ID - ArticleId int `form:"articleId"` // 文章ID -} - -//ArticleCollectDetailReq 文章收藏详情参数 -type ArticleCollectDetailReq struct { - Id int `form:"id"` // 主键 -} - -//ArticleCollectAddReq 文章收藏新增参数 -type ArticleCollectAddReq struct { - UserId int `form:"userId"` // 用户ID - ArticleId int `form:"articleId"` // 文章ID -} - -//ArticleCollectEditReq 文章收藏新增参数 -type ArticleCollectEditReq struct { - Id int `form:"id"` // 主键 - UserId int `form:"userId"` // 用户ID - ArticleId int `form:"articleId"` // 文章ID -} - -//ArticleCollectDelReq 文章收藏新增参数 -type ArticleCollectDelReq struct { - Id int `form:"id"` // 主键 -} - -//ArticleCollectResp 文章收藏返回信息 -type ArticleCollectResp struct { - Id int `json:"id" structs:"id"` // 主键 - UserId int `json:"userId" structs:"userId"` // 用户ID - ArticleId int `json:"articleId" structs:"articleId"` // 文章ID - CreateTime core.NullTime `json:"createTime" structs:"createTime"` // 创建时间 - UpdateTime core.NullTime `json:"updateTime" structs:"updateTime"` // 更新时间 -} diff --git a/server/admin/article_collect/article_collect_service.go b/server/admin/article_collect/article_collect_service.go deleted file mode 100644 index e75063c..0000000 --- a/server/admin/article_collect/article_collect_service.go +++ /dev/null @@ -1,68 +0,0 @@ -package article_collect - -import ( - "x_admin/core" - "x_admin/core/request" - "x_admin/core/response" - "x_admin/model" - "x_admin/util/convert_util" - - "gorm.io/gorm" -) - -type IArticleCollectService interface { - List(page request.PageReq, listReq ArticleCollectListReq) (res response.PageResp, e error) - Detail(id int) (res ArticleCollectResp, e error) - Add(addReq ArticleCollectAddReq) (e error) - Edit(editReq ArticleCollectEditReq) (e error) - Del(id int) (e error) -} - -var Service = NewArticleCollectService() - -// NewArticleCollectService 初始化 -func NewArticleCollectService() ArticleCollectService { - db := core.GetDB() - return ArticleCollectService{db: db} -} - -// ArticleCollectService 文章收藏服务实现类 -type ArticleCollectService struct { - db *gorm.DB -} - -// List 文章收藏列表 -func (service ArticleCollectService) List(page request.PageReq, listReq ArticleCollectListReq) (res response.PageResp, e error) { - // 分页信息 - limit := page.PageSize - offset := page.PageSize * (page.PageNo - 1) - // 查询 - dbModel := service.db.Model(&model.ArticleCollect{}) - if listReq.UserId > 0 { - dbModel = dbModel.Where("user_id = ?", listReq.UserId) - } - if listReq.ArticleId > 0 { - dbModel = dbModel.Where("article_id = ?", listReq.ArticleId) - } - dbModel = dbModel.Where("is_delete = ?", 0) - // 总数 - var count int64 - err := dbModel.Count(&count).Error - if e = response.CheckErr(err, "列表总数获取失败"); e != nil { - return - } - // 数据 - var modelList []model.ArticleCollect - err = dbModel.Limit(limit).Offset(offset).Order("id desc").Find(&modelList).Error - if e = response.CheckErr(err, "列表获取失败"); e != nil { - return - } - result := []ArticleCollectResp{} - convert_util.Copy(&result, modelList) - return response.PageResp{ - PageNo: page.PageNo, - PageSize: page.PageSize, - Count: count, - Lists: result, - }, nil -} diff --git a/server/admin/flow/flow_history/flow_history_service.go b/server/admin/flow/flow_history/flow_history_service.go index c9a8219..e16af5e 100644 --- a/server/admin/flow/flow_history/flow_history_service.go +++ b/server/admin/flow/flow_history/flow_history_service.go @@ -6,31 +6,19 @@ import ( "fmt" "strconv" "x_admin/admin/flow/flow_apply" - "x_admin/admin/system/admin" - "x_admin/admin/system/dept" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" "x_admin/model/system_model" + "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "x_admin/util/convert_util" "gorm.io/gorm" ) -// type IFlowHistoryService interface { -// List(page request.PageReq, listReq FlowHistoryListReq) (res response.PageResp, e error) -// ListAll() (res []FlowHistoryResp, e error) - -// Detail(id int) (res FlowHistoryResp, e error) -// Add(addReq FlowHistoryAddReq) (e error) -// Edit(editReq FlowHistoryEditReq) (e error) -// Del(id int) (e error) - -// GetNextNode(nextNode NextNodeReq) (e error) -// } - var Service = NewFlowHistoryService() // NewFlowHistoryService 初始化 @@ -188,7 +176,7 @@ func (service flowHistoryService) Del(id int) (e error) { /** * 获取节点的审批用户 */ -func (service flowHistoryService) GetApprover(ApplyId int) (res []admin.SystemAuthAdminResp, e error) { +func (service flowHistoryService) GetApprover(ApplyId int) (res []systemSchema.SystemAuthAdminResp, e error) { nextNodes, applyDetail, _, err := service.GetNextNode(ApplyId) if err != nil { return nil, err @@ -232,14 +220,14 @@ func (service flowHistoryService) GetApprover(ApplyId int) (res []admin.SystemAu } else if userType == 2 { // 申请人所在的部门负责人 - applyUser, err := admin.Service.Detail(uint(applyDetail.ApplyUserId)) + applyUser, err := systemService.AdminService.Detail(uint(applyDetail.ApplyUserId)) if err != nil { return nil, err } if applyUser.DeptId == 0 { return nil, errors.New("申请人没有绑定部门") } - deptDetails, err := dept.Service.Detail(applyUser.DeptId) + deptDetails, err := systemService.DeptService.Detail(applyUser.DeptId) if err != nil { return nil, err } @@ -256,7 +244,7 @@ func (service flowHistoryService) GetApprover(ApplyId int) (res []admin.SystemAu } // 数据 - var adminResp []admin.SystemAuthAdminResp + var adminResp []systemSchema.SystemAuthAdminResp err = adminModel.Where(where).Find(&adminResp).Error if e = response.CheckErr(err, "获取审批用户失败"); e != nil { return @@ -320,7 +308,7 @@ func (service flowHistoryService) Pass(pass PassReq) (e error) { isUserTask = true flow.PassStatus = 1 //1待处理 flow.ApproverId = pass.NextNodeAdminId - Approver, err := admin.Service.Detail(uint(pass.NextNodeAdminId)) + Approver, err := systemService.AdminService.Detail(uint(pass.NextNodeAdminId)) if err != nil { return err } else { diff --git a/server/admin/setting/protocol/protocol.go b/server/admin/setting/protocol/protocol.go deleted file mode 100644 index 18f41d2..0000000 --- a/server/admin/setting/protocol/protocol.go +++ /dev/null @@ -1,43 +0,0 @@ -package protocol - -import ( - "x_admin/core/response" - "x_admin/middleware" - "x_admin/util" - - "github.com/gin-gonic/gin" -) - -func ProtocolRoute(rg *gin.RouterGroup) { - // 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) - - handle := protocolHandler{} - - rg = rg.Group("/setting", middleware.TokenAuth()) - rg.GET("/protocol/detail", handle.Detail) - rg.POST("/protocol/save", handle.save) -} - -type protocolHandler struct { -} - -// detail 获取政策信息 -func (ph protocolHandler) Detail(c *gin.Context) { - res, err := Service.Detail() - response.CheckAndRespWithData(c, res, err) -} - -// save 保存政策信息 -func (ph protocolHandler) save(c *gin.Context) { - var pReq SettingProtocolReq - if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &pReq)) { - return - } - response.CheckAndResp(c, Service.Save(pReq)) -} diff --git a/server/admin/setting/protocol/schema.go b/server/admin/setting/protocol/schema.go deleted file mode 100644 index 7692166..0000000 --- a/server/admin/setting/protocol/schema.go +++ /dev/null @@ -1,13 +0,0 @@ -package protocol - -//SettingProtocolItem 政策通用参数 -type SettingProtocolItem struct { - Name string `form:"name" json:"name"` // 名称 - Content string `form:"content" json:"content"` // 内容 -} - -//SettingProtocolReq 保存政策信息参数 -type SettingProtocolReq struct { - Service SettingProtocolItem `form:"service" json:"service"` // 服务协议 - Privacy SettingProtocolItem `form:"privacy" json:"privacy"` // 隐私协议 -} diff --git a/server/admin/setting/protocol/service.go b/server/admin/setting/protocol/service.go deleted file mode 100644 index 0c15e85..0000000 --- a/server/admin/setting/protocol/service.go +++ /dev/null @@ -1,71 +0,0 @@ -package protocol - -import ( - "x_admin/core" - "x_admin/core/response" - "x_admin/util" - - "gorm.io/gorm" -) - -type ISettingProtocolService interface { - Detail() (res map[string]interface{}, e error) - Save(pReq SettingProtocolReq) (e error) -} - -var Service = NewSettingProtocolService() - -// NewSettingProtocolService 初始化 -func NewSettingProtocolService() ISettingProtocolService { - db := core.GetDB() - return &settingProtocolService{db: db} -} - -// settingProtocolService 政策协议服务实现类 -type settingProtocolService struct { - db *gorm.DB -} - -// Detail 获取政策协议信息 -func (cSrv settingProtocolService) Detail() (res map[string]interface{}, e error) { - defaultVal := `{"name":"","content":""}` - json, err := util.ConfigUtil.GetVal(cSrv.db, "protocol", "service", defaultVal) - if e = response.CheckErr(err, "Detail GetVal service err"); e != nil { - return - } - var service map[string]interface{} - if e = response.CheckErr(util.ToolsUtil.JsonToObj(json, &service), "Detail JsonToObj service err"); e != nil { - return - } - json, err = util.ConfigUtil.GetVal(cSrv.db, "protocol", "privacy", defaultVal) - if e = response.CheckErr(err, "Detail GetVal privacy err"); e != nil { - return - } - var privacy map[string]interface{} - if e = response.CheckErr(util.ToolsUtil.JsonToObj(json, &privacy), "Detail JsonToObj privacy err"); e != nil { - return - } - return map[string]interface{}{ - "service": service, - "privacy": privacy, - }, nil -} - -// Save 保存政策协议信息 -func (cSrv settingProtocolService) Save(pReq SettingProtocolReq) (e error) { - serviceJson, err := util.ToolsUtil.ObjToJson(pReq.Service) - if e = response.CheckErr(err, "Save ObjToJson service err"); e != nil { - return - } - privacyJson, err := util.ToolsUtil.ObjToJson(pReq.Privacy) - if e = response.CheckErr(err, "Save ObjToJson privacy err"); e != nil { - return - } - err = util.ConfigUtil.Set(cSrv.db, "protocol", "service", serviceJson) - if e = response.CheckErr(err, "Save Set service err"); e != nil { - return - } - err = util.ConfigUtil.Set(cSrv.db, "protocol", "privacy", privacyJson) - e = response.CheckErr(err, "Save Set privacy err") - return -} diff --git a/server/admin/system/enter.go b/server/admin/system/enter.go deleted file mode 100644 index ba453f1..0000000 --- a/server/admin/system/enter.go +++ /dev/null @@ -1,57 +0,0 @@ -package system - -import ( - "x_admin/admin/system/admin" - "x_admin/admin/system/role" - "x_admin/middleware" - - "github.com/gin-gonic/gin" -) - -func AdminRoute(rg *gin.RouterGroup) { - // db := core.GetDB() - - // permSrv := role.NewSystemAuthPermService(db) - // roleSrv := role.NewSystemAuthRoleService(db, permSrv) - // adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv) - // service := NewSystemLoginService(db, adminSrv) - - handle := admin.AdminHandler{} - - rg = rg.Group("/system", middleware.TokenAuth()) - - rg.GET("/admin/self", handle.Self) - rg.GET("/admin/list", handle.List) - rg.GET("/admin/listAll", handle.ListAll) - rg.GET("/admin/ListByDeptId", handle.ListByDeptId) - rg.GET("/admin/detail", handle.Detail) - rg.POST("/admin/add", middleware.RecordLog("管理员新增"), handle.Add) - rg.POST("/admin/edit", middleware.RecordLog("管理员编辑"), handle.Edit) - rg.POST("/admin/upInfo", middleware.RecordLog("管理员更新"), handle.UpInfo) - rg.POST("/admin/del", middleware.RecordLog("管理员删除"), handle.Del) - rg.POST("/admin/disable", middleware.RecordLog("管理员状态切换"), handle.Disable) - - rg.GET("/admin/ExportFile", middleware.RecordLog("管理员导出"), handle.ExportFile) - - rg.POST("/admin/ImportFile", handle.ImportFile) - -} -func RoleRoute(rg *gin.RouterGroup) { - // db := core.GetDB() - // permSrv := role.NewSystemAuthPermService(db) - // roleSrv := NewSystemAuthRoleService(db, permSrv) - // adminSrv := NewSystemAuthAdminService(db, permSrv, roleSrv) - // service := NewSystemLoginService(db, adminSrv) - - // server := role.NewSystemAuthRoleService() - - handle := role.RoleHandler{} - - rg = rg.Group("/system", middleware.TokenAuth()) - rg.GET("/role/all", handle.All) - rg.GET("/role/list", middleware.RecordLog("角色列表"), handle.List) - rg.GET("/role/detail", middleware.RecordLog("角色详情"), handle.Detail) - rg.POST("/role/add", middleware.RecordLog("角色新增"), handle.Add) - rg.POST("/role/edit", middleware.RecordLog("角色编辑"), handle.Edit) - rg.POST("/role/del", middleware.RecordLog("角色删除"), handle.Del) -} diff --git a/server/admin/system/admin/admin.go b/server/controller/admin/systemController/admin.go similarity index 62% rename from server/admin/system/admin/admin.go rename to server/controller/admin/systemController/admin.go index 24dc047..6d4b470 100644 --- a/server/admin/system/admin/admin.go +++ b/server/controller/admin/systemController/admin.go @@ -1,12 +1,15 @@ -package admin +package systemController import ( - "fmt" "net/http" "strconv" "x_admin/config" "x_admin/core/request" "x_admin/core/response" + "x_admin/middleware" + "x_admin/schema/systemSchema" + "x_admin/service/systemService" + "x_admin/util/excel" "x_admin/util" @@ -14,27 +17,28 @@ import ( "github.com/gin-gonic/gin" ) -// func AdminRoute(rg *gin.RouterGroup) { -// db := core.GetDB() +func AdminRoute(rg *gin.RouterGroup) { -// permSrv := role.NewSystemAuthPermService(db) -// roleSrv := role.NewSystemAuthRoleService(db, permSrv) -// adminSrv := NewSystemAuthAdminService(db, permSrv, roleSrv) -// // service := NewSystemLoginService(db, adminSrv) + handle := AdminHandler{} -// handle := AdminHandler{Service: adminSrv} + rg = rg.Group("/system", middleware.TokenAuth()) -// rg = rg.Group("/system", middleware.TokenAuth()) + rg.GET("/admin/self", handle.Self) + rg.GET("/admin/list", handle.List) + rg.GET("/admin/listAll", handle.ListAll) + rg.GET("/admin/ListByDeptId", handle.ListByDeptId) + rg.GET("/admin/detail", handle.Detail) + rg.POST("/admin/add", middleware.RecordLog("管理员新增"), handle.Add) + rg.POST("/admin/edit", middleware.RecordLog("管理员编辑"), handle.Edit) + rg.POST("/admin/upInfo", middleware.RecordLog("管理员更新"), handle.UpInfo) + rg.POST("/admin/del", middleware.RecordLog("管理员删除"), handle.Del) + rg.POST("/admin/disable", middleware.RecordLog("管理员状态切换"), handle.Disable) -// rg.GET("/admin/self", handle.self) -// rg.GET("/admin/list", handle.List) -// rg.GET("/admin/detail", handle.Detail) -// rg.POST("/admin/add", middleware.RecordLog("管理员新增"), handle.Add) -// rg.POST("/admin/edit", middleware.RecordLog("管理员编辑"), handle.Edit) -// rg.POST("/admin/upInfo", middleware.RecordLog("管理员更新"), handle.upInfo) -// rg.POST("/admin/del", middleware.RecordLog("管理员删除"), handle.Del) -// rg.POST("/admin/disable", middleware.RecordLog("管理员状态切换"), handle.disable) -// } + rg.GET("/admin/ExportFile", middleware.RecordLog("管理员导出"), handle.ExportFile) + + rg.POST("/admin/ImportFile", handle.ImportFile) + +} type AdminHandler struct { // Service ISystemAuthAdminService @@ -43,16 +47,17 @@ type AdminHandler struct { // self 管理员信息 func (ah AdminHandler) Self(c *gin.Context) { adminId := config.AdminConfig.GetAdminId(c) - res, err := Service.Self(adminId) + res, err := systemService.AdminService.Self(adminId) response.CheckAndRespWithData(c, res, err) } func (ah AdminHandler) ExportFile(c *gin.Context) { - var listReq SystemAuthAdminListReq + var listReq systemSchema.SystemAuthAdminListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } - res, err := Service.ExportFile(listReq) + res, err := systemService.AdminService.ExportFile(listReq) + if err != nil { response.FailWithMsg(c, response.SystemError, "查询导出失败") return @@ -77,99 +82,96 @@ func (ah AdminHandler) ImportFile(c *gin.Context) { return } defer file.Close() - importList := []SystemAuthAdminResp{} + importList := []systemSchema.SystemAuthAdminResp{} err = excel.GetExcelData(file, &importList) if err != nil { c.String(http.StatusInternalServerError, err.Error()) return } - for _, t := range importList { - fmt.Printf("%#v", t) - } - err = Service.ImportFile(importList) + err = systemService.AdminService.ImportFile(importList) response.CheckAndResp(c, err) } // list 管理员列表 func (ah AdminHandler) List(c *gin.Context) { var page request.PageReq - var listReq SystemAuthAdminListReq + var listReq systemSchema.SystemAuthAdminListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { return } if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } - res, err := Service.List(page, listReq) + res, err := systemService.AdminService.List(page, listReq) response.CheckAndRespWithData(c, res, err) } // ListAll 所有管理员列表 func (ah AdminHandler) ListAll(c *gin.Context) { - var listReq SystemAuthAdminListReq + var listReq systemSchema.SystemAuthAdminListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } - res, err := Service.ListAll(listReq) + res, err := systemService.AdminService.ListAll(listReq) response.CheckAndRespWithData(c, res, err) } // detail 管理员详细 func (ah AdminHandler) Detail(c *gin.Context) { - var detailReq SystemAuthAdminDetailReq + var detailReq systemSchema.SystemAuthAdminDetailReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } - res, err := Service.Detail(detailReq.ID) + res, err := systemService.AdminService.Detail(detailReq.ID) response.CheckAndRespWithData(c, res, err) } // add 管理员新增 func (ah AdminHandler) Add(c *gin.Context) { - var addReq SystemAuthAdminAddReq + var addReq systemSchema.SystemAuthAdminAddReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) { return } - response.CheckAndResp(c, Service.Add(addReq)) + response.CheckAndResp(c, systemService.AdminService.Add(addReq)) } // edit 管理员编辑 func (ah AdminHandler) Edit(c *gin.Context) { - var editReq SystemAuthAdminEditReq + var editReq systemSchema.SystemAuthAdminEditReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { return } - response.CheckAndResp(c, Service.Edit(c, editReq)) + response.CheckAndResp(c, systemService.AdminService.Edit(c, editReq)) } // upInfo 管理员更新 func (ah AdminHandler) UpInfo(c *gin.Context) { - var updateReq SystemAuthAdminUpdateReq + var updateReq systemSchema.SystemAuthAdminUpdateReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &updateReq)) { return } - response.CheckAndResp(c, Service.Update( + response.CheckAndResp(c, systemService.AdminService.Update( c, updateReq, config.AdminConfig.GetAdminId(c))) } // del 管理员删除 func (ah AdminHandler) Del(c *gin.Context) { - var delReq SystemAuthAdminDelReq + var delReq systemSchema.SystemAuthAdminDelReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } - response.CheckAndResp(c, Service.Del(c, delReq.ID)) + response.CheckAndResp(c, systemService.AdminService.Del(c, delReq.ID)) } // disable 管理员状态切换 func (ah AdminHandler) Disable(c *gin.Context) { - var disableReq SystemAuthAdminDisableReq + var disableReq systemSchema.SystemAuthAdminDisableReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &disableReq)) { return } - response.CheckAndResp(c, Service.Disable(c, disableReq.ID)) + response.CheckAndResp(c, systemService.AdminService.Disable(c, disableReq.ID)) } // @Summary 获取部门的用户 @@ -192,6 +194,6 @@ func (ah AdminHandler) ListByDeptId(c *gin.Context) { // if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &deptId)) { // return // } - res, err := Service.ListByUserIdOrDeptIdPostId(0, deptId, 0) + res, err := systemService.AdminService.ListByUserIdOrDeptIdPostId(0, deptId, 0) response.CheckAndRespWithData(c, res, err) } diff --git a/server/admin/system/dept/dept.go b/server/controller/admin/systemController/dept.go similarity index 81% rename from server/admin/system/dept/dept.go rename to server/controller/admin/systemController/dept.go index 6c9792e..64aed91 100644 --- a/server/admin/system/dept/dept.go +++ b/server/controller/admin/systemController/dept.go @@ -1,8 +1,10 @@ -package dept +package systemController import ( "x_admin/core/response" "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" @@ -32,7 +34,7 @@ type deptHandler struct { // all 部门所有 func (dh deptHandler) All(c *gin.Context) { - res, err := Service.All() + res, err := systemService.DeptService.All() response.CheckAndRespWithData(c, res, err) } @@ -42,7 +44,7 @@ func (dh deptHandler) List(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } - res, err := Service.List(listReq) + res, err := systemService.DeptService.List(listReq) response.CheckAndRespWithData(c, res, err) } @@ -52,7 +54,7 @@ func (dh deptHandler) Detail(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } - res, err := Service.Detail(detailReq.ID) + res, err := systemService.DeptService.Detail(detailReq.ID) response.CheckAndRespWithData(c, res, err) } @@ -62,7 +64,7 @@ func (dh deptHandler) Add(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &addReq)) { return } - response.CheckAndResp(c, Service.Add(addReq)) + response.CheckAndResp(c, systemService.DeptService.Add(addReq)) } // edit 部门编辑 @@ -71,7 +73,7 @@ func (dh deptHandler) Edit(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) { return } - response.CheckAndResp(c, Service.Edit(editReq)) + response.CheckAndResp(c, systemService.DeptService.Edit(editReq)) } // del 部门删除 @@ -80,5 +82,5 @@ func (dh deptHandler) Del(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &delReq)) { return } - response.CheckAndResp(c, Service.Del(delReq.ID)) + response.CheckAndResp(c, systemService.DeptService.Del(delReq.ID)) } diff --git a/server/admin/system/log/log.go b/server/controller/admin/systemController/log.go similarity index 83% rename from server/admin/system/log/log.go rename to server/controller/admin/systemController/log.go index 857f31f..8ddaa86 100644 --- a/server/admin/system/log/log.go +++ b/server/controller/admin/systemController/log.go @@ -1,9 +1,11 @@ -package log +package systemController import ( "x_admin/core/request" "x_admin/core/response" "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" @@ -31,7 +33,7 @@ func (lh logHandler) operate(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &logReq)) { return } - res, err := Service.Operate(page, logReq) + res, err := systemService.LogsService.Operate(page, logReq) response.CheckAndRespWithData(c, res, err) } @@ -45,6 +47,6 @@ func (lh logHandler) login(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &logReq)) { return } - res, err := Service.Login(page, logReq) + res, err := systemService.LogsService.Login(page, logReq) response.CheckAndRespWithData(c, res, err) } diff --git a/server/admin/system/login/login.go b/server/controller/admin/systemController/login.go similarity index 73% rename from server/admin/system/login/login.go rename to server/controller/admin/systemController/login.go index df9d756..5f32d5c 100644 --- a/server/admin/system/login/login.go +++ b/server/controller/admin/systemController/login.go @@ -1,20 +1,17 @@ -package login +package systemController import ( "x_admin/admin/common/captcha" "x_admin/core/response" "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" ) func LoginRoute(rg *gin.RouterGroup) { - // db := core.GetDB() - // permSrv := role.NewSystemAuthPermService(db) - // roleSrv := role.NewSystemAuthRoleService(db, permSrv) - // adminSrv := admin.NewSystemAuthAdminService(db, permSrv, roleSrv) - // service := NewSystemLoginService(db, adminSrv) handle := loginHandler{} @@ -41,7 +38,7 @@ func (lh loginHandler) login(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &loginReq)) { return } - res, err := Service.Login(c, &loginReq) + res, err := systemService.LoginService.Login(c, &loginReq) response.CheckAndRespWithData(c, res, err) } @@ -51,5 +48,5 @@ func (lh loginHandler) logout(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyHeader(c, &logoutReq)) { return } - response.CheckAndResp(c, Service.Logout(&logoutReq)) + response.CheckAndResp(c, systemService.LoginService.Logout(&logoutReq)) } diff --git a/server/admin/system/menu/menu.go b/server/controller/admin/systemController/menu.go similarity index 74% rename from server/admin/system/menu/menu.go rename to server/controller/admin/systemController/menu.go index b08e60b..1317566 100644 --- a/server/admin/system/menu/menu.go +++ b/server/controller/admin/systemController/menu.go @@ -1,24 +1,18 @@ -package menu +package systemController import ( "strconv" "x_admin/config" "x_admin/core/response" "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" ) func MenuRoute(rg *gin.RouterGroup) { - - // permSrv := role.NewSystemAuthPermService() - // roleSrv := system.NewSystemAuthRoleService(db, permSrv) - // adminSrv := system.NewSystemAuthAdminService(db, permSrv, roleSrv) - // service := system.NewSystemLoginService(db, adminSrv) - - // authSrv := NewSystemAuthMenuService() - handle := menuHandler{} rg = rg.Group("/system", middleware.TokenAuth()) @@ -37,13 +31,13 @@ type menuHandler struct { func (mh menuHandler) route(c *gin.Context) { roleId := config.AdminConfig.GetRoleId(c) id, _ := strconv.ParseUint(roleId, 10, 64) - res, err := Service.SelectMenuByRoleId(c, uint(id)) + res, err := systemService.MenuService.SelectMenuByRoleId(c, uint(id)) response.CheckAndRespWithData(c, res, err) } // list 菜单列表 func (mh menuHandler) List(c *gin.Context) { - res, err := Service.List() + res, err := systemService.MenuService.List() response.CheckAndRespWithData(c, res, err) } @@ -53,7 +47,7 @@ func (mh menuHandler) Detail(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } - res, err := Service.Detail(detailReq.ID) + res, err := systemService.MenuService.Detail(detailReq.ID) response.CheckAndRespWithData(c, res, err) } @@ -63,7 +57,7 @@ func (mh menuHandler) Add(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) { return } - response.CheckAndResp(c, Service.Add(addReq)) + response.CheckAndResp(c, systemService.MenuService.Add(addReq)) } // edit 编辑菜单 @@ -72,7 +66,7 @@ func (mh menuHandler) Edit(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { return } - response.CheckAndResp(c, Service.Edit(editReq)) + response.CheckAndResp(c, systemService.MenuService.Edit(editReq)) } // del 删除菜单 @@ -81,5 +75,5 @@ func (mh menuHandler) Del(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } - response.CheckAndResp(c, Service.Del(delReq.ID)) + response.CheckAndResp(c, systemService.MenuService.Del(delReq.ID)) } diff --git a/server/admin/system/post/post.go b/server/controller/admin/systemController/post.go similarity index 75% rename from server/admin/system/post/post.go rename to server/controller/admin/systemController/post.go index 87aef89..d126551 100644 --- a/server/admin/system/post/post.go +++ b/server/controller/admin/systemController/post.go @@ -1,23 +1,17 @@ -package post +package systemController import ( "x_admin/core/request" "x_admin/core/response" "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" ) func PostRoute(rg *gin.RouterGroup) { - // 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) - handle := postHandler{} rg = rg.Group("/system", middleware.TokenAuth()) @@ -34,7 +28,7 @@ type postHandler struct { // all 岗位所有 func (ph postHandler) All(c *gin.Context) { - res, err := Service.All() + res, err := systemService.PostService.All() response.CheckAndRespWithData(c, res, err) } @@ -48,7 +42,7 @@ func (ph postHandler) List(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } - res, err := Service.List(page, listReq) + res, err := systemService.PostService.List(page, listReq) response.CheckAndRespWithData(c, res, err) } @@ -58,7 +52,7 @@ func (ph postHandler) Detail(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } - res, err := Service.Detail(detailReq.ID) + res, err := systemService.PostService.Detail(detailReq.ID) response.CheckAndRespWithData(c, res, err) } @@ -68,7 +62,7 @@ func (ph postHandler) Add(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &addReq)) { return } - response.CheckAndResp(c, Service.Add(addReq)) + response.CheckAndResp(c, systemService.PostService.Add(addReq)) } // edit 岗位编辑 @@ -77,7 +71,7 @@ func (ph postHandler) Edit(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) { return } - response.CheckAndResp(c, Service.Edit(editReq)) + response.CheckAndResp(c, systemService.PostService.Edit(editReq)) } // del 岗位删除 @@ -86,5 +80,5 @@ func (ph postHandler) Del(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &delReq)) { return } - response.CheckAndResp(c, Service.Del(delReq.ID)) + response.CheckAndResp(c, systemService.PostService.Del(delReq.ID)) } diff --git a/server/admin/system/role/role.go b/server/controller/admin/systemController/role.go similarity index 54% rename from server/admin/system/role/role.go rename to server/controller/admin/systemController/role.go index 6d8ace6..f648c74 100644 --- a/server/admin/system/role/role.go +++ b/server/controller/admin/systemController/role.go @@ -1,32 +1,28 @@ -package role +package systemController import ( "x_admin/core/request" "x_admin/core/response" + "x_admin/middleware" + . "x_admin/schema/systemSchema" + "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" ) -// func RoleRoute(rg *gin.RouterGroup) { -// db := core.GetDB() -// permSrv := NewSystemAuthPermService(db) -// // roleSrv := NewSystemAuthRoleService(db, permSrv) -// // adminSrv := NewSystemAuthAdminService(db, permSrv, roleSrv) -// // service := NewSystemLoginService(db, adminSrv) +func RoleRoute(rg *gin.RouterGroup) { -// server := NewSystemAuthRoleService(db, permSrv) + handle := RoleHandler{} -// handle := RoleHandler{Service: server} - -// rg = rg.Group("/system", middleware.TokenAuth()) -// rg.GET("/role/all", handle.All) -// rg.GET("/role/list", middleware.RecordLog("角色列表"), handle.List) -// rg.GET("/role/detail", middleware.RecordLog("角色详情"), handle.Detail) -// rg.POST("/role/add", middleware.RecordLog("角色新增"), handle.Add) -// rg.POST("/role/edit", middleware.RecordLog("角色编辑"), handle.Edit) -// rg.POST("/role/del", middleware.RecordLog("角色删除"), handle.Del) -// } + rg = rg.Group("/system", middleware.TokenAuth()) + rg.GET("/role/all", handle.All) + rg.GET("/role/list", middleware.RecordLog("角色列表"), handle.List) + rg.GET("/role/detail", middleware.RecordLog("角色详情"), handle.Detail) + rg.POST("/role/add", middleware.RecordLog("角色新增"), handle.Add) + rg.POST("/role/edit", middleware.RecordLog("角色编辑"), handle.Edit) + rg.POST("/role/del", middleware.RecordLog("角色删除"), handle.Del) +} type RoleHandler struct { // Service ISystemAuthRoleService @@ -34,7 +30,7 @@ type RoleHandler struct { // all 角色所有 func (rh RoleHandler) All(c *gin.Context) { - res, err := Service.All() + res, err := systemService.RoleService.All() response.CheckAndRespWithData(c, res, err) } @@ -44,7 +40,7 @@ func (rh RoleHandler) List(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { return } - res, err := Service.List(page) + res, err := systemService.RoleService.List(page) response.CheckAndRespWithData(c, res, err) } @@ -54,7 +50,7 @@ func (rh RoleHandler) Detail(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } - res, err := Service.Detail(detailReq.ID) + res, err := systemService.RoleService.Detail(detailReq.ID) response.CheckAndRespWithData(c, res, err) } @@ -64,7 +60,7 @@ func (rh RoleHandler) Add(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) { return } - response.CheckAndResp(c, Service.Add(addReq)) + response.CheckAndResp(c, systemService.RoleService.Add(addReq)) } // edit 编辑角色 @@ -73,7 +69,7 @@ func (rh RoleHandler) Edit(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { return } - response.CheckAndResp(c, Service.Edit(editReq)) + response.CheckAndResp(c, systemService.RoleService.Edit(editReq)) } // del 删除角色 @@ -82,5 +78,5 @@ func (rh RoleHandler) Del(c *gin.Context) { if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } - response.CheckAndResp(c, Service.Del(delReq.ID)) + response.CheckAndResp(c, systemService.RoleService.Del(delReq.ID)) } diff --git a/server/admin/setting/copyright/copyright.go b/server/controller/setting/copyright.go similarity index 100% rename from server/admin/setting/copyright/copyright.go rename to server/controller/setting/copyright.go diff --git a/server/admin/setting/dict_data/dict_data.go b/server/controller/setting/dict_data.go similarity index 100% rename from server/admin/setting/dict_data/dict_data.go rename to server/controller/setting/dict_data.go diff --git a/server/admin/setting/dict_type/dict_type.go b/server/controller/setting/dict_type.go similarity index 100% rename from server/admin/setting/dict_type/dict_type.go rename to server/controller/setting/dict_type.go diff --git a/server/middleware/auth.go b/server/middleware/auth.go index b38aa8d..bfb72db 100644 --- a/server/middleware/auth.go +++ b/server/middleware/auth.go @@ -3,12 +3,12 @@ package middleware import ( "strconv" "strings" - "x_admin/admin/system/admin" - "x_admin/admin/system/role" + "x_admin/config" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" + "x_admin/service/systemService" "x_admin/util" @@ -66,7 +66,7 @@ func TokenAuth() gin.HandlerFunc { } if !util.RedisUtil.HExists(config.AdminConfig.BackstageManageKey, uidStr) { - err := admin.Service.CacheAdminUserByUid(uid) + err := systemService.AdminService.CacheAdminUserByUid(uid) if err != nil { core.Logger.Errorf("TokenAuth CacheAdminUserByUid err: err=[%+v]", err) response.Fail(c, response.SystemError) @@ -126,7 +126,7 @@ func TokenAuth() gin.HandlerFunc { c.Abort() return } - err = role.PermService.CacheRoleMenusByRoleId(uint(i)) + err = systemService.PermService.CacheRoleMenusByRoleId(uint(i)) if err != nil { core.Logger.Errorf("TokenAuth CacheRoleMenusByRoleId err: err=[%+v]", err) response.Fail(c, response.SystemError) diff --git a/server/router/admin/article_collect_route.go b/server/router/admin/article_collect_route.go deleted file mode 100644 index 3cdd1b9..0000000 --- a/server/router/admin/article_collect_route.go +++ /dev/null @@ -1,20 +0,0 @@ -package admin - -import ( - "x_admin/admin/article_collect" - "x_admin/middleware" - - "github.com/gin-gonic/gin" -) - -// 请在 admin/entry.go 目录引入这个函数 -// ArticleCollectRoute(rg) -func ArticleCollectRoute(rg *gin.RouterGroup) { - // db := core.GetDB() - // server := article_collect.NewArticleCollectService(db) - - handle := article_collect.ArticleCollectHandler{} - - r := rg.Group("/", middleware.TokenAuth()) - r.GET("/article_collect/list", handle.List) -} diff --git a/server/router/admin/entry.go b/server/router/admin/entry.go index 6245a0e..0d1be74 100644 --- a/server/router/admin/entry.go +++ b/server/router/admin/entry.go @@ -10,15 +10,8 @@ import ( "x_admin/admin/setting/copyright" "x_admin/admin/setting/dict_data" "x_admin/admin/setting/dict_type" - "x_admin/admin/setting/protocol" - "x_admin/admin/setting/website" - "x_admin/admin/system" - "x_admin/admin/system/dept" - "x_admin/admin/system/log" - "x_admin/admin/system/login" - "x_admin/admin/system/menu" - "x_admin/admin/system/post" + "x_admin/controller/admin/systemController" "github.com/gin-gonic/gin" ) @@ -37,20 +30,18 @@ func RegisterGroup(rg *gin.RouterGroup) { copyright.CopyrightRoute(rg) dict_data.DictDataRoute(rg) dict_type.DictTypeRoute(rg) - protocol.ProtocolRoute(rg) website.WebsiteRoute(rg) - login.LoginRoute(rg) - system.AdminRoute(rg) - menu.MenuRoute(rg) - post.PostRoute(rg) + systemController.LoginRoute(rg) + systemController.AdminRoute(rg) + systemController.MenuRoute(rg) + systemController.PostRoute(rg) - dept.DeptRoute(rg) - system.RoleRoute(rg) - log.LogRoute(rg) + systemController.DeptRoute(rg) + systemController.RoleRoute(rg) + systemController.LogRoute(rg) - ArticleCollectRoute(rg) flow.FlowTemplateRoute(rg) flow.FlowApplyRoute(rg) flow.FlowHistoryRoute(rg) diff --git a/server/admin/system/admin/schema.go b/server/schema/systemSchema/adminSchema.go similarity index 99% rename from server/admin/system/admin/schema.go rename to server/schema/systemSchema/adminSchema.go index 980a266..9233cb6 100644 --- a/server/admin/system/admin/schema.go +++ b/server/schema/systemSchema/adminSchema.go @@ -1,4 +1,4 @@ -package admin +package systemSchema import "x_admin/core" diff --git a/server/admin/system/dept/schema.go b/server/schema/systemSchema/deptSchema.go similarity index 99% rename from server/admin/system/dept/schema.go rename to server/schema/systemSchema/deptSchema.go index a205aff..6948e53 100644 --- a/server/admin/system/dept/schema.go +++ b/server/schema/systemSchema/deptSchema.go @@ -1,4 +1,4 @@ -package dept +package systemSchema import "x_admin/core" diff --git a/server/admin/system/log/schema.go b/server/schema/systemSchema/logSchema.go similarity index 66% rename from server/admin/system/log/schema.go rename to server/schema/systemSchema/logSchema.go index 1ee74ec..7bd44dc 100644 --- a/server/admin/system/log/schema.go +++ b/server/schema/systemSchema/logSchema.go @@ -1,4 +1,4 @@ -package log +package systemSchema import ( "x_admin/core" @@ -15,12 +15,13 @@ type SystemLogOperateReq struct { StartTime string `form:"startTime" time_format:"2006-01-02"` // 开始时间 EndTime string `form:"endTime" time_format:"2006-01-02"` // 结束时间 } -type SystemLogLoginReq struct { - Username string `form:"username"` // 登录账号 - Status int `form:"status" binding:"omitempty,oneof=1 2"` // 执行状态: [1=成功, 2=失败] - StartTime string `form:"startTime" time_format:"2006-01-02"` // 开始时间 - EndTime string `form:"endTime" time_format:"2006-01-02"` // 结束时间 -} + +// type SystemLogLoginReq struct { +// Username string `form:"username"` // 登录账号 +// Status int `form:"status" binding:"omitempty,oneof=1 2"` // 执行状态: [1=成功, 2=失败] +// StartTime string `form:"startTime" time_format:"2006-01-02"` // 开始时间 +// EndTime string `form:"endTime" time_format:"2006-01-02"` // 结束时间 +// } // SystemLogOperateResp 操作日志返回信息 type SystemLogOperateResp struct { @@ -41,13 +42,13 @@ type SystemLogOperateResp struct { CreateTime core.NullTime `json:"createTime" structs:"createTime"` // 创建时间 } -// SystemLogLoginResp 登录日志返回信息 -type SystemLogLoginResp struct { - ID uint `json:"id" structs:"id"` // 主键 - Username string `json:"username" structs:"username"` // 登录账号 - Ip string `json:"ip" structs:"ip"` // 来源IP - Os string `json:"os" structs:"os"` // 操作系统 - Browser string `json:"browser" structs:"browser"` // 浏览器 - Status int `json:"status" structs:"status"` // 操作状态: [1=成功, 2=失败] - CreateTime core.NullTime `json:"createTime" structs:"createTime"` // 创建时间 -} +// // SystemLogLoginResp 登录日志返回信息 +// type SystemLogLoginResp struct { +// ID uint `json:"id" structs:"id"` // 主键 +// Username string `json:"username" structs:"username"` // 登录账号 +// Ip string `json:"ip" structs:"ip"` // 来源IP +// Os string `json:"os" structs:"os"` // 操作系统 +// Browser string `json:"browser" structs:"browser"` // 浏览器 +// Status int `json:"status" structs:"status"` // 操作状态: [1=成功, 2=失败] +// CreateTime core.NullTime `json:"createTime" structs:"createTime"` // 创建时间 +// } diff --git a/server/admin/system/login/schema.go b/server/schema/systemSchema/loginSchema.go similarity index 75% rename from server/admin/system/login/schema.go rename to server/schema/systemSchema/loginSchema.go index 8caf7c8..2bb85ba 100644 --- a/server/admin/system/login/schema.go +++ b/server/schema/systemSchema/loginSchema.go @@ -1,15 +1,14 @@ -package login +package systemSchema import ( - "time" "x_admin/core" ) type SystemLogLoginReq struct { - Username string `form:"username"` // 登录账号 - Status int `form:"status" binding:"omitempty,oneof=1 2"` // 执行状态: [1=成功, 2=失败] - StartTime time.Time `form:"startTime" time_format:"2006-01-02"` // 开始时间 - EndTime time.Time `form:"endTime" time_format:"2006-01-02"` // 结束时间 + Username string `form:"username"` // 登录账号 + Status int `form:"status" binding:"omitempty,oneof=1 2"` // 执行状态: [1=成功, 2=失败] + StartTime string `form:"startTime" time_format:"2006-01-02"` // 开始时间 + EndTime string `form:"endTime" time_format:"2006-01-02"` // 结束时间 } type SystemLoginResp struct { diff --git a/server/admin/system/menu/schema.go b/server/schema/systemSchema/menuSchema.go similarity index 99% rename from server/admin/system/menu/schema.go rename to server/schema/systemSchema/menuSchema.go index e21ec2b..494d840 100644 --- a/server/admin/system/menu/schema.go +++ b/server/schema/systemSchema/menuSchema.go @@ -1,4 +1,4 @@ -package menu +package systemSchema import "x_admin/core" diff --git a/server/admin/system/post/schema.go b/server/schema/systemSchema/postSchema.go similarity index 99% rename from server/admin/system/post/schema.go rename to server/schema/systemSchema/postSchema.go index e59268e..4fc8376 100644 --- a/server/admin/system/post/schema.go +++ b/server/schema/systemSchema/postSchema.go @@ -1,4 +1,4 @@ -package post +package systemSchema import "x_admin/core" diff --git a/server/admin/system/role/schema.go b/server/schema/systemSchema/roleSchema.go similarity index 99% rename from server/admin/system/role/schema.go rename to server/schema/systemSchema/roleSchema.go index 75f79bd..c101c54 100644 --- a/server/admin/system/role/schema.go +++ b/server/schema/systemSchema/roleSchema.go @@ -1,4 +1,4 @@ -package role +package systemSchema import "x_admin/core" diff --git a/server/admin/system/admin/service.go b/server/service/systemService/adminService.go similarity index 90% rename from server/admin/system/admin/service.go rename to server/service/systemService/adminService.go index 80cf2b9..5bf1ce3 100644 --- a/server/admin/system/admin/service.go +++ b/server/service/systemService/adminService.go @@ -1,4 +1,4 @@ -package admin +package systemService import ( "fmt" @@ -6,12 +6,13 @@ import ( "strconv" "strings" "time" - "x_admin/admin/system/role" + "x_admin/config" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model/system_model" + "x_admin/schema/systemSchema" "x_admin/util" "x_admin/util/convert_util" @@ -20,7 +21,7 @@ import ( "gorm.io/gorm" ) -var Service = NewSystemAuthAdminService() +var AdminService = NewSystemAuthAdminService() // NewSystemAuthAdminService 初始化 func NewSystemAuthAdminService() *systemAuthAdminService { @@ -40,7 +41,7 @@ func (adminSrv systemAuthAdminService) FindByUsername(username string) (admin sy } // Self 当前管理员 -func (adminSrv systemAuthAdminService) Self(adminId uint) (res SystemAuthAdminSelfResp, e error) { +func (adminSrv systemAuthAdminService) Self(adminId uint) (res systemSchema.SystemAuthAdminSelfResp, e error) { // 管理员信息 var sysAdmin system_model.SystemAuthAdmin err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&sysAdmin).Error @@ -52,7 +53,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 = role.PermService.SelectMenuIdsByRoleId(uint(roleId)); e != nil { + if menuIds, e = PermService.SelectMenuIdsByRoleId(uint(roleId)); e != nil { return } if len(menuIds) > 0 { @@ -78,15 +79,15 @@ func (adminSrv systemAuthAdminService) Self(adminId uint) (res SystemAuthAdminSe } else { auths = append(auths, "*") } - var admin SystemAuthAdminSelfOneResp + var admin systemSchema.SystemAuthAdminSelfOneResp convert_util.Copy(&admin, sysAdmin) admin.Dept = strconv.FormatUint(uint64(sysAdmin.DeptId), 10) admin.Avatar = util.UrlUtil.ToAbsoluteUrl(sysAdmin.Avatar) - return SystemAuthAdminSelfResp{User: admin, Permissions: auths}, nil + return systemSchema.SystemAuthAdminSelfResp{User: admin, Permissions: auths}, nil } // 获取管理员列表- -func (adminSrv systemAuthAdminService) ListByUserIdOrDeptIdPostId(userId, deptId, postId int) (res []SystemAuthAdminResp, e error) { +func (adminSrv systemAuthAdminService) ListByUserIdOrDeptIdPostId(userId, deptId, postId int) (res []systemSchema.SystemAuthAdminResp, e error) { adminTbName := core.DBTableName(&system_model.SystemAuthAdmin{}) adminModel := adminSrv.db.Table(adminTbName+" AS admin").Where("admin.is_delete = ?", 0) @@ -100,7 +101,7 @@ func (adminSrv systemAuthAdminService) ListByUserIdOrDeptIdPostId(userId, deptId adminModel.Where("admin.post_id =?", postId) } // 数据 - var adminResp []SystemAuthAdminResp + var adminResp []systemSchema.SystemAuthAdminResp err := adminModel.Find(&adminResp).Error if e = response.CheckErr(err, "列表获取失败"); e != nil { return @@ -115,7 +116,7 @@ func (adminSrv systemAuthAdminService) ListByUserIdOrDeptIdPostId(userId, deptId } // 导出 -func (adminSrv systemAuthAdminService) ExportFile(listReq SystemAuthAdminListReq) (res []SystemAuthAdminResp, e error) { +func (adminSrv systemAuthAdminService) ExportFile(listReq systemSchema.SystemAuthAdminListReq) (res []systemSchema.SystemAuthAdminResp, e error) { // 查询 adminTbName := core.DBTableName(&system_model.SystemAuthAdmin{}) roleTbName := core.DBTableName(&system_model.SystemAuthRole{}) @@ -135,7 +136,7 @@ func (adminSrv systemAuthAdminService) ExportFile(listReq SystemAuthAdminListReq adminModel = adminModel.Where("role = ?", listReq.Role) } // 数据 - var adminResp []SystemAuthAdminResp + var adminResp []systemSchema.SystemAuthAdminResp err := adminModel.Order("id desc, sort desc").Find(&adminResp).Error if e = response.CheckErr(err, "列表获取失败"); e != nil { return @@ -150,7 +151,7 @@ func (adminSrv systemAuthAdminService) ExportFile(listReq SystemAuthAdminListReq } // 导入 -func (adminSrv systemAuthAdminService) ImportFile(importReq []SystemAuthAdminResp) (e error) { +func (adminSrv systemAuthAdminService) ImportFile(importReq []systemSchema.SystemAuthAdminResp) (e error) { var sysAdmin []system_model.SystemAuthAdmin convert_util.Copy(&sysAdmin, importReq) err := adminSrv.db.Create(&sysAdmin).Error @@ -159,7 +160,7 @@ func (adminSrv systemAuthAdminService) ImportFile(importReq []SystemAuthAdminRes } // List 管理员列表 -func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq SystemAuthAdminListReq) (res response.PageResp, e error) { +func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq systemSchema.SystemAuthAdminListReq) (res response.PageResp, e error) { // 分页信息 limit := page.PageSize offset := page.PageSize * (page.PageNo - 1) @@ -188,7 +189,7 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq System return } // 数据 - var adminResp []SystemAuthAdminResp + var adminResp []systemSchema.SystemAuthAdminResp err = adminModel.Limit(limit).Offset(offset).Order("id desc, sort desc").Find(&adminResp).Error if e = response.CheckErr(err, "列表获取失败"); e != nil { return @@ -208,7 +209,7 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq System } // List 管理员列表 -func (adminSrv systemAuthAdminService) ListAll(listReq SystemAuthAdminListReq) (res []SystemAuthAdminResp, e error) { +func (adminSrv systemAuthAdminService) ListAll(listReq systemSchema.SystemAuthAdminListReq) (res []systemSchema.SystemAuthAdminResp, e error) { // 分页信息 // 查询 @@ -231,7 +232,7 @@ func (adminSrv systemAuthAdminService) ListAll(listReq SystemAuthAdminListReq) ( } // 数据 - var adminResp []SystemAuthAdminResp + var adminResp []systemSchema.SystemAuthAdminResp err := adminModel.Order("id desc, sort desc").Find(&adminResp).Error if e = response.CheckErr(err, "列表获取失败"); e != nil { return @@ -246,7 +247,7 @@ func (adminSrv systemAuthAdminService) ListAll(listReq SystemAuthAdminListReq) ( } // Detail 管理员详细 -func (adminSrv systemAuthAdminService) Detail(id uint) (res SystemAuthAdminResp, e error) { +func (adminSrv systemAuthAdminService) Detail(id uint) (res systemSchema.SystemAuthAdminResp, e error) { 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 { @@ -264,7 +265,7 @@ func (adminSrv systemAuthAdminService) Detail(id uint) (res SystemAuthAdminResp, } // Add 管理员新增 -func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e error) { +func (adminSrv systemAuthAdminService) Add(addReq systemSchema.SystemAuthAdminAddReq) (e error) { var sysAdmin system_model.SystemAuthAdmin // 检查username r := adminSrv.db.Where("username = ? AND is_delete = ?", addReq.Username, 0).Limit(1).Find(&sysAdmin) @@ -284,8 +285,8 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro if r.RowsAffected > 0 { return response.AssertArgumentError.SetMessage("昵称已存在换一个吧！") } - var roleResp role.SystemAuthRoleResp - if roleResp, e = role.Service.Detail(addReq.Role); e != nil { + var roleResp systemSchema.SystemAuthRoleResp + if roleResp, e = RoleService.Detail(addReq.Role); e != nil { return } if roleResp.IsDisable > 0 { @@ -310,7 +311,7 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro } // Edit 管理员编辑 -func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAdminEditReq) (e error) { +func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq systemSchema.SystemAuthAdminEditReq) (e error) { // 检查id 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 { @@ -340,7 +341,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd } // 检查role if editReq.Role > 0 && editReq.ID != 1 { - if _, e = role.Service.Detail(editReq.Role); e != nil { + if _, e = RoleService.Detail(editReq.Role); e != nil { return } } @@ -393,7 +394,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd } // Update 管理员更新 -func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq SystemAuthAdminUpdateReq, adminId uint) (e error) { +func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq systemSchema.SystemAuthAdminUpdateReq, adminId uint) (e error) { // 检查id var admin system_model.SystemAuthAdmin err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&admin).Error diff --git a/server/admin/system/dept/service.go b/server/service/systemService/deptService.go similarity index 97% rename from server/admin/system/dept/service.go rename to server/service/systemService/deptService.go index bd9cbe2..49cf790 100644 --- a/server/admin/system/dept/service.go +++ b/server/service/systemService/deptService.go @@ -1,9 +1,10 @@ -package dept +package systemService import ( "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" "x_admin/util/convert_util" "gorm.io/gorm" @@ -18,7 +19,7 @@ import ( // Del(id uint) (e error) // } -var Service = NewSystemAuthDeptService() +var DeptService = NewSystemAuthDeptService() // NewSystemAuthDeptService 初始化 func NewSystemAuthDeptService() *systemAuthDeptService { diff --git a/server/admin/system/log/service.go b/server/service/systemService/logService.go similarity index 91% rename from server/admin/system/log/service.go rename to server/service/systemService/logService.go index 70c856c..7b1207a 100644 --- a/server/admin/system/log/service.go +++ b/server/service/systemService/logService.go @@ -1,4 +1,4 @@ -package log +package systemService import ( "fmt" @@ -6,19 +6,15 @@ import ( "x_admin/core/request" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" "gorm.io/gorm" ) -type ISystemLogsServer interface { - Operate(page request.PageReq, logReq SystemLogOperateReq) (res response.PageResp, e error) - Login(page request.PageReq, logReq SystemLogLoginReq) (res response.PageResp, e error) -} - -var Service = NewSystemLogsServer() +var LogsService = NewSystemLogsServer() // NewSystemLogsServer 初始化 -func NewSystemLogsServer() ISystemLogsServer { +func NewSystemLogsServer() *systemLogsServer { db := core.GetDB() return &systemLogsServer{db: db} } @@ -98,6 +94,7 @@ func (logSrv systemLogsServer) Login(page request.PageReq, logReq SystemLogLogin if logReq.Status > 0 { logModel = logModel.Where("status = ?", logReq.Status) } + // todo if logReq.StartTime != "" { logModel = logModel.Where("create_time >= now(?)", logReq.StartTime) } diff --git a/server/admin/system/login/service.go b/server/service/systemService/loginService.go similarity index 87% rename from server/admin/system/login/service.go rename to server/service/systemService/loginService.go index 0af175d..d6f4490 100644 --- a/server/admin/system/login/service.go +++ b/server/service/systemService/loginService.go @@ -1,30 +1,26 @@ -package login +package systemService import ( "errors" "runtime/debug" "strconv" - "x_admin/admin/system/admin" + "x_admin/config" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" + "x_admin/util" "github.com/gin-gonic/gin" "gorm.io/gorm" ) -type ISystemLoginService interface { - Login(c *gin.Context, req *SystemLoginReq) (res SystemLoginResp, e error) - Logout(req *SystemLogoutReq) (e error) - RecordLoginLog(c *gin.Context, adminId uint, username string, errStr string) (e error) -} - -var Service = NewSystemLoginService() +var LoginService = NewSystemLoginService() // NewSystemLoginService 初始化 -func NewSystemLoginService() ISystemLoginService { +func NewSystemLoginService() *systemLoginService { db := core.GetDB() return &systemLoginService{db: db} } @@ -36,7 +32,7 @@ type systemLoginService struct { // Login 登录 func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (res SystemLoginResp, e error) { - sysAdmin, err := admin.Service.FindByUsername(req.Username) + sysAdmin, err := AdminService.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 @@ -92,7 +88,7 @@ func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (r // 缓存登录信息 util.RedisUtil.Set(config.AdminConfig.BackstageTokenKey+token, adminIdStr, 7200) - admin.Service.CacheAdminUserByUid(sysAdmin.ID) + AdminService.CacheAdminUserByUid(sysAdmin.ID) u := system_model.SystemAuthAdmin{LastLoginIp: c.ClientIP(), LastLoginTime: util.NullTimeUtil.Now()} // 更新登录信息 diff --git a/server/admin/system/menu/service.go b/server/service/systemService/menuService.go similarity index 95% rename from server/admin/system/menu/service.go rename to server/service/systemService/menuService.go index 83927c3..89115bf 100644 --- a/server/admin/system/menu/service.go +++ b/server/service/systemService/menuService.go @@ -1,11 +1,11 @@ -package menu +package systemService import ( - "x_admin/admin/system/role" "x_admin/config" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" "x_admin/util" "x_admin/util/convert_util" @@ -22,7 +22,7 @@ import ( // Del(id uint) (e error) // } -var Service = NewSystemAuthMenuService() +var MenuService = NewSystemAuthMenuService() // NewSystemAuthMenuService 初始化 func NewSystemAuthMenuService() *systemAuthMenuService { @@ -42,7 +42,7 @@ func (menuSrv systemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId u // 超管 if adminId == config.AdminConfig.SuperAdminId { menuIds = []uint{0} - } else if menuIds, e = role.PermService.SelectMenuIdsByRoleId(roleId); e != nil { + } else if menuIds, e = PermService.SelectMenuIdsByRoleId(roleId); e != nil { return } if len(menuIds) == 0 { diff --git a/server/admin/system/role/perm_service.go b/server/service/systemService/permService.go similarity index 91% rename from server/admin/system/role/perm_service.go rename to server/service/systemService/permService.go index 4caac13..637b3ca 100644 --- a/server/admin/system/role/perm_service.go +++ b/server/service/systemService/permService.go @@ -1,4 +1,4 @@ -package role +package systemService import ( "strconv" @@ -12,14 +12,6 @@ import ( "gorm.io/gorm" ) -type ISystemAuthPermService interface { - SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) - CacheRoleMenusByRoleId(roleId uint) (e error) - BatchSaveByMenuIds(roleId uint, menuIds string, db *gorm.DB) (e error) - BatchDeleteByRoleId(roleId uint, db *gorm.DB) (e error) - BatchDeleteByMenuId(menuId uint) (e error) -} - var PermService = NewSystemAuthPermService() // NewSystemAuthPermService 初始化 diff --git a/server/admin/system/post/service.go b/server/service/systemService/postService.go similarity index 98% rename from server/admin/system/post/service.go rename to server/service/systemService/postService.go index 5d24f72..c417419 100644 --- a/server/admin/system/post/service.go +++ b/server/service/systemService/postService.go @@ -1,10 +1,11 @@ -package post +package systemService import ( "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" "x_admin/util/convert_util" "gorm.io/gorm" @@ -19,7 +20,7 @@ import ( // Del(id uint) (e error) // } -var Service = NewSystemAuthPostService() +var PostService = NewSystemAuthPostService() // NewSystemAuthPostService 初始化 func NewSystemAuthPostService() *systemAuthPostService { diff --git a/server/admin/system/role/service.go b/server/service/systemService/roleService.go similarity index 93% rename from server/admin/system/role/service.go rename to server/service/systemService/roleService.go index 41ce877..a327bad 100644 --- a/server/admin/system/role/service.go +++ b/server/service/systemService/roleService.go @@ -1,4 +1,4 @@ -package role +package systemService import ( "strconv" @@ -8,6 +8,7 @@ import ( "x_admin/core/request" "x_admin/core/response" "x_admin/model/system_model" + . "x_admin/schema/systemSchema" "x_admin/util" "x_admin/util/convert_util" @@ -15,19 +16,10 @@ import ( "gorm.io/gorm" ) -type ISystemAuthRoleService interface { - All() (res []SystemAuthRoleSimpleResp, e error) - List(page request.PageReq) (res response.PageResp, e error) - Detail(id uint) (res SystemAuthRoleResp, e error) - Add(addReq SystemAuthRoleAddReq) (e error) - Edit(editReq SystemAuthRoleEditReq) (e error) - Del(id uint) (e error) -} - -var Service = NewSystemAuthRoleService() +var RoleService = NewSystemAuthRoleService() // NewSystemAuthRoleService 初始化 -func NewSystemAuthRoleService() ISystemAuthRoleService { +func NewSystemAuthRoleService() *systemAuthRoleService { db := core.GetDB() return &systemAuthRoleService{db: db} }