又调整了结构

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 // 工具包

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"

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"
 )

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"
 )

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"
 )

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"

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"
 )

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"

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"

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"

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"

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())

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"

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"
 

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
 	}

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
 	}

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
 	}

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
 	}

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"
 )

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"
 

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"
 

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"

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"

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"
 )
 
 /**

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"

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"

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"

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"

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"

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"
 

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"

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"

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"
 

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"
 

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"
 

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"
 )

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

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"
 

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"

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"
 

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"

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"
 

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"

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"