重构自动化代码，修复皮肤bug (flipped-aurora#1355)

* 增加读取ast方法和AddImport 方法来增加引用包功能 * 增加在指定方法中添加头部声明global.DB业务库的方法 * 增加了自动添加AutoMigrate方法。 * 将自动化产生自动迁移功能替换为新ast * 增加了自动注册router块的功能 * 废除旧的对router和gorm的处理方法，替换为新的自动化方法 * 修复开发模式下皮肤失效的问题
solvaysphere · Feb 25, 2023 · 87b3b5e · 87b3b5e
1 parent 9974d6a
commit 87b3b5e
Show file tree

Hide file tree

Showing 17 changed files with 637 additions and 229 deletions.
diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go
@@ -21,7 +21,7 @@ func Gorm() *gorm.DB {
 		return GormPgSql()
 	case "oracle":
 		return GormOracle()
-  case "mssql":
+	case "mssql":
 		return GormMssql()
 	default:
 		return GormMysql()
@@ -30,7 +30,8 @@ func Gorm() *gorm.DB {
 
 // RegisterTables 注册数据库表专用
 // Author SliverHorn
-func RegisterTables(db *gorm.DB) {
+func RegisterTables() {
+	db := global.GVA_DB
 	err := db.AutoMigrate(
 		// 系统模块表
 		system.SysApi{},
@@ -47,16 +48,10 @@ func RegisterTables(db *gorm.DB) {
 		system.SysAuthorityBtn{},
 		system.SysAutoCode{},
 
-		// 示例模块表
 		example.ExaFile{},
 		example.ExaCustomer{},
 		example.ExaFileChunk{},
 		example.ExaFileUploadAndDownload{},
-
-		// 自动化模块表
-		// Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
-
-		// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))

diff --git a/server/initialize/router.go b/server/initialize/router.go
@@ -16,6 +16,7 @@ import (
 
 func Routers() *gin.Engine {
 	Router := gin.Default()
+	InstallPlugin(Router) // 安装插件
 	systemRouter := router.RouterGroupApp.System
 	exampleRouter := router.RouterGroupApp.Example
 	// 如果想要不使用nginx代理前端网页，可以修改 web/.env.production 下的
@@ -69,13 +70,8 @@ func Routers() *gin.Engine {
 		exampleRouter.InitCustomerRouter(PrivateGroup)              // 客户路由
 		exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
 
-		// Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
-
-		// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
 	}
 
-	InstallPlugin(Router) // 安装插件
-
 	global.GVA_LOG.Info("router register success")
 	return Router
 }
diff --git a/server/main.go b/server/main.go
@@ -29,7 +29,7 @@ func main() {
 	initialize.Timer()
 	initialize.DBList()
 	if global.GVA_DB != nil {
-		initialize.RegisterTables(global.GVA_DB) // 初始化表
+		initialize.RegisterTables() // 初始化表
 		// 程序结束前关闭数据库链接
 		db, _ := global.GVA_DB.DB()
 		defer db.Close()

diff --git a/server/resource/autocode_template/subcontract/api_enter.go.tpl b/server/resource/autocode_template/subcontract/api_enter.go.tpl
@@ -1,7 +1,4 @@
 package {{ .PackageName }}
 
 type ApiGroup struct {
-	// Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
-
-	// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
 }
diff --git a/server/resource/autocode_template/subcontract/router_enter.go.tpl b/server/resource/autocode_template/subcontract/router_enter.go.tpl
@@ -1,7 +1,4 @@
 package {{ .PackageName }}
 
 type RouterGroup struct {
-    // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
-
-	// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
 }
diff --git a/server/resource/autocode_template/subcontract/service_enter.go.tpl b/server/resource/autocode_template/subcontract/service_enter.go.tpl
@@ -2,8 +2,5 @@ package {{ .PackageName }}
 
 
 type ServiceGroup struct {
-    // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
-
-	// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
 }
 
diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go
@@ -1,29 +1,23 @@
 package system
 
 import (
-	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"go/ast"
-	"go/format"
-	"go/parser"
-	"go/token"
+	ast2 "github.com/flipped-aurora/gin-vue-admin/server/utils/ast"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"io"
-	"log"
 	"mime/multipart"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"text/template"
 
+	"github.com/flipped-aurora/gin-vue-admin/server/resource/autocode_template/subcontract"
 	cp "github.com/otiai10/copy"
 	"go.uber.org/zap"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-
-	"github.com/flipped-aurora/gin-vue-admin/server/resource/autocode_template/subcontract"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
@@ -53,23 +47,10 @@ type autoPackage struct {
 var (
 	packageInjectionMap map[string]astInjectionMeta
 	injectionPaths      []injectionMeta
-	caser               = cases.Title(language.English)
 )
 
 func Init(Package string) {
 	injectionPaths = []injectionMeta{
-		{
-			path: filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-				global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go"),
-			funcName:    "MysqlTables",
-			structNameF: Package + ".%s{},",
-		},
-		{
-			path: filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-				global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "router.go"),
-			funcName:    "Routers",
-			structNameF: Package + "Router.Init%sRouter(PrivateGroup)",
-		},
 		{
 			path: filepath.Join(global.GVA_CONFIG.AutoCode.Root,
 				global.GVA_CONFIG.AutoCode.Server, fmt.Sprintf(global.GVA_CONFIG.AutoCode.SApi, Package), "enter.go"),
@@ -313,6 +294,21 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 				return err
 			}
 		}
+
+		{
+			// 在gorm.go 注入 自动迁移
+			path := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+				global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go")
+			ast2.AddRegisterTablesAst(path, "RegisterTables", autoCode.Package, autoCode.BusinessDB, autoCode.StructName)
+		}
+
+		{
+			// router.go 注入 自动迁移
+			path := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+				global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "router.go")
+			ast2.AddRouterCode(path, "Routers", autoCode.Package, autoCode.StructName)
+		}
+		//给各个enter进行注入
 		err = injectionCode(autoCode.StructName, &injectionCodeMeta)
 		if err != nil {
 			return
@@ -324,15 +320,6 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 				bf.WriteString(";")
 			}
 		}
-
-		var gormPath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go")
-		var routePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "router.go")
-		var imporStr = fmt.Sprintf("github.com/flipped-aurora/gin-vue-admin/server/model/%s", autoCode.Package)
-		_ = ImportReference(routePath, "", "", autoCode.Package, "")
-		_ = ImportReference(gormPath, imporStr, "", "", "")
-
 	} else { // 打包
 		if err = utils.ZipFiles("./ginvueadmin.zip", fileList, ".", "."); err != nil {
 			return err
@@ -581,9 +568,7 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
 func injectionCode(structName string, bf *strings.Builder) error {
 	for _, meta := range injectionPaths {
 		code := fmt.Sprintf(meta.structNameF, structName)
-		if err := utils.AutoInjectionCode(meta.path, meta.funcName, code); err != nil {
-			return err
-		}
+		ast2.ImportForAutoEnter(meta.path, meta.funcName, code)
 		bf.WriteString(fmt.Sprintf("%s@%s@%s;", meta.path, meta.funcName, code))
 	}
 	return nil
@@ -657,179 +642,13 @@ func (autoCodeService *AutoCodeService) CreatePackageTemp(packageName string) er
 	// 创建完成后在对应的位置插入结构代码
 	for _, v := range pendingTemp {
 		meta := packageInjectionMap[v.name]
-		if err := ImportReference(meta.path, fmt.Sprintf(meta.importCodeF, v.name, packageName), fmt.Sprintf(meta.structNameF, caser.String(packageName)), fmt.Sprintf(meta.packageNameF, packageName), meta.groupName); err != nil {
+		if err := ast2.ImportReference(meta.path, fmt.Sprintf(meta.importCodeF, v.name, packageName), fmt.Sprintf(meta.structNameF, cases.Title(language.English).String(packageName)), fmt.Sprintf(meta.packageNameF, packageName), meta.groupName); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-type Visitor struct {
-	ImportCode  string
-	StructName  string
-	PackageName string
-	GroupName   string
-}
-
-func (vi *Visitor) Visit(node ast.Node) ast.Visitor {
-	switch n := node.(type) {
-	case *ast.GenDecl:
-		// 查找有没有import context包
-		// Notice：没有考虑没有import任何包的情况
-		if n.Tok == token.IMPORT && vi.ImportCode != "" {
-			vi.addImport(n)
-			// 不需要再遍历子树
-			return nil
-		}
-		if n.Tok == token.TYPE && vi.StructName != "" && vi.PackageName != "" && vi.GroupName != "" {
-			vi.addStruct(n)
-			return nil
-		}
-	case *ast.FuncDecl:
-		if n.Name.Name == "Routers" {
-			vi.addFuncBodyVar(n)
-			return nil
-		}
-
-	}
-	return vi
-}
-
-func (vi *Visitor) addStruct(genDecl *ast.GenDecl) ast.Visitor {
-	for i := range genDecl.Specs {
-		switch n := genDecl.Specs[i].(type) {
-		case *ast.TypeSpec:
-			if strings.Index(n.Name.Name, "Group") > -1 {
-				switch t := n.Type.(type) {
-				case *ast.StructType:
-					f := &ast.Field{
-						Names: []*ast.Ident{
-							{
-								Name: vi.StructName,
-								Obj: &ast.Object{
-									Kind: ast.Var,
-									Name: vi.StructName,
-								},
-							},
-						},
-						Type: &ast.SelectorExpr{
-							X: &ast.Ident{
-								Name: vi.PackageName,
-							},
-							Sel: &ast.Ident{
-								Name: vi.GroupName,
-							},
-						},
-					}
-					t.Fields.List = append(t.Fields.List, f)
-				}
-			}
-		}
-	}
-	return vi
-}
-
-func (vi *Visitor) addImport(genDecl *ast.GenDecl) ast.Visitor {
-	// 是否已经import
-	hasImported := false
-	for _, v := range genDecl.Specs {
-		importSpec := v.(*ast.ImportSpec)
-		// 如果已经包含
-		if importSpec.Path.Value == strconv.Quote(vi.ImportCode) {
-			hasImported = true
-		}
-	}
-	if !hasImported {
-		genDecl.Specs = append(genDecl.Specs, &ast.ImportSpec{
-			Path: &ast.BasicLit{
-				Kind:  token.STRING,
-				Value: strconv.Quote(vi.ImportCode),
-			},
-		})
-	}
-	return vi
-}
-
-func (vi *Visitor) addFuncBodyVar(funDecl *ast.FuncDecl) ast.Visitor {
-	hasVar := false
-	for _, v := range funDecl.Body.List {
-		switch varSpec := v.(type) {
-		case *ast.AssignStmt:
-			for i := range varSpec.Lhs {
-				switch nn := varSpec.Lhs[i].(type) {
-				case *ast.Ident:
-					if nn.Name == vi.PackageName+"Router" {
-						hasVar = true
-					}
-				}
-			}
-		}
-	}
-	if !hasVar {
-		assignStmt := &ast.AssignStmt{
-			Lhs: []ast.Expr{
-				&ast.Ident{
-					Name: vi.PackageName + "Router",
-					Obj: &ast.Object{
-						Kind: ast.Var,
-						Name: vi.PackageName + "Router",
-					},
-				},
-			},
-			Tok: token.DEFINE,
-			Rhs: []ast.Expr{
-				&ast.SelectorExpr{
-					X: &ast.SelectorExpr{
-						X: &ast.Ident{
-							Name: "router",
-						},
-						Sel: &ast.Ident{
-							Name: "RouterGroupApp",
-						},
-					},
-					Sel: &ast.Ident{
-						Name: caser.String(vi.PackageName),
-					},
-				},
-			},
-		}
-		funDecl.Body.List = append(funDecl.Body.List, funDecl.Body.List[1])
-		index := 1
-		copy(funDecl.Body.List[index+1:], funDecl.Body.List[index:])
-		funDecl.Body.List[index] = assignStmt
-	}
-	return vi
-}
-
-func ImportReference(filepath, importCode, structName, packageName, groupName string) error {
-	fSet := token.NewFileSet()
-	fParser, err := parser.ParseFile(fSet, filepath, nil, parser.ParseComments)
-	if err != nil {
-		return err
-	}
-	importCode = strings.TrimSpace(importCode)
-	v := &Visitor{
-		ImportCode:  importCode,
-		StructName:  structName,
-		PackageName: packageName,
-		GroupName:   groupName,
-	}
-	if importCode == "" {
-		ast.Print(fSet, fParser)
-	}
-
-	ast.Walk(v, fParser)
-
-	var output []byte
-	buffer := bytes.NewBuffer(output)
-	err = format.Node(buffer, fSet, fParser)
-	if err != nil {
-		log.Fatal(err)
-	}
-	// 写回数据
-	return os.WriteFile(filepath, buffer.Bytes(), 0o600)
-}
-
 // CreatePlug 自动创建插件模板
 func (autoCodeService *AutoCodeService) CreatePlug(plug system.AutoPlugReq) error {
 	// 检查列表参数是否有效