From 8aa22c4e807766bf3b110dcfeda582f027b844be Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 14 Jan 2022 09:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gin_server_admin/api/admin/enter.go | 6 +++++- gin_server_admin/api/{v1 => admin}/systemuser/adminrole.go | 0 gin_server_admin/api/{v1 => admin}/systemuser/enter.go | 0 gin_server_admin/api/{v1 => admin}/systemuser/systemmenu.go | 0 gin_server_admin/api/{v1 => admin}/systemuser/userhandle.go | 0 gin_server_admin/api/{v1 => admin}/systemuser/usertype.go | 0 gin_server_admin/api/v1/custom/customhandle.go | 2 +- gin_server_admin/api/v1/enter.go | 2 -- gin_server_admin/router/system/sys_admin.go | 2 +- 9 files changed, 7 insertions(+), 5 deletions(-) rename gin_server_admin/api/{v1 => admin}/systemuser/adminrole.go (100%) rename gin_server_admin/api/{v1 => admin}/systemuser/enter.go (100%) rename gin_server_admin/api/{v1 => admin}/systemuser/systemmenu.go (100%) rename gin_server_admin/api/{v1 => admin}/systemuser/userhandle.go (100%) rename gin_server_admin/api/{v1 => admin}/systemuser/usertype.go (100%) diff --git a/gin_server_admin/api/admin/enter.go b/gin_server_admin/api/admin/enter.go index 783fbf6..20228b2 100644 --- a/gin_server_admin/api/admin/enter.go +++ b/gin_server_admin/api/admin/enter.go @@ -1,9 +1,13 @@ package admin -import "github.com/flipped-aurora/gin-vue-admin/server/api/admin/dutyassess" +import ( + "github.com/flipped-aurora/gin-vue-admin/server/api/admin/dutyassess" + "github.com/flipped-aurora/gin-vue-admin/server/api/admin/systemuser" +) type ApiGroup struct { DutyAssess dutyassess.ApiGroup + SystemApi systemuser.ApiGroup } var ApiGroupApp = new(ApiGroup) diff --git a/gin_server_admin/api/v1/systemuser/adminrole.go b/gin_server_admin/api/admin/systemuser/adminrole.go similarity index 100% rename from gin_server_admin/api/v1/systemuser/adminrole.go rename to gin_server_admin/api/admin/systemuser/adminrole.go diff --git a/gin_server_admin/api/v1/systemuser/enter.go b/gin_server_admin/api/admin/systemuser/enter.go similarity index 100% rename from gin_server_admin/api/v1/systemuser/enter.go rename to gin_server_admin/api/admin/systemuser/enter.go diff --git a/gin_server_admin/api/v1/systemuser/systemmenu.go b/gin_server_admin/api/admin/systemuser/systemmenu.go similarity index 100% rename from gin_server_admin/api/v1/systemuser/systemmenu.go rename to gin_server_admin/api/admin/systemuser/systemmenu.go diff --git a/gin_server_admin/api/v1/systemuser/userhandle.go b/gin_server_admin/api/admin/systemuser/userhandle.go similarity index 100% rename from gin_server_admin/api/v1/systemuser/userhandle.go rename to gin_server_admin/api/admin/systemuser/userhandle.go diff --git a/gin_server_admin/api/v1/systemuser/usertype.go b/gin_server_admin/api/admin/systemuser/usertype.go similarity index 100% rename from gin_server_admin/api/v1/systemuser/usertype.go rename to gin_server_admin/api/admin/systemuser/usertype.go diff --git a/gin_server_admin/api/v1/custom/customhandle.go b/gin_server_admin/api/v1/custom/customhandle.go index e9c1f65..46629fb 100644 --- a/gin_server_admin/api/v1/custom/customhandle.go +++ b/gin_server_admin/api/v1/custom/customhandle.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strconv" + "github.com/flipped-aurora/gin-vue-admin/server/api/admin/systemuser" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/staff" - "github.com/flipped-aurora/gin-vue-admin/server/api/v1/systemuser" "github.com/flipped-aurora/gin-vue-admin/server/commonus" "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" diff --git a/gin_server_admin/api/v1/enter.go b/gin_server_admin/api/v1/enter.go index 0e8d4b0..fb28145 100644 --- a/gin_server_admin/api/v1/enter.go +++ b/gin_server_admin/api/v1/enter.go @@ -12,7 +12,6 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/api/v1/shiyan" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/staff" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/system" - "github.com/flipped-aurora/gin-vue-admin/server/api/v1/systemuser" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/wechatcallback" ) @@ -29,7 +28,6 @@ type ApiGroup struct { DutyHandleApi assessment.ApiGroup StaffApi staff.ApiGroup CustomApi custom.ApiGroup - SystemApi systemuser.ApiGroup } var ApiGroupApp = new(ApiGroup) diff --git a/gin_server_admin/router/system/sys_admin.go b/gin_server_admin/router/system/sys_admin.go index 693b4ba..38f401f 100644 --- a/gin_server_admin/router/system/sys_admin.go +++ b/gin_server_admin/router/system/sys_admin.go @@ -1,7 +1,7 @@ package system import ( - v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1" + v1 "github.com/flipped-aurora/gin-vue-admin/server/api/admin" "github.com/gin-gonic/gin" )