From 04ad7c6ed9721f67d5d0a95847090653dad5514d Mon Sep 17 00:00:00 2001 From: xh <11675084@qq.com> Date: Wed, 17 Sep 2025 14:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=88=E8=B0=83=E6=95=B4=E4=BA=86=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/server/结构说明.md | 11 ++++---- .../admin_ctl/commonController/album.go | 4 +-- .../admin_ctl/commonController/captcha.go | 4 +-- .../admin_ctl/commonController/geTui.go | 2 +- .../admin_ctl/commonController/index.go | 2 +- .../admin_ctl/commonController/upload.go | 4 +-- .../admin_ctl/commonController/uploadChunk.go | 2 +- .../flowController/flow_apply_ctl.go | 4 +-- .../flowController/flow_history_ctl.go | 4 +-- .../flowController/flow_template_ctl.go | 4 +-- .../generatorController/generator.go | 4 +-- .../admin_ctl/monitorController/monitor.go | 0 .../monitorController/monitor_client_ctl.go | 26 +++++++++---------- .../monitorController/monitor_error_ctl.go | 4 +-- .../monitorController/monitor_project_ctl.go | 4 +-- .../admin_ctl/settingController/copyright.go | 6 ++--- .../admin_ctl/settingController/dict_data.go | 15 ++++++----- .../admin_ctl/settingController/dict_type.go | 14 +++++----- .../admin_ctl/settingController/website.go | 6 ++--- .../admin_ctl/systemController/admin.go | 4 +-- .../admin_ctl/systemController/dept.go | 4 +-- .../admin_ctl/systemController/log.go | 4 +-- .../admin_ctl/systemController/login.go | 8 +++--- .../admin_ctl/systemController/menu.go | 4 +-- .../admin_ctl/systemController/post.go | 4 +-- .../admin_ctl/systemController/role.go | 4 +-- .../controller/admin_ctl/user_protocol_ctl.go | 4 +-- .../schema/commonSchema/albumSchema.go | 0 .../schema/commonSchema/captchaSchema.go | 0 .../schema/flowSchema/flow_apply_schema.go | 0 .../schema/flowSchema/flow_history_schema.go | 0 .../schema/flowSchema/flow_template_schema.go | 0 .../schema/generatorSchema/schema.go | 0 .../monitorSchema/monitor_client_schema.go | 0 .../monitor_error_list_schema.go | 0 .../monitorSchema/monitor_error_schema.go | 0 .../monitorSchema/monitor_project_schema.go | 0 .../schema/settingSchema/copyrightSchema.go | 0 .../schema/settingSchema/dictTypeSchema.go | 0 .../schema/settingSchema/dict_dataSchema.go | 0 .../schema/settingSchema/storageSchema.go | 0 .../schema/settingSchema/websiteSchema.go | 0 .../schema/systemSchema/adminSchema.go | 0 .../schema/systemSchema/deptSchema.go | 0 .../schema/systemSchema/logSchema.go | 0 .../schema/systemSchema/loginSchema.go | 0 .../schema/systemSchema/menuSchema.go | 0 .../schema/systemSchema/postSchema.go | 0 .../schema/systemSchema/roleSchema.go | 0 .../{ => app}/schema/user_protocol_schema.go | 0 .../service/commonService/albumService.go | 2 +- .../service/commonService/captchaService.go | 2 +- .../service/commonService/geTuiService.go | 0 .../service/commonService/indexService.go | 2 +- .../commonService/uploadChunkService.go | 0 .../service/commonService/uploadService.go | 2 +- .../service/flowService/flow_apply_service.go | 2 +- .../flowService/flow_history_service.go | 6 ++--- .../flowService/flow_template_service.go | 2 +- .../service/generatorService/service.go | 4 +-- .../generatorService/tpl_utils/constants.go | 0 .../templates/gocode/controller.go.tpl | 0 .../tpl_utils/templates/gocode/model.go.tpl | 0 .../tpl_utils/templates/gocode/route.go.tpl | 2 +- .../tpl_utils/templates/gocode/schema.go.tpl | 0 .../tpl_utils/templates/gocode/service.go.tpl | 2 +- .../tpl_utils/templates/uniapp/api.ts.tpl | 0 .../templates/uniapp/details.vue.tpl | 0 .../tpl_utils/templates/uniapp/edit.vue.tpl | 0 .../tpl_utils/templates/uniapp/index.vue.tpl | 0 .../tpl_utils/templates/uniapp/pages.json.tpl | 0 .../tpl_utils/templates/uniapp/search.vue.tpl | 0 .../tpl_utils/templates/vue/api.ts.tpl | 0 .../tpl_utils/templates/vue/details.vue.tpl | 0 .../tpl_utils/templates/vue/edit.vue.tpl | 0 .../templates/vue/index-tree.vue.tpl | 0 .../tpl_utils/templates/vue/index.vue.tpl | 0 .../service/generatorService/tpl_utils/tpl.go | 0 .../generatorService/tpl_utils/utils.go | 0 .../monitorService/monitor_client_service.go | 2 +- .../monitor_error_list_service.go | 2 +- .../monitorService/monitor_error_service.go | 2 +- .../monitorService/monitor_project_service.go | 2 +- .../settingService/copyrightService.go | 2 +- .../service/settingService/dictDataService.go | 2 +- .../service/settingService/dictTypeService.go | 2 +- .../settingService/systemConfigService.go | 0 .../service/settingService/websiteService.go | 2 +- .../service/systemService/adminService.go | 2 +- .../service/systemService/deptService.go | 2 +- .../service/systemService/logService.go | 2 +- .../service/systemService/loginService.go | 4 +-- .../service/systemService/menuService.go | 2 +- .../service/systemService/permService.go | 0 .../service/systemService/postService.go | 2 +- .../service/systemService/roleService.go | 2 +- .../service/user_protocol_service.go | 2 +- server/middleware/auth.go | 2 +- server/routes/adminRoute/flow_route.go | 2 +- .../routes/adminRoute/monitor_client_route.go | 2 +- .../routes/adminRoute/monitor_error_route.go | 2 +- .../adminRoute/monitor_project_route.go | 2 +- server/routes/adminRoute/route.go | 10 +++---- .../routes/adminRoute/user_protocol_route.go | 2 +- server/routes/route.go | 2 +- server/{core => util}/uaparser.go | 2 +- 106 files changed, 121 insertions(+), 121 deletions(-) rename server/{ => app}/controller/admin_ctl/commonController/album.go (98%) rename server/{ => app}/controller/admin_ctl/commonController/captcha.go (95%) rename server/{ => app}/controller/admin_ctl/commonController/geTui.go (96%) rename server/{ => app}/controller/admin_ctl/commonController/index.go (94%) rename server/{ => app}/controller/admin_ctl/commonController/upload.go (94%) rename server/{ => app}/controller/admin_ctl/commonController/uploadChunk.go (99%) rename server/{ => app}/controller/admin_ctl/flowController/flow_apply_ctl.go (98%) rename server/{ => app}/controller/admin_ctl/flowController/flow_history_ctl.go (99%) rename server/{ => app}/controller/admin_ctl/flowController/flow_template_ctl.go (98%) rename server/{ => app}/controller/admin_ctl/generatorController/generator.go (98%) rename server/{ => app}/controller/admin_ctl/monitorController/monitor.go (100%) rename server/{ => app}/controller/admin_ctl/monitorController/monitor_client_ctl.go (95%) rename server/{ => app}/controller/admin_ctl/monitorController/monitor_error_ctl.go (99%) rename server/{ => app}/controller/admin_ctl/monitorController/monitor_project_ctl.go (99%) rename server/{ => app}/controller/admin_ctl/settingController/copyright.go (86%) rename server/{ => app}/controller/admin_ctl/settingController/dict_data.go (86%) rename server/{ => app}/controller/admin_ctl/settingController/dict_type.go (88%) rename server/{ => app}/controller/admin_ctl/settingController/website.go (90%) rename server/{ => app}/controller/admin_ctl/systemController/admin.go (98%) rename server/{ => app}/controller/admin_ctl/systemController/dept.go (96%) rename server/{ => app}/controller/admin_ctl/systemController/log.go (94%) rename server/{ => app}/controller/admin_ctl/systemController/login.go (88%) rename server/{ => app}/controller/admin_ctl/systemController/menu.go (96%) rename server/{ => app}/controller/admin_ctl/systemController/post.go (96%) rename server/{ => app}/controller/admin_ctl/systemController/role.go (96%) rename server/{ => app}/controller/admin_ctl/user_protocol_ctl.go (99%) rename server/{ => app}/schema/commonSchema/albumSchema.go (100%) rename server/{ => app}/schema/commonSchema/captchaSchema.go (100%) rename server/{ => app}/schema/flowSchema/flow_apply_schema.go (100%) rename server/{ => app}/schema/flowSchema/flow_history_schema.go (100%) rename server/{ => app}/schema/flowSchema/flow_template_schema.go (100%) rename server/{ => app}/schema/generatorSchema/schema.go (100%) rename server/{ => app}/schema/monitorSchema/monitor_client_schema.go (100%) rename server/{ => app}/schema/monitorSchema/monitor_error_list_schema.go (100%) rename server/{ => app}/schema/monitorSchema/monitor_error_schema.go (100%) rename server/{ => app}/schema/monitorSchema/monitor_project_schema.go (100%) rename server/{ => app}/schema/settingSchema/copyrightSchema.go (100%) rename server/{ => app}/schema/settingSchema/dictTypeSchema.go (100%) rename server/{ => app}/schema/settingSchema/dict_dataSchema.go (100%) rename server/{ => app}/schema/settingSchema/storageSchema.go (100%) rename server/{ => app}/schema/settingSchema/websiteSchema.go (100%) rename server/{ => app}/schema/systemSchema/adminSchema.go (100%) rename server/{ => app}/schema/systemSchema/deptSchema.go (100%) rename server/{ => app}/schema/systemSchema/logSchema.go (100%) rename server/{ => app}/schema/systemSchema/loginSchema.go (100%) rename server/{ => app}/schema/systemSchema/menuSchema.go (100%) rename server/{ => app}/schema/systemSchema/postSchema.go (100%) rename server/{ => app}/schema/systemSchema/roleSchema.go (100%) rename server/{ => app}/schema/user_protocol_schema.go (100%) rename server/{ => app}/service/commonService/albumService.go (99%) rename server/{ => app}/service/commonService/captchaService.go (98%) rename server/{ => app}/service/commonService/geTuiService.go (100%) rename server/{ => app}/service/commonService/indexService.go (98%) rename server/{ => app}/service/commonService/uploadChunkService.go (100%) rename server/{ => app}/service/commonService/uploadService.go (97%) rename server/{ => app}/service/flowService/flow_apply_service.go (99%) rename server/{ => app}/service/flowService/flow_history_service.go (99%) rename server/{ => app}/service/flowService/flow_template_service.go (99%) rename server/{ => app}/service/generatorService/service.go (99%) rename server/{ => app}/service/generatorService/tpl_utils/constants.go (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/gocode/model.go.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/gocode/route.go.tpl (99%) rename server/{ => app}/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/gocode/service.go.tpl (99%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/api.ts.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/details.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/edit.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/index.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/pages.json.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/uniapp/search.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/vue/api.ts.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/vue/details.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/vue/edit.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/vue/index-tree.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/templates/vue/index.vue.tpl (100%) rename server/{ => app}/service/generatorService/tpl_utils/tpl.go (100%) rename server/{ => app}/service/generatorService/tpl_utils/utils.go (100%) rename server/{ => app}/service/monitorService/monitor_client_service.go (99%) rename server/{ => app}/service/monitorService/monitor_error_list_service.go (96%) rename server/{ => app}/service/monitorService/monitor_error_service.go (99%) rename server/{ => app}/service/monitorService/monitor_project_service.go (99%) rename server/{ => app}/service/settingService/copyrightService.go (97%) rename server/{ => app}/service/settingService/dictDataService.go (99%) rename server/{ => app}/service/settingService/dictTypeService.go (99%) rename server/{ => app}/service/settingService/systemConfigService.go (100%) rename server/{ => app}/service/settingService/websiteService.go (98%) rename server/{ => app}/service/systemService/adminService.go (99%) rename server/{ => app}/service/systemService/deptService.go (99%) rename server/{ => app}/service/systemService/logService.go (98%) rename server/{ => app}/service/systemService/loginService.go (97%) rename server/{ => app}/service/systemService/menuService.go (99%) rename server/{ => app}/service/systemService/permService.go (100%) rename server/{ => app}/service/systemService/postService.go (99%) rename server/{ => app}/service/systemService/roleService.go (99%) rename server/{ => app}/service/user_protocol_service.go (99%) rename server/{core => util}/uaparser.go (87%) diff --git a/docs/server/结构说明.md b/docs/server/结构说明.md index 5d64cf9..2373439 100644 --- a/docs/server/结构说明.md +++ b/docs/server/结构说明.md @@ -12,13 +12,12 @@ static目录：映射为`api/static/*`，通过`go:embed`嵌入到了二进制 ``` ├── server -│ ├── admin // 后台 -│ │ ├──** //模块 -│ │ ├──────/*_ctl.go // 模块控制器 -│ │ ├──────/*_schema.go // 模块schema -│ │ ├──────/*_service.go // 模块服务 -│ │ ├──generator // 代码生成器 +│ ├── app // 应用程序的核心代码 +│ │ ├──────controller //控制器 +│ │ ├──────service // 服务 +│ │ ├──────schema // 结构体 │ ├── config // 配置 +│ ├── core // core │ ├── middleware // 中间件 │ ├── model // 数据库模型 │ ├── util // 工具包 diff --git a/server/controller/admin_ctl/commonController/album.go b/server/app/controller/admin_ctl/commonController/album.go similarity index 98% rename from server/controller/admin_ctl/commonController/album.go rename to server/app/controller/admin_ctl/commonController/album.go index 720c921..57a1df3 100644 --- a/server/controller/admin_ctl/commonController/album.go +++ b/server/app/controller/admin_ctl/commonController/album.go @@ -1,12 +1,12 @@ package commonController import ( + "x_admin/app/schema/commonSchema" + "x_admin/app/service/commonService" "x_admin/config" "x_admin/core/request" "x_admin/core/response" "x_admin/middleware" - "x_admin/schema/commonSchema" - "x_admin/service/commonService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/commonController/captcha.go b/server/app/controller/admin_ctl/commonController/captcha.go similarity index 95% rename from server/controller/admin_ctl/commonController/captcha.go rename to server/app/controller/admin_ctl/commonController/captcha.go index 7dedf33..6900550 100644 --- a/server/controller/admin_ctl/commonController/captcha.go +++ b/server/app/controller/admin_ctl/commonController/captcha.go @@ -2,8 +2,8 @@ package commonController import ( "errors" - "x_admin/schema/commonSchema" - "x_admin/service/commonService" + "x_admin/app/schema/commonSchema" + "x_admin/app/service/commonService" "github.com/gin-gonic/gin" ) diff --git a/server/controller/admin_ctl/commonController/geTui.go b/server/app/controller/admin_ctl/commonController/geTui.go similarity index 96% rename from server/controller/admin_ctl/commonController/geTui.go rename to server/app/controller/admin_ctl/commonController/geTui.go index d3cda0e..0778a16 100644 --- a/server/controller/admin_ctl/commonController/geTui.go +++ b/server/app/controller/admin_ctl/commonController/geTui.go @@ -1,8 +1,8 @@ package commonController import ( + "x_admin/app/service/commonService" "x_admin/core/response" - "x_admin/service/commonService" "github.com/gin-gonic/gin" ) diff --git a/server/controller/admin_ctl/commonController/index.go b/server/app/controller/admin_ctl/commonController/index.go similarity index 94% rename from server/controller/admin_ctl/commonController/index.go rename to server/app/controller/admin_ctl/commonController/index.go index ffdc4cd..820a3b0 100644 --- a/server/controller/admin_ctl/commonController/index.go +++ b/server/app/controller/admin_ctl/commonController/index.go @@ -1,9 +1,9 @@ package commonController import ( + "x_admin/app/service/commonService" "x_admin/core/response" "x_admin/middleware" - "x_admin/service/commonService" "github.com/gin-gonic/gin" ) diff --git a/server/controller/admin_ctl/commonController/upload.go b/server/app/controller/admin_ctl/commonController/upload.go similarity index 94% rename from server/controller/admin_ctl/commonController/upload.go rename to server/app/controller/admin_ctl/commonController/upload.go index 437815e..16ea6d1 100644 --- a/server/controller/admin_ctl/commonController/upload.go +++ b/server/app/controller/admin_ctl/commonController/upload.go @@ -1,11 +1,11 @@ package commonController import ( + "x_admin/app/schema/commonSchema" + "x_admin/app/service/commonService" "x_admin/config" "x_admin/core/response" "x_admin/middleware" - "x_admin/schema/commonSchema" - "x_admin/service/commonService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/commonController/uploadChunk.go b/server/app/controller/admin_ctl/commonController/uploadChunk.go similarity index 99% rename from server/controller/admin_ctl/commonController/uploadChunk.go rename to server/app/controller/admin_ctl/commonController/uploadChunk.go index 1fbc3b6..dbe2fcb 100644 --- a/server/controller/admin_ctl/commonController/uploadChunk.go +++ b/server/app/controller/admin_ctl/commonController/uploadChunk.go @@ -6,8 +6,8 @@ import ( "path/filepath" "regexp" "strings" + "x_admin/app/service/commonService" "x_admin/core/response" - "x_admin/service/commonService" "github.com/gin-gonic/gin" ) diff --git a/server/controller/admin_ctl/flowController/flow_apply_ctl.go b/server/app/controller/admin_ctl/flowController/flow_apply_ctl.go similarity index 98% rename from server/controller/admin_ctl/flowController/flow_apply_ctl.go rename to server/app/controller/admin_ctl/flowController/flow_apply_ctl.go index d26eaa4..a9d3ecb 100644 --- a/server/controller/admin_ctl/flowController/flow_apply_ctl.go +++ b/server/app/controller/admin_ctl/flowController/flow_apply_ctl.go @@ -1,11 +1,11 @@ package flowController import ( + . "x_admin/app/schema/flowSchema" + "x_admin/app/service/flowService" "x_admin/config" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/flowSchema" - "x_admin/service/flowService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/flowController/flow_history_ctl.go b/server/app/controller/admin_ctl/flowController/flow_history_ctl.go similarity index 99% rename from server/controller/admin_ctl/flowController/flow_history_ctl.go rename to server/app/controller/admin_ctl/flowController/flow_history_ctl.go index 49b8c5f..5abb2dc 100644 --- a/server/controller/admin_ctl/flowController/flow_history_ctl.go +++ b/server/app/controller/admin_ctl/flowController/flow_history_ctl.go @@ -2,10 +2,10 @@ package flowController import ( "fmt" + . "x_admin/app/schema/flowSchema" + "x_admin/app/service/flowService" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/flowSchema" - "x_admin/service/flowService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/flowController/flow_template_ctl.go b/server/app/controller/admin_ctl/flowController/flow_template_ctl.go similarity index 98% rename from server/controller/admin_ctl/flowController/flow_template_ctl.go rename to server/app/controller/admin_ctl/flowController/flow_template_ctl.go index 66097ad..c019e5d 100644 --- a/server/controller/admin_ctl/flowController/flow_template_ctl.go +++ b/server/app/controller/admin_ctl/flowController/flow_template_ctl.go @@ -1,10 +1,10 @@ package flowController import ( + . "x_admin/app/schema/flowSchema" + "x_admin/app/service/flowService" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/flowSchema" - "x_admin/service/flowService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/generatorController/generator.go b/server/app/controller/admin_ctl/generatorController/generator.go similarity index 98% rename from server/controller/admin_ctl/generatorController/generator.go rename to server/app/controller/admin_ctl/generatorController/generator.go index 07d1982..4c3e414 100644 --- a/server/controller/admin_ctl/generatorController/generator.go +++ b/server/app/controller/admin_ctl/generatorController/generator.go @@ -1,10 +1,10 @@ package generatorController import ( + "x_admin/app/schema/generatorSchema" + "x_admin/app/service/generatorService" "x_admin/core/request" "x_admin/core/response" - "x_admin/schema/generatorSchema" - "x_admin/service/generatorService" "net/http" "strings" diff --git a/server/controller/admin_ctl/monitorController/monitor.go b/server/app/controller/admin_ctl/monitorController/monitor.go similarity index 100% rename from server/controller/admin_ctl/monitorController/monitor.go rename to server/app/controller/admin_ctl/monitorController/monitor.go diff --git a/server/controller/admin_ctl/monitorController/monitor_client_ctl.go b/server/app/controller/admin_ctl/monitorController/monitor_client_ctl.go similarity index 95% rename from server/controller/admin_ctl/monitorController/monitor_client_ctl.go rename to server/app/controller/admin_ctl/monitorController/monitor_client_ctl.go index 51f23e5..81a779c 100644 --- a/server/controller/admin_ctl/monitorController/monitor_client_ctl.go +++ b/server/app/controller/admin_ctl/monitorController/monitor_client_ctl.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" "time" - "x_admin/core" + "x_admin/app/schema/monitorSchema" + + "x_admin/app/service/monitorService" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/monitorSchema" - "x_admin/service/monitorService" "x_admin/util" "x_admin/util/excel2" "x_admin/util/img_util" @@ -51,7 +51,7 @@ type MonitorClientHandler struct { // @Router /api/admin/monitor_client/list [get] func (hd *MonitorClientHandler) List(c *gin.Context) { var page request.PageReq - var listReq MonitorClientListReq + var listReq monitorSchema.MonitorClientListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { return } @@ -83,7 +83,7 @@ func (hd *MonitorClientHandler) List(c *gin.Context) { // @Success 200 {object} response.Response{ data=[]MonitorClientResp} "成功" // @Router /api/admin/monitor_client/listAll [get] func (hd *MonitorClientHandler) ListAll(c *gin.Context) { - var listReq MonitorClientListReq + var listReq monitorSchema.MonitorClientListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } @@ -92,7 +92,7 @@ func (hd *MonitorClientHandler) ListAll(c *gin.Context) { } func (hd *MonitorClientHandler) ErrorUsers(c *gin.Context) { - var Req MonitorClientDetailReq + var Req monitorSchema.MonitorClientDetailReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &Req)) { return } @@ -108,7 +108,7 @@ func (hd *MonitorClientHandler) ErrorUsers(c *gin.Context) { // @Success 200 {object} response.Response{ data=MonitorClientResp} "成功" // @Router /api/admin/monitor_client/detail [get] func (hd *MonitorClientHandler) Detail(c *gin.Context) { - var detailReq MonitorClientDetailReq + var detailReq monitorSchema.MonitorClientDetailReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } @@ -145,7 +145,7 @@ func (hd *MonitorClientHandler) Add(c *gin.Context) { c.Data(200, "image/gif", img_util.EmptyGif()) return } - var addReq MonitorClientAddReq + var addReq monitorSchema.MonitorClientAddReq json.Unmarshal([]byte(data), &addReq) lastClient, err := monitorService.MonitorClientService.DetailByClientId(*addReq.ClientId) @@ -168,7 +168,7 @@ func (hd *MonitorClientHandler) Add(c *gin.Context) { } if uaStr != "" { - ua := core.UAParser.Parse(uaStr) + ua := util.UAParser.Parse(uaStr) addReq.Ua = &uaStr addReq.Os = &ua.Os.Family addReq.Browser = &ua.UserAgent.Family @@ -197,7 +197,7 @@ func (hd *MonitorClientHandler) Add(c *gin.Context) { // @Success 200 {object} response.Response "成功" // @Router /api/admin/monitor_client/del [post] func (hd *MonitorClientHandler) Del(c *gin.Context) { - var delReq MonitorClientDelReq + var delReq monitorSchema.MonitorClientDelReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } @@ -213,7 +213,7 @@ func (hd *MonitorClientHandler) Del(c *gin.Context) { // @Success 200 {object} response.Response "成功" // @Router /api/admin/monitor_client/delBatch [post] func (hd *MonitorClientHandler) DelBatch(c *gin.Context) { - var delReq MonitorClientDelBatchReq + var delReq monitorSchema.MonitorClientDelBatchReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } @@ -247,7 +247,7 @@ func (hd *MonitorClientHandler) DelBatch(c *gin.Context) { // @Param CreateTimeEnd query string false "创建时间" // @Router /api/admin/monitor_client/ExportFile [get] func (hd *MonitorClientHandler) ExportFile(c *gin.Context) { - var listReq MonitorClientListReq + var listReq monitorSchema.MonitorClientListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) { return } @@ -275,7 +275,7 @@ func (hd *MonitorClientHandler) ImportFile(c *gin.Context) { return } defer file.Close() - importList := []MonitorClientResp{} + importList := []monitorSchema.MonitorClientResp{} err = excel2.GetExcelData(file, &importList, monitorService.MonitorClientService.GetExcelCol()) if err != nil { c.String(http.StatusInternalServerError, err.Error()) diff --git a/server/controller/admin_ctl/monitorController/monitor_error_ctl.go b/server/app/controller/admin_ctl/monitorController/monitor_error_ctl.go similarity index 99% rename from server/controller/admin_ctl/monitorController/monitor_error_ctl.go rename to server/app/controller/admin_ctl/monitorController/monitor_error_ctl.go index 7d69c87..eea06e6 100644 --- a/server/controller/admin_ctl/monitorController/monitor_error_ctl.go +++ b/server/app/controller/admin_ctl/monitorController/monitor_error_ctl.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" "time" + . "x_admin/app/schema/monitorSchema" + "x_admin/app/service/monitorService" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/monitorSchema" - "x_admin/service/monitorService" "x_admin/util" "x_admin/util/excel2" "x_admin/util/img_util" diff --git a/server/controller/admin_ctl/monitorController/monitor_project_ctl.go b/server/app/controller/admin_ctl/monitorController/monitor_project_ctl.go similarity index 99% rename from server/controller/admin_ctl/monitorController/monitor_project_ctl.go rename to server/app/controller/admin_ctl/monitorController/monitor_project_ctl.go index 754d146..40bb11a 100644 --- a/server/controller/admin_ctl/monitorController/monitor_project_ctl.go +++ b/server/app/controller/admin_ctl/monitorController/monitor_project_ctl.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" "time" + . "x_admin/app/schema/monitorSchema" + "x_admin/app/service/monitorService" "x_admin/core/request" "x_admin/core/response" - . "x_admin/schema/monitorSchema" - "x_admin/service/monitorService" "x_admin/util" "x_admin/util/excel2" diff --git a/server/controller/admin_ctl/settingController/copyright.go b/server/app/controller/admin_ctl/settingController/copyright.go similarity index 86% rename from server/controller/admin_ctl/settingController/copyright.go rename to server/app/controller/admin_ctl/settingController/copyright.go index 33a159b..4a40b16 100644 --- a/server/controller/admin_ctl/settingController/copyright.go +++ b/server/app/controller/admin_ctl/settingController/copyright.go @@ -1,9 +1,9 @@ package settingController import ( + "x_admin/app/schema/settingSchema" + "x_admin/app/service/settingService" "x_admin/core/response" - . "x_admin/schema/settingSchema" - "x_admin/service/settingService" "x_admin/util" "github.com/gin-gonic/gin" @@ -30,7 +30,7 @@ func (ch copyrightHandler) Detail(c *gin.Context) { // save 保存备案信息 func (ch copyrightHandler) save(c *gin.Context) { - var cReqs []SettingCopyrightItemReq + var cReqs []settingSchema.SettingCopyrightItemReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSONArray(c, &cReqs)) { return } diff --git a/server/controller/admin_ctl/settingController/dict_data.go b/server/app/controller/admin_ctl/settingController/dict_data.go similarity index 86% rename from server/controller/admin_ctl/settingController/dict_data.go rename to server/app/controller/admin_ctl/settingController/dict_data.go index 2a25d8c..2a2ad14 100644 --- a/server/controller/admin_ctl/settingController/dict_data.go +++ b/server/app/controller/admin_ctl/settingController/dict_data.go @@ -1,10 +1,11 @@ package settingController import ( + "x_admin/app/schema/settingSchema" + + "x_admin/app/service/settingService" "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 +34,7 @@ type dictDataHandler struct{} // all 字典数据所有 func (ddh dictDataHandler) All(c *gin.Context) { - var allReq SettingDictDataListReq + var allReq settingSchema.SettingDictDataListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &allReq)) { return } @@ -43,7 +44,7 @@ func (ddh dictDataHandler) All(c *gin.Context) { // detail 字典数据详情 func (ddh dictDataHandler) Detail(c *gin.Context) { - var detailReq SettingDictDataDetailReq + var detailReq settingSchema.SettingDictDataDetailReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } @@ -53,7 +54,7 @@ func (ddh dictDataHandler) Detail(c *gin.Context) { // detail 字典数据新增 func (ddh dictDataHandler) Add(c *gin.Context) { - var addReq SettingDictDataAddReq + var addReq settingSchema.SettingDictDataAddReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) { return } @@ -62,7 +63,7 @@ func (ddh dictDataHandler) Add(c *gin.Context) { // edit 字典数据编辑 func (ddh dictDataHandler) Edit(c *gin.Context) { - var editReq SettingDictDataEditReq + var editReq settingSchema.SettingDictDataEditReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { return } @@ -71,7 +72,7 @@ func (ddh dictDataHandler) Edit(c *gin.Context) { // del 字典数据删除 func (ddh dictDataHandler) Del(c *gin.Context) { - var delReq SettingDictDataDelReq + var delReq settingSchema.SettingDictDataDelReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } diff --git a/server/controller/admin_ctl/settingController/dict_type.go b/server/app/controller/admin_ctl/settingController/dict_type.go similarity index 88% rename from server/controller/admin_ctl/settingController/dict_type.go rename to server/app/controller/admin_ctl/settingController/dict_type.go index 7989bcf..9b5388b 100644 --- a/server/controller/admin_ctl/settingController/dict_type.go +++ b/server/app/controller/admin_ctl/settingController/dict_type.go @@ -1,11 +1,11 @@ package settingController import ( + "x_admin/app/schema/settingSchema" + "x_admin/app/service/settingService" "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" @@ -42,7 +42,7 @@ func (dth dictTypeHandler) All(c *gin.Context) { // list 字典类型列表 func (dth dictTypeHandler) List(c *gin.Context) { var page request.PageReq - var listReq SettingDictTypeListReq + var listReq settingSchema.SettingDictTypeListReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) { return } @@ -55,7 +55,7 @@ func (dth dictTypeHandler) List(c *gin.Context) { // detail 字典类型详情 func (dth dictTypeHandler) Detail(c *gin.Context) { - var detailReq SettingDictTypeDetailReq + var detailReq settingSchema.SettingDictTypeDetailReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) { return } @@ -65,7 +65,7 @@ func (dth dictTypeHandler) Detail(c *gin.Context) { // detail 字典类型新增 func (dth dictTypeHandler) Add(c *gin.Context) { - var addReq SettingDictTypeAddReq + var addReq settingSchema.SettingDictTypeAddReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) { return } @@ -74,7 +74,7 @@ func (dth dictTypeHandler) Add(c *gin.Context) { // edit 字典类型编辑 func (dth dictTypeHandler) Edit(c *gin.Context) { - var editReq SettingDictTypeEditReq + var editReq settingSchema.SettingDictTypeEditReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) { return } @@ -83,7 +83,7 @@ func (dth dictTypeHandler) Edit(c *gin.Context) { // del 字典类型删除 func (dth dictTypeHandler) Del(c *gin.Context) { - var delReq SettingDictTypeDelReq + var delReq settingSchema.SettingDictTypeDelReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) { return } diff --git a/server/controller/admin_ctl/settingController/website.go b/server/app/controller/admin_ctl/settingController/website.go similarity index 90% rename from server/controller/admin_ctl/settingController/website.go rename to server/app/controller/admin_ctl/settingController/website.go index 99d22a5..4752814 100644 --- a/server/controller/admin_ctl/settingController/website.go +++ b/server/app/controller/admin_ctl/settingController/website.go @@ -1,10 +1,10 @@ package settingController import ( + "x_admin/app/schema/settingSchema" + "x_admin/app/service/settingService" "x_admin/core/response" "x_admin/middleware" - . "x_admin/schema/settingSchema" - "x_admin/service/settingService" "x_admin/util" "github.com/gin-gonic/gin" @@ -36,7 +36,7 @@ func (wh websiteHandler) Detail(c *gin.Context) { // save 保存网站信息 func (wh websiteHandler) save(c *gin.Context) { - var wsReq SettingWebsiteReq + var wsReq settingSchema.SettingWebsiteReq if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &wsReq)) { return } diff --git a/server/controller/admin_ctl/systemController/admin.go b/server/app/controller/admin_ctl/systemController/admin.go similarity index 98% rename from server/controller/admin_ctl/systemController/admin.go rename to server/app/controller/admin_ctl/systemController/admin.go index 6d4b470..01ae5bf 100644 --- a/server/controller/admin_ctl/systemController/admin.go +++ b/server/app/controller/admin_ctl/systemController/admin.go @@ -3,12 +3,12 @@ package systemController import ( "net/http" "strconv" + "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "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" diff --git a/server/controller/admin_ctl/systemController/dept.go b/server/app/controller/admin_ctl/systemController/dept.go similarity index 96% rename from server/controller/admin_ctl/systemController/dept.go rename to server/app/controller/admin_ctl/systemController/dept.go index 64aed91..3644d70 100644 --- a/server/controller/admin_ctl/systemController/dept.go +++ b/server/app/controller/admin_ctl/systemController/dept.go @@ -1,10 +1,10 @@ package systemController import ( + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "x_admin/core/response" "x_admin/middleware" - . "x_admin/schema/systemSchema" - "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/systemController/log.go b/server/app/controller/admin_ctl/systemController/log.go similarity index 94% rename from server/controller/admin_ctl/systemController/log.go rename to server/app/controller/admin_ctl/systemController/log.go index 8ddaa86..c580749 100644 --- a/server/controller/admin_ctl/systemController/log.go +++ b/server/app/controller/admin_ctl/systemController/log.go @@ -1,11 +1,11 @@ package systemController import ( + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "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" diff --git a/server/controller/admin_ctl/systemController/login.go b/server/app/controller/admin_ctl/systemController/login.go similarity index 88% rename from server/controller/admin_ctl/systemController/login.go rename to server/app/controller/admin_ctl/systemController/login.go index 8a13de6..42e0a63 100644 --- a/server/controller/admin_ctl/systemController/login.go +++ b/server/app/controller/admin_ctl/systemController/login.go @@ -1,12 +1,12 @@ package systemController import ( + "x_admin/app/schema/commonSchema" + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/commonService" + "x_admin/app/service/systemService" "x_admin/core/response" "x_admin/middleware" - "x_admin/schema/commonSchema" - . "x_admin/schema/systemSchema" - "x_admin/service/commonService" - "x_admin/service/systemService" "x_admin/util" "github.com/gin-gonic/gin" diff --git a/server/controller/admin_ctl/systemController/menu.go b/server/app/controller/admin_ctl/systemController/menu.go similarity index 96% rename from server/controller/admin_ctl/systemController/menu.go rename to server/app/controller/admin_ctl/systemController/menu.go index 1317566..b3901f8 100644 --- a/server/controller/admin_ctl/systemController/menu.go +++ b/server/app/controller/admin_ctl/systemController/menu.go @@ -2,11 +2,11 @@ package systemController import ( "strconv" + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "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" diff --git a/server/controller/admin_ctl/systemController/post.go b/server/app/controller/admin_ctl/systemController/post.go similarity index 96% rename from server/controller/admin_ctl/systemController/post.go rename to server/app/controller/admin_ctl/systemController/post.go index d126551..99fbb5b 100644 --- a/server/controller/admin_ctl/systemController/post.go +++ b/server/app/controller/admin_ctl/systemController/post.go @@ -1,11 +1,11 @@ package systemController import ( + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "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" diff --git a/server/controller/admin_ctl/systemController/role.go b/server/app/controller/admin_ctl/systemController/role.go similarity index 96% rename from server/controller/admin_ctl/systemController/role.go rename to server/app/controller/admin_ctl/systemController/role.go index f648c74..17c8ef8 100644 --- a/server/controller/admin_ctl/systemController/role.go +++ b/server/app/controller/admin_ctl/systemController/role.go @@ -1,11 +1,11 @@ package systemController import ( + . "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "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" diff --git a/server/controller/admin_ctl/user_protocol_ctl.go b/server/app/controller/admin_ctl/user_protocol_ctl.go similarity index 99% rename from server/controller/admin_ctl/user_protocol_ctl.go rename to server/app/controller/admin_ctl/user_protocol_ctl.go index ca1f134..03cdf32 100644 --- a/server/controller/admin_ctl/user_protocol_ctl.go +++ b/server/app/controller/admin_ctl/user_protocol_ctl.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" "time" + "x_admin/app/schema" + "x_admin/app/service" "x_admin/core/request" "x_admin/core/response" - "x_admin/schema" - "x_admin/service" "x_admin/util" "x_admin/util/excel2" diff --git a/server/schema/commonSchema/albumSchema.go b/server/app/schema/commonSchema/albumSchema.go similarity index 100% rename from server/schema/commonSchema/albumSchema.go rename to server/app/schema/commonSchema/albumSchema.go diff --git a/server/schema/commonSchema/captchaSchema.go b/server/app/schema/commonSchema/captchaSchema.go similarity index 100% rename from server/schema/commonSchema/captchaSchema.go rename to server/app/schema/commonSchema/captchaSchema.go diff --git a/server/schema/flowSchema/flow_apply_schema.go b/server/app/schema/flowSchema/flow_apply_schema.go similarity index 100% rename from server/schema/flowSchema/flow_apply_schema.go rename to server/app/schema/flowSchema/flow_apply_schema.go diff --git a/server/schema/flowSchema/flow_history_schema.go b/server/app/schema/flowSchema/flow_history_schema.go similarity index 100% rename from server/schema/flowSchema/flow_history_schema.go rename to server/app/schema/flowSchema/flow_history_schema.go diff --git a/server/schema/flowSchema/flow_template_schema.go b/server/app/schema/flowSchema/flow_template_schema.go similarity index 100% rename from server/schema/flowSchema/flow_template_schema.go rename to server/app/schema/flowSchema/flow_template_schema.go diff --git a/server/schema/generatorSchema/schema.go b/server/app/schema/generatorSchema/schema.go similarity index 100% rename from server/schema/generatorSchema/schema.go rename to server/app/schema/generatorSchema/schema.go diff --git a/server/schema/monitorSchema/monitor_client_schema.go b/server/app/schema/monitorSchema/monitor_client_schema.go similarity index 100% rename from server/schema/monitorSchema/monitor_client_schema.go rename to server/app/schema/monitorSchema/monitor_client_schema.go diff --git a/server/schema/monitorSchema/monitor_error_list_schema.go b/server/app/schema/monitorSchema/monitor_error_list_schema.go similarity index 100% rename from server/schema/monitorSchema/monitor_error_list_schema.go rename to server/app/schema/monitorSchema/monitor_error_list_schema.go diff --git a/server/schema/monitorSchema/monitor_error_schema.go b/server/app/schema/monitorSchema/monitor_error_schema.go similarity index 100% rename from server/schema/monitorSchema/monitor_error_schema.go rename to server/app/schema/monitorSchema/monitor_error_schema.go diff --git a/server/schema/monitorSchema/monitor_project_schema.go b/server/app/schema/monitorSchema/monitor_project_schema.go similarity index 100% rename from server/schema/monitorSchema/monitor_project_schema.go rename to server/app/schema/monitorSchema/monitor_project_schema.go diff --git a/server/schema/settingSchema/copyrightSchema.go b/server/app/schema/settingSchema/copyrightSchema.go similarity index 100% rename from server/schema/settingSchema/copyrightSchema.go rename to server/app/schema/settingSchema/copyrightSchema.go diff --git a/server/schema/settingSchema/dictTypeSchema.go b/server/app/schema/settingSchema/dictTypeSchema.go similarity index 100% rename from server/schema/settingSchema/dictTypeSchema.go rename to server/app/schema/settingSchema/dictTypeSchema.go diff --git a/server/schema/settingSchema/dict_dataSchema.go b/server/app/schema/settingSchema/dict_dataSchema.go similarity index 100% rename from server/schema/settingSchema/dict_dataSchema.go rename to server/app/schema/settingSchema/dict_dataSchema.go diff --git a/server/schema/settingSchema/storageSchema.go b/server/app/schema/settingSchema/storageSchema.go similarity index 100% rename from server/schema/settingSchema/storageSchema.go rename to server/app/schema/settingSchema/storageSchema.go diff --git a/server/schema/settingSchema/websiteSchema.go b/server/app/schema/settingSchema/websiteSchema.go similarity index 100% rename from server/schema/settingSchema/websiteSchema.go rename to server/app/schema/settingSchema/websiteSchema.go diff --git a/server/schema/systemSchema/adminSchema.go b/server/app/schema/systemSchema/adminSchema.go similarity index 100% rename from server/schema/systemSchema/adminSchema.go rename to server/app/schema/systemSchema/adminSchema.go diff --git a/server/schema/systemSchema/deptSchema.go b/server/app/schema/systemSchema/deptSchema.go similarity index 100% rename from server/schema/systemSchema/deptSchema.go rename to server/app/schema/systemSchema/deptSchema.go diff --git a/server/schema/systemSchema/logSchema.go b/server/app/schema/systemSchema/logSchema.go similarity index 100% rename from server/schema/systemSchema/logSchema.go rename to server/app/schema/systemSchema/logSchema.go diff --git a/server/schema/systemSchema/loginSchema.go b/server/app/schema/systemSchema/loginSchema.go similarity index 100% rename from server/schema/systemSchema/loginSchema.go rename to server/app/schema/systemSchema/loginSchema.go diff --git a/server/schema/systemSchema/menuSchema.go b/server/app/schema/systemSchema/menuSchema.go similarity index 100% rename from server/schema/systemSchema/menuSchema.go rename to server/app/schema/systemSchema/menuSchema.go diff --git a/server/schema/systemSchema/postSchema.go b/server/app/schema/systemSchema/postSchema.go similarity index 100% rename from server/schema/systemSchema/postSchema.go rename to server/app/schema/systemSchema/postSchema.go diff --git a/server/schema/systemSchema/roleSchema.go b/server/app/schema/systemSchema/roleSchema.go similarity index 100% rename from server/schema/systemSchema/roleSchema.go rename to server/app/schema/systemSchema/roleSchema.go diff --git a/server/schema/user_protocol_schema.go b/server/app/schema/user_protocol_schema.go similarity index 100% rename from server/schema/user_protocol_schema.go rename to server/app/schema/user_protocol_schema.go diff --git a/server/service/commonService/albumService.go b/server/app/service/commonService/albumService.go similarity index 99% rename from server/service/commonService/albumService.go rename to server/app/service/commonService/albumService.go index f06ee09..58880ba 100644 --- a/server/service/commonService/albumService.go +++ b/server/app/service/commonService/albumService.go @@ -2,12 +2,12 @@ package commonService import ( "path" + "x_admin/app/schema/commonSchema" "x_admin/config" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model/common_model" - "x_admin/schema/commonSchema" "x_admin/util" "x_admin/util/convert_util" diff --git a/server/service/commonService/captchaService.go b/server/app/service/commonService/captchaService.go similarity index 98% rename from server/service/commonService/captchaService.go rename to server/app/service/commonService/captchaService.go index a4c7b1b..1b33905 100644 --- a/server/service/commonService/captchaService.go +++ b/server/app/service/commonService/captchaService.go @@ -2,8 +2,8 @@ package commonService import ( "image/color" + "x_admin/app/schema/commonSchema" "x_admin/core" - "x_admin/schema/commonSchema" "x_admin/util/aj-captcha-go/config" "x_admin/util/aj-captcha-go/constant" "x_admin/util/aj-captcha-go/service" diff --git a/server/service/commonService/geTuiService.go b/server/app/service/commonService/geTuiService.go similarity index 100% rename from server/service/commonService/geTuiService.go rename to server/app/service/commonService/geTuiService.go diff --git a/server/service/commonService/indexService.go b/server/app/service/commonService/indexService.go similarity index 98% rename from server/service/commonService/indexService.go rename to server/app/service/commonService/indexService.go index 219bf36..47ce265 100644 --- a/server/service/commonService/indexService.go +++ b/server/app/service/commonService/indexService.go @@ -2,10 +2,10 @@ package commonService import ( "time" + "x_admin/app/service/settingService" "x_admin/config" "x_admin/core" "x_admin/core/response" - "x_admin/service/settingService" "x_admin/util" "gorm.io/gorm" diff --git a/server/service/commonService/uploadChunkService.go b/server/app/service/commonService/uploadChunkService.go similarity index 100% rename from server/service/commonService/uploadChunkService.go rename to server/app/service/commonService/uploadChunkService.go diff --git a/server/service/commonService/uploadService.go b/server/app/service/commonService/uploadService.go similarity index 97% rename from server/service/commonService/uploadService.go rename to server/app/service/commonService/uploadService.go index 7f3115d..8a0c8f3 100644 --- a/server/service/commonService/uploadService.go +++ b/server/app/service/commonService/uploadService.go @@ -5,8 +5,8 @@ import ( "mime/multipart" "time" + "x_admin/app/schema/commonSchema" "x_admin/plugin" - "x_admin/schema/commonSchema" "x_admin/util" "x_admin/util/convert_util" ) diff --git a/server/service/flowService/flow_apply_service.go b/server/app/service/flowService/flow_apply_service.go similarity index 99% rename from server/service/flowService/flow_apply_service.go rename to server/app/service/flowService/flow_apply_service.go index c385c2b..1b38dee 100644 --- a/server/service/flowService/flow_apply_service.go +++ b/server/app/service/flowService/flow_apply_service.go @@ -3,11 +3,11 @@ package flowService import ( "errors" + "x_admin/app/schema/flowSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema/flowSchema" "x_admin/util" "x_admin/util/convert_util" diff --git a/server/service/flowService/flow_history_service.go b/server/app/service/flowService/flow_history_service.go similarity index 99% rename from server/service/flowService/flow_history_service.go rename to server/app/service/flowService/flow_history_service.go index 04c7e2b..e2261cc 100644 --- a/server/service/flowService/flow_history_service.go +++ b/server/app/service/flowService/flow_history_service.go @@ -6,14 +6,14 @@ import ( "fmt" "strconv" + "x_admin/app/schema/flowSchema" + "x_admin/app/schema/systemSchema" + "x_admin/app/service/systemService" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" "x_admin/model/system_model" - "x_admin/schema/flowSchema" - "x_admin/schema/systemSchema" - "x_admin/service/systemService" "x_admin/util" "x_admin/util/convert_util" diff --git a/server/service/flowService/flow_template_service.go b/server/app/service/flowService/flow_template_service.go similarity index 99% rename from server/service/flowService/flow_template_service.go rename to server/app/service/flowService/flow_template_service.go index 1099b83..1accf26 100644 --- a/server/service/flowService/flow_template_service.go +++ b/server/app/service/flowService/flow_template_service.go @@ -1,11 +1,11 @@ package flowService import ( + "x_admin/app/schema/flowSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema/flowSchema" "x_admin/util/convert_util" "gorm.io/gorm" diff --git a/server/service/generatorService/service.go b/server/app/service/generatorService/service.go similarity index 99% rename from server/service/generatorService/service.go rename to server/app/service/generatorService/service.go index ecdb03d..21c1e68 100644 --- a/server/service/generatorService/service.go +++ b/server/app/service/generatorService/service.go @@ -4,13 +4,13 @@ import ( "archive/zip" "bytes" + "x_admin/app/schema/generatorSchema" + "x_admin/app/service/generatorService/tpl_utils" "x_admin/config" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model/gen_model" - "x_admin/schema/generatorSchema" - "x_admin/service/generatorService/tpl_utils" "x_admin/util/convert_util" "strings" diff --git a/server/service/generatorService/tpl_utils/constants.go b/server/app/service/generatorService/tpl_utils/constants.go similarity index 100% rename from server/service/generatorService/tpl_utils/constants.go rename to server/app/service/generatorService/tpl_utils/constants.go diff --git a/server/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl b/server/app/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl rename to server/app/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl diff --git a/server/service/generatorService/tpl_utils/templates/gocode/model.go.tpl b/server/app/service/generatorService/tpl_utils/templates/gocode/model.go.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/gocode/model.go.tpl rename to server/app/service/generatorService/tpl_utils/templates/gocode/model.go.tpl diff --git a/server/service/generatorService/tpl_utils/templates/gocode/route.go.tpl b/server/app/service/generatorService/tpl_utils/templates/gocode/route.go.tpl similarity index 99% rename from server/service/generatorService/tpl_utils/templates/gocode/route.go.tpl rename to server/app/service/generatorService/tpl_utils/templates/gocode/route.go.tpl index 2116a76..dbacfab 100644 --- a/server/service/generatorService/tpl_utils/templates/gocode/route.go.tpl +++ b/server/app/service/generatorService/tpl_utils/templates/gocode/route.go.tpl @@ -3,7 +3,7 @@ package adminRoute import ( "github.com/gin-gonic/gin" "x_admin/middleware" - "x_admin/controller/admin_ctl" + "x_admin/app/controller/admin_ctl" ) /** diff --git a/server/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl b/server/app/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl rename to server/app/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl diff --git a/server/service/generatorService/tpl_utils/templates/gocode/service.go.tpl b/server/app/service/generatorService/tpl_utils/templates/gocode/service.go.tpl similarity index 99% rename from server/service/generatorService/tpl_utils/templates/gocode/service.go.tpl rename to server/app/service/generatorService/tpl_utils/templates/gocode/service.go.tpl index 777f080..15af818 100644 --- a/server/service/generatorService/tpl_utils/templates/gocode/service.go.tpl +++ b/server/app/service/generatorService/tpl_utils/templates/gocode/service.go.tpl @@ -5,7 +5,7 @@ import ( "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema" + "x_admin/app/schema" "gorm.io/gorm" "x_admin/util" "x_admin/util/convert_util" diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/api.ts.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/api.ts.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/api.ts.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/api.ts.tpl diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/details.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/details.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/details.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/details.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/edit.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/edit.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/edit.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/edit.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/index.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/index.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/index.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/index.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/pages.json.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/pages.json.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/pages.json.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/pages.json.tpl diff --git a/server/service/generatorService/tpl_utils/templates/uniapp/search.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/uniapp/search.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/uniapp/search.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/uniapp/search.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/vue/api.ts.tpl b/server/app/service/generatorService/tpl_utils/templates/vue/api.ts.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/vue/api.ts.tpl rename to server/app/service/generatorService/tpl_utils/templates/vue/api.ts.tpl diff --git a/server/service/generatorService/tpl_utils/templates/vue/details.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/vue/details.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/vue/details.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/vue/details.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/vue/edit.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/vue/edit.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/vue/edit.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/vue/edit.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/vue/index-tree.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/vue/index-tree.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/vue/index-tree.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/vue/index-tree.vue.tpl diff --git a/server/service/generatorService/tpl_utils/templates/vue/index.vue.tpl b/server/app/service/generatorService/tpl_utils/templates/vue/index.vue.tpl similarity index 100% rename from server/service/generatorService/tpl_utils/templates/vue/index.vue.tpl rename to server/app/service/generatorService/tpl_utils/templates/vue/index.vue.tpl diff --git a/server/service/generatorService/tpl_utils/tpl.go b/server/app/service/generatorService/tpl_utils/tpl.go similarity index 100% rename from server/service/generatorService/tpl_utils/tpl.go rename to server/app/service/generatorService/tpl_utils/tpl.go diff --git a/server/service/generatorService/tpl_utils/utils.go b/server/app/service/generatorService/tpl_utils/utils.go similarity index 100% rename from server/service/generatorService/tpl_utils/utils.go rename to server/app/service/generatorService/tpl_utils/utils.go diff --git a/server/service/monitorService/monitor_client_service.go b/server/app/service/monitorService/monitor_client_service.go similarity index 99% rename from server/service/monitorService/monitor_client_service.go rename to server/app/service/monitorService/monitor_client_service.go index f64d3a3..e32fc55 100644 --- a/server/service/monitorService/monitor_client_service.go +++ b/server/app/service/monitorService/monitor_client_service.go @@ -2,11 +2,11 @@ package monitorService import ( "errors" + "x_admin/app/schema/monitorSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema/monitorSchema" "x_admin/util" "x_admin/util/convert_util" "x_admin/util/excel2" diff --git a/server/service/monitorService/monitor_error_list_service.go b/server/app/service/monitorService/monitor_error_list_service.go similarity index 96% rename from server/service/monitorService/monitor_error_list_service.go rename to server/app/service/monitorService/monitor_error_list_service.go index d5bd310..1a94a04 100644 --- a/server/service/monitorService/monitor_error_list_service.go +++ b/server/app/service/monitorService/monitor_error_list_service.go @@ -1,10 +1,10 @@ package monitorService import ( + "x_admin/app/schema/monitorSchema" "x_admin/core" "x_admin/core/response" "x_admin/model" - "x_admin/schema/monitorSchema" "x_admin/util/convert_util" "gorm.io/gorm" diff --git a/server/service/monitorService/monitor_error_service.go b/server/app/service/monitorService/monitor_error_service.go similarity index 99% rename from server/service/monitorService/monitor_error_service.go rename to server/app/service/monitorService/monitor_error_service.go index 275cb07..cd4153d 100644 --- a/server/service/monitorService/monitor_error_service.go +++ b/server/app/service/monitorService/monitor_error_service.go @@ -4,11 +4,11 @@ import ( "errors" "strconv" + "x_admin/app/schema/monitorSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema/monitorSchema" "x_admin/util" "x_admin/util/convert_util" "x_admin/util/excel2" diff --git a/server/service/monitorService/monitor_project_service.go b/server/app/service/monitorService/monitor_project_service.go similarity index 99% rename from server/service/monitorService/monitor_project_service.go rename to server/app/service/monitorService/monitor_project_service.go index 88e0b48..1a94de8 100644 --- a/server/service/monitorService/monitor_project_service.go +++ b/server/app/service/monitorService/monitor_project_service.go @@ -1,11 +1,11 @@ package monitorService import ( + "x_admin/app/schema/monitorSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema/monitorSchema" "x_admin/util" "x_admin/util/convert_util" "x_admin/util/excel2" diff --git a/server/service/settingService/copyrightService.go b/server/app/service/settingService/copyrightService.go similarity index 97% rename from server/service/settingService/copyrightService.go rename to server/app/service/settingService/copyrightService.go index 68a2843..9367af5 100644 --- a/server/service/settingService/copyrightService.go +++ b/server/app/service/settingService/copyrightService.go @@ -1,9 +1,9 @@ package settingService import ( + "x_admin/app/schema/settingSchema" "x_admin/core" "x_admin/core/response" - "x_admin/schema/settingSchema" "x_admin/util" diff --git a/server/service/settingService/dictDataService.go b/server/app/service/settingService/dictDataService.go similarity index 99% rename from server/service/settingService/dictDataService.go rename to server/app/service/settingService/dictDataService.go index 78e203f..357d6f7 100644 --- a/server/service/settingService/dictDataService.go +++ b/server/app/service/settingService/dictDataService.go @@ -1,10 +1,10 @@ package settingService import ( + "x_admin/app/schema/settingSchema" "x_admin/core" "x_admin/core/response" "x_admin/model/setting_model" - "x_admin/schema/settingSchema" "x_admin/util" "x_admin/util/convert_util" diff --git a/server/service/settingService/dictTypeService.go b/server/app/service/settingService/dictTypeService.go similarity index 99% rename from server/service/settingService/dictTypeService.go rename to server/app/service/settingService/dictTypeService.go index d9478f5..8bb91e5 100644 --- a/server/service/settingService/dictTypeService.go +++ b/server/app/service/settingService/dictTypeService.go @@ -1,11 +1,11 @@ package settingService import ( + "x_admin/app/schema/settingSchema" "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" diff --git a/server/service/settingService/systemConfigService.go b/server/app/service/settingService/systemConfigService.go similarity index 100% rename from server/service/settingService/systemConfigService.go rename to server/app/service/settingService/systemConfigService.go diff --git a/server/service/settingService/websiteService.go b/server/app/service/settingService/websiteService.go similarity index 98% rename from server/service/settingService/websiteService.go rename to server/app/service/settingService/websiteService.go index 1e9e31c..3ad9530 100644 --- a/server/service/settingService/websiteService.go +++ b/server/app/service/settingService/websiteService.go @@ -1,9 +1,9 @@ package settingService import ( + "x_admin/app/schema/settingSchema" "x_admin/core" "x_admin/core/response" - "x_admin/schema/settingSchema" "x_admin/util" diff --git a/server/service/systemService/adminService.go b/server/app/service/systemService/adminService.go similarity index 99% rename from server/service/systemService/adminService.go rename to server/app/service/systemService/adminService.go index 1361874..653f2ce 100644 --- a/server/service/systemService/adminService.go +++ b/server/app/service/systemService/adminService.go @@ -7,12 +7,12 @@ import ( "strings" "time" + "x_admin/app/schema/systemSchema" "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" diff --git a/server/service/systemService/deptService.go b/server/app/service/systemService/deptService.go similarity index 99% rename from server/service/systemService/deptService.go rename to server/app/service/systemService/deptService.go index c18c4d6..957e0ff 100644 --- a/server/service/systemService/deptService.go +++ b/server/app/service/systemService/deptService.go @@ -1,10 +1,10 @@ package systemService import ( + "x_admin/app/schema/systemSchema" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" - "x_admin/schema/systemSchema" "x_admin/util/convert_util" diff --git a/server/service/systemService/logService.go b/server/app/service/systemService/logService.go similarity index 98% rename from server/service/systemService/logService.go rename to server/app/service/systemService/logService.go index 8b1a0b5..63b1bfb 100644 --- a/server/service/systemService/logService.go +++ b/server/app/service/systemService/logService.go @@ -2,11 +2,11 @@ package systemService import ( "fmt" + "x_admin/app/schema/systemSchema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model/system_model" - "x_admin/schema/systemSchema" "gorm.io/gorm" ) diff --git a/server/service/systemService/loginService.go b/server/app/service/systemService/loginService.go similarity index 97% rename from server/service/systemService/loginService.go rename to server/app/service/systemService/loginService.go index e5b5217..6d50c9c 100644 --- a/server/service/systemService/loginService.go +++ b/server/app/service/systemService/loginService.go @@ -5,11 +5,11 @@ import ( "runtime/debug" "strconv" + "x_admin/app/schema/systemSchema" "x_admin/config" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" - "x_admin/schema/systemSchema" "x_admin/util" @@ -117,7 +117,7 @@ func (loginSrv systemLoginService) Logout(req *systemSchema.SystemLogoutReq) (e // RecordLoginLog 记录登录日志 func (loginSrv systemLoginService) RecordLoginLog(c *gin.Context, adminId uint, username string, errStr string) (e error) { - ua := core.UAParser.Parse(c.GetHeader("user-agent")) + ua := util.UAParser.Parse(c.GetHeader("user-agent")) var status uint8 if errStr == "" { status = 1 diff --git a/server/service/systemService/menuService.go b/server/app/service/systemService/menuService.go similarity index 99% rename from server/service/systemService/menuService.go rename to server/app/service/systemService/menuService.go index d652e09..66f81e6 100644 --- a/server/service/systemService/menuService.go +++ b/server/app/service/systemService/menuService.go @@ -1,11 +1,11 @@ package systemService import ( + "x_admin/app/schema/systemSchema" "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" diff --git a/server/service/systemService/permService.go b/server/app/service/systemService/permService.go similarity index 100% rename from server/service/systemService/permService.go rename to server/app/service/systemService/permService.go diff --git a/server/service/systemService/postService.go b/server/app/service/systemService/postService.go similarity index 99% rename from server/service/systemService/postService.go rename to server/app/service/systemService/postService.go index c47645a..d0882f9 100644 --- a/server/service/systemService/postService.go +++ b/server/app/service/systemService/postService.go @@ -1,11 +1,11 @@ package systemService import ( + "x_admin/app/schema/systemSchema" "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" diff --git a/server/service/systemService/roleService.go b/server/app/service/systemService/roleService.go similarity index 99% rename from server/service/systemService/roleService.go rename to server/app/service/systemService/roleService.go index c28d4a0..7e14e4f 100644 --- a/server/service/systemService/roleService.go +++ b/server/app/service/systemService/roleService.go @@ -3,12 +3,12 @@ package systemService import ( "strconv" "strings" + "x_admin/app/schema/systemSchema" "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" diff --git a/server/service/user_protocol_service.go b/server/app/service/user_protocol_service.go similarity index 99% rename from server/service/user_protocol_service.go rename to server/app/service/user_protocol_service.go index dca7e1c..e4debdc 100644 --- a/server/service/user_protocol_service.go +++ b/server/app/service/user_protocol_service.go @@ -1,11 +1,11 @@ package service import ( + "x_admin/app/schema" "x_admin/core" "x_admin/core/request" "x_admin/core/response" "x_admin/model" - "x_admin/schema" "x_admin/util" "x_admin/util/convert_util" "x_admin/util/excel2" diff --git a/server/middleware/auth.go b/server/middleware/auth.go index d7ed9eb..3fac618 100644 --- a/server/middleware/auth.go +++ b/server/middleware/auth.go @@ -4,11 +4,11 @@ import ( "strconv" "strings" + "x_admin/app/service/systemService" "x_admin/config" "x_admin/core" "x_admin/core/response" "x_admin/model/system_model" - "x_admin/service/systemService" "x_admin/util" diff --git a/server/routes/adminRoute/flow_route.go b/server/routes/adminRoute/flow_route.go index 4c4beaf..69a63c2 100644 --- a/server/routes/adminRoute/flow_route.go +++ b/server/routes/adminRoute/flow_route.go @@ -1,7 +1,7 @@ package adminRoute import ( - "x_admin/controller/admin_ctl/flowController" + "x_admin/app/controller/admin_ctl/flowController" "x_admin/middleware" "github.com/gin-gonic/gin" diff --git a/server/routes/adminRoute/monitor_client_route.go b/server/routes/adminRoute/monitor_client_route.go index 52047f0..a0a96be 100644 --- a/server/routes/adminRoute/monitor_client_route.go +++ b/server/routes/adminRoute/monitor_client_route.go @@ -1,7 +1,7 @@ package adminRoute import ( - "x_admin/controller/admin_ctl/monitorController" + "x_admin/app/controller/admin_ctl/monitorController" "x_admin/middleware" "github.com/gin-gonic/gin" diff --git a/server/routes/adminRoute/monitor_error_route.go b/server/routes/adminRoute/monitor_error_route.go index a0b4d8b..3d75368 100644 --- a/server/routes/adminRoute/monitor_error_route.go +++ b/server/routes/adminRoute/monitor_error_route.go @@ -1,7 +1,7 @@ package adminRoute import ( - "x_admin/controller/admin_ctl/monitorController" + "x_admin/app/controller/admin_ctl/monitorController" "x_admin/middleware" "github.com/gin-gonic/gin" diff --git a/server/routes/adminRoute/monitor_project_route.go b/server/routes/adminRoute/monitor_project_route.go index 558f44c..69110e8 100644 --- a/server/routes/adminRoute/monitor_project_route.go +++ b/server/routes/adminRoute/monitor_project_route.go @@ -1,7 +1,7 @@ package adminRoute import ( - "x_admin/controller/admin_ctl/monitorController" + "x_admin/app/controller/admin_ctl/monitorController" "x_admin/middleware" "github.com/gin-gonic/gin" diff --git a/server/routes/adminRoute/route.go b/server/routes/adminRoute/route.go index 0cb2637..1bfbfa6 100644 --- a/server/routes/adminRoute/route.go +++ b/server/routes/adminRoute/route.go @@ -1,11 +1,11 @@ package adminRoute import ( - "x_admin/controller/admin_ctl/commonController" - "x_admin/controller/admin_ctl/generatorController" - "x_admin/controller/admin_ctl/monitorController" - "x_admin/controller/admin_ctl/settingController" - "x_admin/controller/admin_ctl/systemController" + "x_admin/app/controller/admin_ctl/commonController" + "x_admin/app/controller/admin_ctl/generatorController" + "x_admin/app/controller/admin_ctl/monitorController" + "x_admin/app/controller/admin_ctl/settingController" + "x_admin/app/controller/admin_ctl/systemController" "github.com/gin-gonic/gin" ) diff --git a/server/routes/adminRoute/user_protocol_route.go b/server/routes/adminRoute/user_protocol_route.go index 47f49b0..49c85a0 100644 --- a/server/routes/adminRoute/user_protocol_route.go +++ b/server/routes/adminRoute/user_protocol_route.go @@ -1,7 +1,7 @@ package adminRoute import ( - "x_admin/controller/admin_ctl" + "x_admin/app/controller/admin_ctl" "x_admin/middleware" "github.com/gin-gonic/gin" diff --git a/server/routes/route.go b/server/routes/route.go index 99d836a..fa0026c 100644 --- a/server/routes/route.go +++ b/server/routes/route.go @@ -1,7 +1,7 @@ package routes import ( - "x_admin/controller/admin_ctl/commonController" + "x_admin/app/controller/admin_ctl/commonController" "x_admin/core/response" "x_admin/middleware" "x_admin/routes/adminRoute" diff --git a/server/core/uaparser.go b/server/util/uaparser.go similarity index 87% rename from server/core/uaparser.go rename to server/util/uaparser.go index e80e5de..dd45267 100644 --- a/server/core/uaparser.go +++ b/server/util/uaparser.go @@ -1,4 +1,4 @@ -package core +package util import "github.com/ua-parser/uap-go/uaparser"