完善生成模版，调整目录

server/controller/admin_ctl/user_protocol_ctl.go

@@ -1,4 +1,4 @@
-package admin
+package admin_ctl
 
 import (
 	"net/http"

server/router/adminRoute/flow_route.go

@@ -1,7 +1,7 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin/flowController"
+	"x_admin/controller/admin_ctl/flowController"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"

server/router/adminRoute/monitor_client_route.go

@@ -1,7 +1,7 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin/monitorController"
+	"x_admin/controller/admin_ctl/monitorController"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"

server/router/adminRoute/monitor_error_route.go

@@ -1,7 +1,7 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin/monitorController"
+	"x_admin/controller/admin_ctl/monitorController"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"

server/router/adminRoute/monitor_project_route.go

@@ -1,7 +1,7 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin/monitorController"
+	"x_admin/controller/admin_ctl/monitorController"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"

server/router/adminRoute/route.go

@@ -1,11 +1,11 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin/commonController"
-	"x_admin/controller/admin/generatorController"
-	"x_admin/controller/admin/monitorController"
-	"x_admin/controller/admin/settingController"
-	"x_admin/controller/admin/systemController"
+	"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"
 
 	"github.com/gin-gonic/gin"
 )

server/router/adminRoute/user_protocol_route.go

@@ -1,7 +1,7 @@
-package admin
+package adminRoute
 
 import (
-	"x_admin/controller/admin"
+	"x_admin/controller/admin_ctl"
 	"x_admin/middleware"
 
 	"github.com/gin-gonic/gin"
@@ -44,7 +44,7 @@ INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_sh
 
 // UserProtocolRoute(rg)
 func UserProtocolRoute(rg *gin.RouterGroup) {
-	handle := admin.UserProtocolHandler{}
+	handle := admin_ctl.UserProtocolHandler{}
 
 	r := rg.Group("/", middleware.TokenAuth())
 	r.GET("/user_protocol/list", handle.List)

server/router/route.go

@@ -1,10 +1,10 @@
 package router
 
 import (
-	"x_admin/controller/admin/commonController"
+	"x_admin/controller/admin_ctl/commonController"
 	"x_admin/core/response"
 	"x_admin/middleware"
-	"x_admin/router/admin"
+	"x_admin/router/adminRoute"
 
 	"github.com/gin-gonic/gin"
 )
@@ -22,7 +22,7 @@ func RegisterRoute(api *gin.RouterGroup, rootRouter *gin.Engine) {
 	})
 
 	// /api/admin
-	admin.RegisterRoute(api)
+	adminRoute.RegisterRoute(api)
 	// /api/common/captcha 验证码
 	commonController.CaptchaRoute(api)
 }

server/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl

@@ -1,4 +1,4 @@
-package {{{ .ModuleName }}}
+package admin
 
 import (
 	"net/http"
@@ -38,14 +38,14 @@ type {{{ toUpperCamelCase .ModuleName }}}Handler struct {
 //@Router	/api/admin/{{{ .ModuleName }}}/list [get]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) List(c *gin.Context) {
 	var page request.PageReq
-	var listReq {{{ toUpperCamelCase .EntityName }}}ListReq
+	var listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &page)) {
 		return
 	}
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := {{{ toUpperCamelCase .EntityName }}}Service.List(page, listReq)
+	res, err := service.{{{ toUpperCamelCase .EntityName }}}Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -65,11 +65,11 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) List(c *gin.Context) {
 //	@Success	200			{object}	response.Response{ data=[]{{{ toUpperCamelCase .EntityName }}}Resp}	"成功"
 //	@Router		/api/admin/{{{ .ModuleName }}}/listAll [get]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) ListAll(c *gin.Context) {
-	var listReq {{{ toUpperCamelCase .EntityName }}}ListReq
+	var listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := {{{ toUpperCamelCase .EntityName }}}Service.ListAll(listReq)
+	res, err := service.{{{ toUpperCamelCase .EntityName }}}Service.ListAll(listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
 
@@ -85,12 +85,12 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) ListAll(c *gin.Context)
 //	@Success	200			{object}	response.Response{ data={{{ toUpperCamelCase .EntityName }}}Resp}	"成功"
 //	@Router		/api/admin/{{{ .ModuleName }}}/detail [get]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Detail(c *gin.Context) {
-	var detailReq {{{ toUpperCamelCase .EntityName }}}DetailReq
+	var detailReq schema.{{{ toUpperCamelCase .EntityName }}}DetailReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
 		return
 	}
 	res, err, _ := hd.requestGroup.Do("{{{ toUpperCamelCase .EntityName }}}:Detail:"+strconv.Itoa(detailReq.{{{ toUpperCamelCase .PrimaryKey }}}), func() (any, error) {
-		v, err := {{{ toUpperCamelCase .EntityName }}}Service.Detail(detailReq.{{{ toUpperCamelCase .PrimaryKey }}})
+		v, err := service.{{{ toUpperCamelCase .EntityName }}}Service.Detail(detailReq.{{{ toUpperCamelCase .PrimaryKey }}})
 		return v, err
 	})
 
@@ -110,11 +110,11 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Detail(c *gin.Context) {
 //	@Success	200			{object}	response.Response	"成功"
 //	@Router		/api/admin/{{{ .ModuleName }}}/add [post]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Add(c *gin.Context) {
-	var addReq {{{ toUpperCamelCase .EntityName }}}AddReq
+	var addReq schema.{{{ toUpperCamelCase .EntityName }}}AddReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &addReq)) {
 		return
 	}
-	createId, e := {{{ toUpperCamelCase .EntityName }}}Service.Add(addReq)
+	createId, e := service.{{{ toUpperCamelCase .EntityName }}}Service.Add(addReq)
 	response.CheckAndRespWithData(c,createId, e)
 }
 //	@Summary	{{{ .FunctionName }}}编辑
@@ -129,11 +129,11 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Add(c *gin.Context) {
 //	@Success	200			{object}	response.Response	"成功"
 //	@Router		/api/admin/{{{ .ModuleName }}}/edit [post]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Edit(c *gin.Context) {
-	var editReq {{{ toUpperCamelCase .EntityName }}}EditReq
+	var editReq schema.{{{ toUpperCamelCase .EntityName }}}EditReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &editReq)) {
 		return
 	}
-	response.CheckAndRespWithData(c,editReq.{{{ toUpperCamelCase .PrimaryKey }}}, {{{ toUpperCamelCase .EntityName }}}Service.Edit(editReq))
+	response.CheckAndRespWithData(c,editReq.{{{ toUpperCamelCase .PrimaryKey }}}, service.{{{ toUpperCamelCase .EntityName }}}Service.Edit(editReq))
 }
 //	@Summary	{{{ .FunctionName }}}删除
 //	@Tags		{{{ .ModuleName }}}-{{{ .FunctionName }}}
@@ -147,11 +147,11 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Edit(c *gin.Context) {
 //	@Success	200			{object}	response.Response	"成功"
 //	@Router		/api/admin/{{{ .ModuleName }}}/del [post]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Del(c *gin.Context) {
-	var delReq {{{ toUpperCamelCase .EntityName }}}DelReq
+	var delReq schema.{{{ toUpperCamelCase .EntityName }}}DelReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
-	response.CheckAndResp(c, {{{ toUpperCamelCase .EntityName }}}Service.Del(delReq.{{{ toUpperCamelCase .PrimaryKey }}}))
+	response.CheckAndResp(c, service.{{{ toUpperCamelCase .EntityName }}}Service.Del(delReq.{{{ toUpperCamelCase .PrimaryKey }}}))
 }
 
 //	@Summary	{{{ .FunctionName }}}删除-批量
@@ -162,7 +162,7 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) Del(c *gin.Context) {
 // @Success	200			{object}	response.Response	"成功"
 // @Router		/api/admin/{{{ .ModuleName }}}/delBatch [post]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) DelBatch(c *gin.Context) {
-	var delReq {{{ toUpperCamelCase .EntityName }}}DelBatchReq
+	var delReq schema.{{{ toUpperCamelCase .EntityName }}}DelBatchReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyJSON(c, &delReq)) {
 		return
 	}
@@ -172,7 +172,7 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) DelBatch(c *gin.Context)
 	}
 	var Ids = strings.Split(delReq.Ids, ",")
 
-	response.CheckAndResp(c, {{{ toUpperCamelCase .EntityName }}}Service.DelBatch(Ids))
+	response.CheckAndResp(c, service.{{{ toUpperCamelCase .EntityName }}}Service.DelBatch(Ids))
 }
 
 
@@ -193,16 +193,16 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) DelBatch(c *gin.Context)
 {{{- end }}}
 //	@Router		/api/admin/{{{ .ModuleName }}}/ExportFile [get]
 func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) ExportFile(c *gin.Context) {
-	var listReq {{{ toUpperCamelCase .EntityName }}}ListReq
+	var listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq
 	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &listReq)) {
 		return
 	}
-	res, err := {{{ toUpperCamelCase .EntityName }}}Service.ExportFile(listReq)
+	res, err := service.{{{ toUpperCamelCase .EntityName }}}Service.ExportFile(listReq)
 	if err != nil {
 		response.FailWithMsg(c, response.SystemError, "查询信息失败")
 		return
 	}
-	f, err := excel2.Export(res,{{{ toUpperCamelCase .EntityName }}}Service.GetExcelCol(), "Sheet1", "{{{ .FunctionName }}}")
+	f, err := excel2.Export(res,service.{{{ toUpperCamelCase .EntityName }}}Service.GetExcelCol(), "Sheet1", "{{{ .FunctionName }}}")
 	if err != nil {
 		response.FailWithMsg(c, response.SystemError, "导出失败")
 		return
@@ -221,13 +221,13 @@ func (hd *{{{  toUpperCamelCase .ModuleName }}}Handler) ImportFile(c *gin.Contex
 		return
 	}
 	defer file.Close()
-	importList := []{{{ toUpperCamelCase .EntityName }}}Resp{}
-	err = excel2.GetExcelData(file, &importList,{{{ toUpperCamelCase .EntityName }}}Service.GetExcelCol())
+	importList := []schema.{{{ toUpperCamelCase .EntityName }}}Resp{}
+	err = excel2.GetExcelData(file, &importList,service.{{{ toUpperCamelCase .EntityName }}}Service.GetExcelCol())
 	if err != nil {
 		c.String(http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	err = {{{ toUpperCamelCase .EntityName }}}Service.ImportFile(importList)
+	err = service.{{{ toUpperCamelCase .EntityName }}}Service.ImportFile(importList)
 	response.CheckAndResp(c, err)
 }

server/service/generatorService/tpl_utils/templates/gocode/route.go.tpl

@@ -3,7 +3,7 @@ package admin
 import (
 	"github.com/gin-gonic/gin"
 	"x_admin/middleware" 
-	"x_admin/admin/{{{ .ModuleName }}}"
+	"x_admin/controller/admin_ctl"
 )
 
 /**
@@ -16,17 +16,7 @@ import (
 请在 router/admin/entry.go 文件引入 {{{ toUpperCamelCase .ModuleName }}}Route 注册路由
 
 3. 后台手动添加菜单和按钮
-admin:{{{ .ModuleName }}}:add
-admin:{{{.ModuleName }}}:edit
-admin:{{{.ModuleName }}}:del
-admin:{{{.ModuleName }}}:delBatch
-admin:{{{.ModuleName }}}:list
-admin:{{{.ModuleName }}}:listAll
-admin:{{{.ModuleName }}}:detail
-admin:{{{.ModuleName }}}:ExportFile
-admin:{{{.ModuleName }}}:ImportFile
 
-// 列表
 INSERT INTO x_system_auth_menu (pid, menu_type, menu_name,  paths, component, is_cache, is_show, is_disable, create_time, update_time) VALUES (0, 'C', '{{{ .FunctionName }}}', '{{{nameToPath .ModuleName }}}/index', '{{{nameToPath .ModuleName }}}/index', 0, 1, 0, now(), now());
 INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) SELECT id, 'A', '{{{ .FunctionName }}}列表','admin:{{{ .ModuleName }}}:list', 0, 1, 0, now(), now() FROM x_system_auth_menu WHERE component='{{{nameToPath .ModuleName }}}/index';
 INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_show, is_disable, create_time, update_time) SELECT id, 'A', '{{{ .FunctionName }}}全部列表','admin:{{{ .ModuleName }}}:listAll', 0, 1, 0, now(), now() FROM x_system_auth_menu WHERE component='{{{nameToPath .ModuleName }}}/index';
@@ -42,7 +32,7 @@ INSERT INTO x_system_auth_menu (pid, menu_type, menu_name, perms,is_cache, is_sh
 
 // {{{ toUpperCamelCase .ModuleName }}}Route(rg)
 func {{{ toUpperCamelCase .ModuleName }}}Route(rg *gin.RouterGroup) {
-	handle := {{{ .ModuleName}}}.{{{ toUpperCamelCase .EntityName }}}Handler{}
+	handle := admin_ctl.{{{ toUpperCamelCase .EntityName }}}Handler{}
 
 	r := rg.Group("/", middleware.TokenAuth())
 	r.GET("/{{{ .ModuleName }}}/list", handle.List)

server/service/generatorService/tpl_utils/templates/gocode/schema.go.tpl

@@ -1,7 +1,6 @@
-package {{{ .ModuleName }}}
+package schema
 import (
 	"x_admin/core"
-
 )
 
 //{{{ toUpperCamelCase .EntityName }}}ListReq {{{ .FunctionName }}}列表参数

server/service/generatorService/tpl_utils/templates/gocode/service.go.tpl

@@ -1,10 +1,11 @@
-package {{{ .ModuleName }}}
+package service
 
 import (
 	"x_admin/core"
 	"x_admin/core/request"
 	"x_admin/core/response"
 	"x_admin/model"
+	"x_admin/schema"
 	"gorm.io/gorm"
 	"x_admin/util"
 	"x_admin/util/convert_util"
@@ -32,7 +33,7 @@ type {{{ toCamelCase .EntityName }}}Service struct {
 
 
 // List {{{ .FunctionName }}}列表
-func (service {{{ toCamelCase .EntityName }}}Service) GetModel(listReq {{{ toUpperCamelCase .EntityName }}}ListReq) *gorm.DB {
+func (service {{{ toCamelCase .EntityName }}}Service) GetModel(listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq) *gorm.DB {
 	// 查询
 	dbModel := service.db.Model(&model.{{{ toUpperCamelCase .EntityName }}}{})
 	{{{- range .Columns }}}
@@ -64,7 +65,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) GetModel(listReq {{{ toUpp
 	return dbModel
 }
 // List {{{ .FunctionName }}}列表
-func (service {{{ toCamelCase .EntityName }}}Service) List(page request.PageReq, listReq {{{ toUpperCamelCase .EntityName }}}ListReq) (res response.PageResp, e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) List(page request.PageReq, listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq) (res response.PageResp, e error) {
 	// 分页信息
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
@@ -81,7 +82,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) List(page request.PageReq,
 	if e = response.CheckErr(err, "查询失败"); e != nil {
 		return
 	}
-	result := []{{{ toUpperCamelCase .EntityName }}}Resp{}
+	result := []schema.{{{ toUpperCamelCase .EntityName }}}Resp{}
 	convert_util.Copy(&result, modelList)
 	return response.PageResp{
 		PageNo:   page.PageNo,
@@ -91,7 +92,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) List(page request.PageReq,
 	}, nil
 }
 // ListAll {{{ .FunctionName }}}列表
-func (service {{{ toCamelCase .EntityName }}}Service) ListAll(listReq {{{ toUpperCamelCase .EntityName }}}ListReq) (res []{{{ toUpperCamelCase .EntityName }}}Resp, e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) ListAll(listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq) (res []schema.{{{ toUpperCamelCase .EntityName }}}Resp, e error) {
 	dbModel := service.GetModel(listReq)
 
 	var modelList []model.{{{ toUpperCamelCase .EntityName }}}
@@ -105,7 +106,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) ListAll(listReq {{{ toUppe
 }
 
 // Detail {{{ .FunctionName }}}详情
-func (service {{{ toCamelCase .EntityName }}}Service) Detail({{{ toUpperCamelCase .PrimaryKey }}} int) (res {{{ toUpperCamelCase .EntityName }}}Resp, e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) Detail({{{ toUpperCamelCase .PrimaryKey }}} int) (res schema.{{{ toUpperCamelCase .EntityName }}}Resp, e error) {
 	var obj = model.{{{ toUpperCamelCase .EntityName }}}{}
 	err := service.CacheUtil.GetCache({{{ toUpperCamelCase .PrimaryKey }}}, &obj)
 	if err != nil {
@@ -130,7 +131,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) Detail({{{ toUpperCamelCas
 }
 
 // Add {{{ .FunctionName }}}新增
-func (service {{{ toCamelCase .EntityName }}}Service) Add(addReq {{{ toUpperCamelCase .EntityName }}}AddReq) (createId int,e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) Add(addReq schema.{{{ toUpperCamelCase .EntityName }}}AddReq) (createId int,e error) {
 	var obj model.{{{ toUpperCamelCase .EntityName }}}
 	convert_util.StructToStruct(addReq,&obj)
 	err := service.db.Create(&obj).Error
@@ -144,7 +145,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) Add(addReq {{{ toUpperCame
 }
 
 // Edit {{{ .FunctionName }}}编辑
-func (service {{{ toCamelCase .EntityName }}}Service) Edit(editReq {{{ toUpperCamelCase .EntityName }}}EditReq) (e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) Edit(editReq schema.{{{ toUpperCamelCase .EntityName }}}EditReq) (e error) {
 	var obj model.{{{ toUpperCamelCase .EntityName }}}
 	err := service.db.Where("{{{ $.PrimaryKey }}} = ?{{{ if contains .AllFields "is_delete" }}} AND is_delete = ?{{{ end }}}", editReq.{{{ toUpperCamelCase .PrimaryKey }}}{{{ if contains .AllFields "is_delete" }}}, 0{{{ end }}}).Limit(1).First(&obj).Error
 	// 校验
@@ -224,7 +225,7 @@ func (service {{{ toCamelCase .EntityName }}}Service) GetExcelCol() []excel2.Col
 }
 
 // ExportFile {{{ .FunctionName }}}导出
-func (service {{{ toCamelCase .EntityName }}}Service) ExportFile(listReq {{{ toUpperCamelCase .EntityName }}}ListReq) (res []{{{ toUpperCamelCase .EntityName }}}Resp, e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) ExportFile(listReq schema.{{{ toUpperCamelCase .EntityName }}}ListReq) (res []schema.{{{ toUpperCamelCase .EntityName }}}Resp, e error) {
 	// 查询
 	dbModel := service.GetModel(listReq)
 
@@ -234,13 +235,13 @@ func (service {{{ toCamelCase .EntityName }}}Service) ExportFile(listReq {{{ toU
 	if e = response.CheckErr(err, "查询失败"); e != nil {
 		return
 	}
-	result := []{{{ toUpperCamelCase .EntityName }}}Resp{}
+	result := []schema.{{{ toUpperCamelCase .EntityName }}}Resp{}
 	convert_util.Copy(&result, modelList)
 	return result, nil
 }
 
 // 导入
-func (service {{{ toCamelCase .EntityName }}}Service) ImportFile(importReq []{{{ toUpperCamelCase .EntityName }}}Resp) (e error) {
+func (service {{{ toCamelCase .EntityName }}}Service) ImportFile(importReq []schema.{{{ toUpperCamelCase .EntityName }}}Resp) (e error) {
 	var importData []model.{{{ toUpperCamelCase .EntityName }}}
 	convert_util.Copy(&importData, importReq)
 	err := service.db.Create(&importData).Error