From a974ef2a012c98593d3e81165cd0fc850f9d9614 Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Tue, 24 Jun 2025 18:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90setting=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settingController}/copyright.go              |  8 +++++---
 .../settingController}/dict_data.go              | 14 ++++++++------
 .../settingController}/dict_type.go              | 16 +++++++++-------
 .../admin/settingController}/website.go          |  8 +++++---
 server/router/admin/entry.go                     | 15 ++++++---------
 server/router/{enter.go => route.go}             |  0
 .../settingSchema/copyrightSchema.go}            |  2 +-
 .../settingSchema/dictTypeSchema.go}             |  2 +-
 .../settingSchema/dict_dataSchema.go}            |  2 +-
 .../settingSchema/storageSchema.go}              |  2 +-
 .../settingSchema/websiteSchema.go}              |  2 +-
 .../settingService/copyrightService.go}          |  5 +++--
 .../settingService/dictDataService.go}           |  5 +++--
 .../settingService/dictTypeService.go}           |  5 +++--
 .../settingService/websiteService.go}            |  5 +++--
 15 files changed, 50 insertions(+), 41 deletions(-)
 rename server/controller/{setting => admin/settingController}/copyright.go (76%)
 rename server/controller/{setting => admin/settingController}/dict_data.go (81%)
 rename server/controller/{setting => admin/settingController}/dict_type.go (81%)
 rename server/{admin/setting/website => controller/admin/settingController}/website.go (81%)
 rename server/router/{enter.go => route.go} (100%)
 rename server/{admin/setting/copyright/schema.go => schema/settingSchema/copyrightSchema.go} (89%)
 rename server/{admin/setting/dict_type/schema.go => schema/settingSchema/dictTypeSchema.go} (99%)
 rename server/{admin/setting/dict_data/schema.go => schema/settingSchema/dict_dataSchema.go} (99%)
 rename server/{admin/setting/storage/schema.go => schema/settingSchema/storageSchema.go} (97%)
 rename server/{admin/setting/website/schema.go => schema/settingSchema/websiteSchema.go} (94%)
 rename server/{admin/setting/copyright/service.go => service/settingService/copyrightService.go} (91%)
 rename server/{admin/setting/dict_data/service.go => service/settingService/dictDataService.go} (97%)
 rename server/{admin/setting/dict_type/service.go => service/settingService/dictTypeService.go} (97%)
 rename server/{admin/setting/website/service.go => service/settingService/websiteService.go} (95%)

diff --git a/server/controller/setting/copyright.go b/server/controller/admin/settingController/copyright.go
similarity index 76%
rename from server/controller/setting/copyright.go
rename to server/controller/admin/settingController/copyright.go
index 9788f0b..33a159b 100644
--- a/server/controller/setting/copyright.go
+++ b/server/controller/admin/settingController/copyright.go
@@ -1,7 +1,9 @@
-package copyright
+package settingController
 
 import (
 	"x_admin/core/response"
+	. "x_admin/schema/settingSchema"
+	"x_admin/service/settingService"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -22,7 +24,7 @@ type copyrightHandler struct {
 
 // detail 获取备案信息
 func (ch copyrightHandler) Detail(c *gin.Context) {
-	res, err := Service.Detail()
+	res, err := settingService.CopyrightService.Detail()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -32,5 +34,5 @@ func (ch copyrightHandler) save(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSONArray(c, &cReqs)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Save(cReqs))
+	response.CheckAndResp(c, settingService.CopyrightService.Save(cReqs))
 }
diff --git a/server/controller/setting/dict_data.go b/server/controller/admin/settingController/dict_data.go
similarity index 81%
rename from server/controller/setting/dict_data.go
rename to server/controller/admin/settingController/dict_data.go
index 5e112ed..2a25d8c 100644
--- a/server/controller/setting/dict_data.go
+++ b/server/controller/admin/settingController/dict_data.go
@@ -1,8 +1,10 @@
-package dict_data
+package settingController
 
 import (
 	"x_admin/core/response"
 	"x_admin/middleware"
+	. "x_admin/schema/settingSchema"
+	"x_admin/service/settingService"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -35,7 +37,7 @@ func (ddh dictDataHandler) All(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &allReq)) {
 		return
 	}
-	res, err := Service.All(allReq)
+	res, err := settingService.DictDataService.All(allReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -45,7 +47,7 @@ func (ddh dictDataHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := Service.Detail(detailReq.ID)
+	res, err := settingService.DictDataService.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -55,7 +57,7 @@ func (ddh dictDataHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Add(addReq))
+	response.CheckAndResp(c, settingService.DictDataService.Add(addReq))
 }
 
 // edit 字典数据编辑
@@ -64,7 +66,7 @@ func (ddh dictDataHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Edit(editReq))
+	response.CheckAndResp(c, settingService.DictDataService.Edit(editReq))
 }
 
 // del 字典数据删除
@@ -73,5 +75,5 @@ func (ddh dictDataHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Del(delReq))
+	response.CheckAndResp(c, settingService.DictDataService.Del(delReq))
 }
diff --git a/server/controller/setting/dict_type.go b/server/controller/admin/settingController/dict_type.go
similarity index 81%
rename from server/controller/setting/dict_type.go
rename to server/controller/admin/settingController/dict_type.go
index 0579288..7989bcf 100644
--- a/server/controller/setting/dict_type.go
+++ b/server/controller/admin/settingController/dict_type.go
@@ -1,9 +1,11 @@
-package dict_type
+package settingController
 
 import (
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/middleware"
+	. "x_admin/schema/settingSchema"
+	"x_admin/service/settingService"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -33,7 +35,7 @@ type dictTypeHandler struct{}
 
 // all 字典类型所有
 func (dth dictTypeHandler) All(c *gin.Context) {
-	res, err := Service.All()
+	res, err := settingService.DictTypeService.All()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -47,7 +49,7 @@ func (dth dictTypeHandler) List(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := Service.List(page, listReq)
+	res, err := settingService.DictTypeService.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -57,7 +59,7 @@ func (dth dictTypeHandler) Detail(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
-	res, err := Service.Detail(detailReq.ID)
+	res, err := settingService.DictTypeService.Detail(detailReq.ID)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -67,7 +69,7 @@ func (dth dictTypeHandler) Add(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Add(addReq))
+	response.CheckAndResp(c, settingService.DictTypeService.Add(addReq))
 }
 
 // edit 字典类型编辑
@@ -76,7 +78,7 @@ func (dth dictTypeHandler) Edit(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Edit(editReq))
+	response.CheckAndResp(c, settingService.DictTypeService.Edit(editReq))
 }
 
 // del 字典类型删除
@@ -85,5 +87,5 @@ func (dth dictTypeHandler) Del(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Del(delReq))
+	response.CheckAndResp(c, settingService.DictTypeService.Del(delReq))
 }
diff --git a/server/admin/setting/website/website.go b/server/controller/admin/settingController/website.go
similarity index 81%
rename from server/admin/setting/website/website.go
rename to server/controller/admin/settingController/website.go
index 82cc2bf..99d22a5 100644
--- a/server/admin/setting/website/website.go
+++ b/server/controller/admin/settingController/website.go
@@ -1,8 +1,10 @@
-package website
+package settingController
 
 import (
 	"x_admin/core/response"
 	"x_admin/middleware"
+	. "x_admin/schema/settingSchema"
+	"x_admin/service/settingService"
 	"x_admin/util"
 
 	"github.com/gin-gonic/gin"
@@ -28,7 +30,7 @@ type websiteHandler struct{}
 
 // detail 获取网站信息
 func (wh websiteHandler) Detail(c *gin.Context) {
-	res, err := Service.Detail()
+	res, err := settingService.WebsiteService.Detail()
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -38,5 +40,5 @@ func (wh websiteHandler) save(c *gin.Context) {
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &wsReq)) {
 		return
 	}
-	response.CheckAndResp(c, Service.Save(wsReq))
+	response.CheckAndResp(c, settingService.WebsiteService.Save(wsReq))
 }
diff --git a/server/router/admin/entry.go b/server/router/admin/entry.go
index 0d1be74..60765ff 100644
--- a/server/router/admin/entry.go
+++ b/server/router/admin/entry.go
@@ -7,10 +7,8 @@ import (
 	"x_admin/admin/flow"
 	"x_admin/admin/generator"
 	"x_admin/admin/monitor"
-	"x_admin/admin/setting/copyright"
-	"x_admin/admin/setting/dict_data"
-	"x_admin/admin/setting/dict_type"
-	"x_admin/admin/setting/website"
+
+	"x_admin/controller/admin/settingController"
 	"x_admin/controller/admin/systemController"
 
 	"github.com/gin-gonic/gin"
@@ -27,11 +25,10 @@ func RegisterGroup(rg *gin.RouterGroup) {
 
 	monitor.MonitorRoute(rg)
 
-	copyright.CopyrightRoute(rg)
-	dict_data.DictDataRoute(rg)
-	dict_type.DictTypeRoute(rg)
-
-	website.WebsiteRoute(rg)
+	settingController.CopyrightRoute(rg)
+	settingController.DictDataRoute(rg)
+	settingController.DictTypeRoute(rg)
+	settingController.WebsiteRoute(rg)
 
 	systemController.LoginRoute(rg)
 	systemController.AdminRoute(rg)
diff --git a/server/router/enter.go b/server/router/route.go
similarity index 100%
rename from server/router/enter.go
rename to server/router/route.go
diff --git a/server/admin/setting/copyright/schema.go b/server/schema/settingSchema/copyrightSchema.go
similarity index 89%
rename from server/admin/setting/copyright/schema.go
rename to server/schema/settingSchema/copyrightSchema.go
index e32eb43..f6bceb4 100644
--- a/server/admin/setting/copyright/schema.go
+++ b/server/schema/settingSchema/copyrightSchema.go
@@ -1,4 +1,4 @@
-package copyright
+package settingSchema
 
 //SettingCopyrightItemReq 保存备案信息参数
 type SettingCopyrightItemReq struct {
diff --git a/server/admin/setting/dict_type/schema.go b/server/schema/settingSchema/dictTypeSchema.go
similarity index 99%
rename from server/admin/setting/dict_type/schema.go
rename to server/schema/settingSchema/dictTypeSchema.go
index a726386..b183697 100644
--- a/server/admin/setting/dict_type/schema.go
+++ b/server/schema/settingSchema/dictTypeSchema.go
@@ -1,4 +1,4 @@
-package dict_type
+package settingSchema
 
 import "x_admin/core"
 
diff --git a/server/admin/setting/dict_data/schema.go b/server/schema/settingSchema/dict_dataSchema.go
similarity index 99%
rename from server/admin/setting/dict_data/schema.go
rename to server/schema/settingSchema/dict_dataSchema.go
index 5ab2a56..850c211 100644
--- a/server/admin/setting/dict_data/schema.go
+++ b/server/schema/settingSchema/dict_dataSchema.go
@@ -1,4 +1,4 @@
-package dict_data
+package settingSchema
 
 import "x_admin/core"
 
diff --git a/server/admin/setting/storage/schema.go b/server/schema/settingSchema/storageSchema.go
similarity index 97%
rename from server/admin/setting/storage/schema.go
rename to server/schema/settingSchema/storageSchema.go
index 42f117f..cac44ba 100644
--- a/server/admin/setting/storage/schema.go
+++ b/server/schema/settingSchema/storageSchema.go
@@ -1,4 +1,4 @@
-package storage
+package settingSchema
 
 //SettingStorageEditReq 存储编辑参数
 type SettingStorage struct {
diff --git a/server/admin/setting/website/schema.go b/server/schema/settingSchema/websiteSchema.go
similarity index 94%
rename from server/admin/setting/website/schema.go
rename to server/schema/settingSchema/websiteSchema.go
index 2ef8842..78c129b 100644
--- a/server/admin/setting/website/schema.go
+++ b/server/schema/settingSchema/websiteSchema.go
@@ -1,4 +1,4 @@
-package website
+package settingSchema
 
 //SettingWebsiteReq 保存网站信息参数
 type SettingWebsiteReq struct {
diff --git a/server/admin/setting/copyright/service.go b/server/service/settingService/copyrightService.go
similarity index 91%
rename from server/admin/setting/copyright/service.go
rename to server/service/settingService/copyrightService.go
index 56a961d..5bc7400 100644
--- a/server/admin/setting/copyright/service.go
+++ b/server/service/settingService/copyrightService.go
@@ -1,8 +1,9 @@
-package copyright
+package settingService
 
 import (
 	"x_admin/core"
 	"x_admin/core/response"
+	. "x_admin/schema/settingSchema"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -13,7 +14,7 @@ type ISettingCopyrightService interface {
 	Save(cReqs []SettingCopyrightItemReq) (e error)
 }
 
-var Service = NewSettingCopyrightService()
+var CopyrightService = NewSettingCopyrightService()
 
 // NewSettingCopyrightService 初始化
 func NewSettingCopyrightService() *settingCopyrightService {
diff --git a/server/admin/setting/dict_data/service.go b/server/service/settingService/dictDataService.go
similarity index 97%
rename from server/admin/setting/dict_data/service.go
rename to server/service/settingService/dictDataService.go
index 5b649e0..6260895 100644
--- a/server/admin/setting/dict_data/service.go
+++ b/server/service/settingService/dictDataService.go
@@ -1,9 +1,10 @@
-package dict_data
+package settingService
 
 import (
 	"x_admin/core"
 	"x_admin/core/response"
 	"x_admin/model/setting_model"
+	. "x_admin/schema/settingSchema"
 	"x_admin/util"
 	"x_admin/util/convert_util"
 
@@ -19,7 +20,7 @@ type ISettingDictDataService interface {
 	Del(delReq SettingDictDataDelReq) (e error)
 }
 
-var Service = NewSettingDictDataService()
+var DictDataService = NewSettingDictDataService()
 
 // NewSettingDictDataService 初始化
 func NewSettingDictDataService() ISettingDictDataService {
diff --git a/server/admin/setting/dict_type/service.go b/server/service/settingService/dictTypeService.go
similarity index 97%
rename from server/admin/setting/dict_type/service.go
rename to server/service/settingService/dictTypeService.go
index e531575..04d52ee 100644
--- a/server/admin/setting/dict_type/service.go
+++ b/server/service/settingService/dictTypeService.go
@@ -1,10 +1,11 @@
-package dict_type
+package settingService
 
 import (
 	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model/setting_model"
+	. "x_admin/schema/settingSchema"
 	"x_admin/util"
 	"x_admin/util/convert_util"
 
@@ -20,7 +21,7 @@ type ISettingDictTypeService interface {
 	Del(delReq SettingDictTypeDelReq) (e error)
 }
 
-var Service = NewSettingDictTypeService()
+var DictTypeService = NewSettingDictTypeService()
 
 // NewSettingDictTypeService 初始化
 func NewSettingDictTypeService() ISettingDictTypeService {
diff --git a/server/admin/setting/website/service.go b/server/service/settingService/websiteService.go
similarity index 95%
rename from server/admin/setting/website/service.go
rename to server/service/settingService/websiteService.go
index 4581951..c9005be 100644
--- a/server/admin/setting/website/service.go
+++ b/server/service/settingService/websiteService.go
@@ -1,8 +1,9 @@
-package website
+package settingService
 
 import (
 	"x_admin/core"
 	"x_admin/core/response"
+	. "x_admin/schema/settingSchema"
 	"x_admin/util"
 
 	"gorm.io/gorm"
@@ -13,7 +14,7 @@ type ISettingWebsiteService interface {
 	Save(wsReq SettingWebsiteReq) (e error)
 }
 
-var Service = NewSettingWebsiteService()
+var WebsiteService = NewSettingWebsiteService()
 
 // NewSettingWebsiteService 初始化
 func NewSettingWebsiteService() ISettingWebsiteService {