From 601aa6e245cef524df8cf9b67f21533b7c02ab55 Mon Sep 17 00:00:00 2001 From: "Feng.YJ" <32027253+huiyifyj@users.noreply.github.com> Date: Sun, 22 Dec 2024 00:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E5=8F=8A?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=94=B9=E8=BF=9B=20(#1969?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile: 使用 '?=' 替代 if-else 的判断 * 移除多余的类型转换 * 移除多余的nil判断 * map 使用简化以及错误处理优化 --- Makefile | 13 ++------ server/service/system/auto_code_package.go | 13 ++++---- server/service/system/auto_code_template.go | 31 +++++++++++--------- server/service/system/sys_api.go | 5 ++-- server/service/system/sys_export_template.go | 13 ++++---- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 541b4ede5..9135c9ad9 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,9 @@ CONFIG_FILE = config.yaml IMAGE_NAME = gva #镜像地址 REPOSITORY = registry.cn-hangzhou.aliyuncs.com/${IMAGE_NAME} - -ifeq ($(TAGS_OPT),) -TAGS_OPT = latest -else -endif - -ifeq ($(PLUGIN),) -PLUGIN = email -else -endif +#镜像版本 +TAGS_OPT ?= latest +PLUGIN ?= email #容器环境前后端共同打包 build: build-web build-server diff --git a/server/service/system/auto_code_package.go b/server/service/system/auto_code_package.go index c9b8cfe2d..a965897b3 100644 --- a/server/service/system/auto_code_package.go +++ b/server/service/system/auto_code_package.go @@ -3,6 +3,12 @@ package system import ( "context" "fmt" + "go/token" + "os" + "path/filepath" + "strings" + "text/template" + "github.com/flipped-aurora/gin-vue-admin/server/global" common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" model "github.com/flipped-aurora/gin-vue-admin/server/model/system" @@ -10,12 +16,7 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/flipped-aurora/gin-vue-admin/server/utils/ast" "github.com/pkg/errors" - "go/token" "gorm.io/gorm" - "os" - "path/filepath" - "strings" - "text/template" ) var AutoCodePackage = new(autoCodePackage) @@ -159,7 +160,7 @@ func (s *autoCodePackage) All(ctx context.Context) (entities []model.SysAutoCode //dir目录需要包含所有的dirNameMap for k := 0; k < len(dir); k++ { if dir[k].IsDir() { - if _, ok := dirNameMap[dir[k].Name()]; ok { + if ok := dirNameMap[dir[k].Name()]; ok { delete(dirNameMap, dir[k].Name()) } } diff --git a/server/service/system/auto_code_template.go b/server/service/system/auto_code_template.go index 8d52e3172..ae3837024 100644 --- a/server/service/system/auto_code_template.go +++ b/server/service/system/auto_code_template.go @@ -4,20 +4,21 @@ import ( "context" "encoding/json" "fmt" + "go/ast" + "go/format" + "go/parser" + "go/token" + "os" + "path/filepath" + "strings" + "text/template" + "github.com/flipped-aurora/gin-vue-admin/server/global" model "github.com/flipped-aurora/gin-vue-admin/server/model/system" "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" utilsAst "github.com/flipped-aurora/gin-vue-admin/server/utils/ast" "github.com/pkg/errors" - "go/ast" - "go/format" - "go/parser" - "go/token" "gorm.io/gorm" - "os" - "path/filepath" - "strings" - "text/template" ) var AutoCodeTemplate = new(autoCodeTemplate) @@ -191,13 +192,12 @@ func (s *autoCodeTemplate) Preview(ctx context.Context, info request.AutoCode) ( return nil, errors.Wrap(err, "查询包失败!") } // 增加判断: 重复创建struct 或者重复的简称 - if AutocodeHistory.Repeat(info.BusinessDB, info.StructName, info.Abbreviation, info.Package) && !info.IsAdd { + if AutocodeHistory.Repeat(info.BusinessDB, info.StructName, info.Abbreviation, info.Package) && !info.IsAdd { return nil, errors.New("已经创建过此数据结构或重复简称,请勿重复创建!") } - codes := make(map[string]strings.Builder) preview := make(map[string]string) - codes, _, _, err = s.generate(ctx, info, entity) + codes, _, _, err := s.generate(ctx, info, entity) if err != nil { return nil, err } @@ -291,8 +291,7 @@ func (s *autoCodeTemplate) AddFunc(info request.AutoFunc) error { if err != nil { return err } - err = s.addTemplateToAst("router", info) - return nil + return s.addTemplateToAst("router", info) } func (s *autoCodeTemplate) GetApiAndServer(info request.AutoFunc) (map[string]string, error) { @@ -353,10 +352,14 @@ func (s *autoCodeTemplate) addTemplateToAst(t string, info request.AutoFunc) err } src, err := os.ReadFile(tPath) + if err != nil { + return err + } + fileSet := token.NewFileSet() astFile, err := parser.ParseFile(fileSet, "", src, 0) if err != nil { - fmt.Println(err) + return err } funcDecl := utilsAst.FindFunction(astFile, funcName) stmtNode := utilsAst.CreateStmt(stmtStr) diff --git a/server/service/system/sys_api.go b/server/service/system/sys_api.go index 92c995109..a77d1d5cb 100644 --- a/server/service/system/sys_api.go +++ b/server/service/system/sys_api.go @@ -3,12 +3,13 @@ package system import ( "errors" "fmt" + "strings" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "github.com/flipped-aurora/gin-vue-admin/server/model/system" systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" "gorm.io/gorm" - "strings" ) //@author: [piexlmax](https://github.com/piexlmax) @@ -135,7 +136,7 @@ func (apiService *ApiService) IgnoreApi(ignoreApi system.SysIgnoreApi) (err erro func (apiService *ApiService) EnterSyncApi(syncApis systemRes.SysSyncApis) (err error) { return global.GVA_DB.Transaction(func(tx *gorm.DB) error { var txErr error - if syncApis.NewApis != nil && len(syncApis.NewApis) > 0 { + if len(syncApis.NewApis) > 0 { txErr = tx.Create(&syncApis.NewApis).Error if txErr != nil { return txErr diff --git a/server/service/system/sys_export_template.go b/server/service/system/sys_export_template.go index 19a7a4520..077ebf095 100644 --- a/server/service/system/sys_export_template.go +++ b/server/service/system/sys_export_template.go @@ -4,6 +4,12 @@ import ( "bytes" "encoding/json" "fmt" + "mime/multipart" + "net/url" + "strconv" + "strings" + "time" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "github.com/flipped-aurora/gin-vue-admin/server/model/system" @@ -11,11 +17,6 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/xuri/excelize/v2" "gorm.io/gorm" - "mime/multipart" - "net/url" - "strconv" - "strings" - "time" ) type SysExportTemplateService struct { @@ -155,7 +156,7 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID var tableTitle []string var selectKeyFmt []string for _, key := range columns { - selectKeyFmt = append(selectKeyFmt, fmt.Sprintf("%s", key)) + selectKeyFmt = append(selectKeyFmt, key) tableTitle = append(tableTitle, templateInfoMap[key]) }