不一定要合并 简单的实现了一个测试版本的服用已经删除自动化生成的文件保留自己写的代码部分 gvakeepcode的示例

.gitignore

@@ -1,7 +1,7 @@
 .idea/
 /web/node_modules
 /web/dist
-
+rm_file/
 .DS_Store
 
 # local env files

server/api/v1/system/sys_auto_code.go

@@ -1,13 +1,20 @@
 package system
 
 import (
+ "bufio"
+ "errors"
  "fmt"
  "net/url"
+ "os"
+ "path/filepath"
+ "regexp"
  "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/common/response"
  "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+ sysReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
  "github.com/flipped-aurora/gin-vue-admin/server/utils"
 
  "github.com/gin-gonic/gin"
@@ -90,6 +97,113 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
  }
  c.Writer.Header().Add("Content-Type", "application/json")
  c.Writer.Header().Add("success", "true")
+ if a.AutoKeepCode {
+ var records []system.RecordsDeleteCode
+ result := global.GVA_DB.Table("records").Select("path", "file", "update_time").Find(&records)
+ // 从 records 表中获取被删除的代码文件的路径和文件名
+ if result.Error != nil {
+ global.GVA_LOG.Error("无任何删除记录!", zap.Error(result.Error))
+ response.FailWithMessage("无任何删除记录", c)
+ return
+ }
+
+ for _, record := range records {
+ srcFile := record.Path
+ file := record.File
+
+ // destFile 是新创建的文件的路径
+ destFile := filepath.Join(global.GVA_CONFIG.AutoCode.Root, file)
+ // 检查新文件的路径是否存在
+ if _, err := os.Stat(destFile); err == nil {
+ if err := extractAndAppendCodeBlocks(srcFile, destFile); err != nil {
+ global.GVA_LOG.Error("提取代码块失败!", zap.Error(err))
+ response.FailWithMessage("提取代码块失败", c)
+ return
+ }
+ // 删除数据库中的记录
+ result := global.GVA_DB.Where("path = ? AND file = ?", srcFile, file).Delete(&system.RecordsDeleteCode{})
+ if result.Error != nil {
+ global.GVA_LOG.Error("删除记录失败!", zap.Error(result.Error))
+ response.FailWithMessage("删除记录失败", c)
+ return
+ }
+ }
+ }
+ }
+}
+
+// 提取rm_file(删除文件存放)代码文件中的标记代码段,添加到目标文件末尾,如果目标文件不存在则自动创建
+func extractAndAppendCodeBlocks(srcFile, destFile string) error {
+
+ source, err := os.Open(srcFile)
+ if err != nil {
+ return err
+ }
+ defer source.Close()
+
+ // 检查目标文件是否存在，如果不存在则创建
+ dest, err := os.OpenFile(destFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+ if err != nil {
+ return err
+ }
+ defer dest.Close()
+
+ scanner := bufio.NewScanner(source)
+ writer := bufio.NewWriter(dest)
+ defer writer.Flush()
+
+ keepWriting := false
+ nestCount := 0
+
+ for scanner.Scan() {
+ line := scanner.Text()
+ trimmedLine := strings.TrimSpace(line)
+
+ if isStartTag(trimmedLine) {
+ nestCount++
+ if nestCount == 1 {
+ keepWriting = true
+ }
+ }
+
+ if keepWriting {
+ _, err = writer.WriteString(line + "\n")
+ if err != nil {
+ return err
+ }
+ }
+
+ if isEndTag(trimmedLine) {
+ if nestCount > 0 {
+ nestCount--
+ }
+ if nestCount == 0 {
+ keepWriting = false
+ }
+ }
+ }
+
+ if err := scanner.Err(); err != nil {
+ return err
+ }
+
+ if nestCount != 0 {
+ return errors.New("发现未匹配的标签")
+ }
+
+ return nil
+}
+
+// isStartTag 检查一行是否包含开始标签。
+func isStartTag(line string) bool {
+ match, _ := regexp.MatchString(`^\s*//\s*@gvastartkeep\s*$`, line)
+ return match
+}
+
+// isEndTag 检查一行是否包含结束标签。
+func isEndTag(line string) bool {
+ match, _ := regexp.MatchString(`^\s*//\s*@gvaendkeep\s*$`, line)
+ return match
 }
 
 // GetDB
@@ -193,6 +307,34 @@ func (autoApi *AutoCodeApi) CreatePackage(c *gin.Context) {
  }
 }
 
+// UpdatePackage
+// @Tags AutoCode
+// @Summary 更新package展示名字/描述
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAutoCode true "更新package"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "更新package成功"
+// @Router /autoCode/updatePackageDetail [post]
+func (autoApi *AutoCodeApi) UpdatePackageDetail(c *gin.Context) {
+ var a sysReq.SysAutoCode
+ var autoCode system.SysAutoCode
+ _ = c.ShouldBindJSON(&a)
+ if err := global.GVA_DB.Where("id = ?", a.ID).First(&autoCode).Error; err != nil {
+ response.FailWithMessage("获取package失败", c)
+ return
+ }
+ // 更新展示名字/描述
+ autoCode.Label = a.Label
+ autoCode.Desc = a.Desc
+ if err := global.GVA_DB.Save(&autoCode).Error; err != nil {
+ global.GVA_LOG.Error("更新失败!", zap.Error(err))
+ response.FailWithMessage("更新失败", c)
+ } else {
+ response.OkWithMessage("更新成功", c)
+ }
+}
+
 // GetPackage
 // @Tags AutoCode
 // @Summary 获取package
@@ -211,6 +353,34 @@ func (autoApi *AutoCodeApi) GetPackage(c *gin.Context) {
  }
 }
 
+// auto_code_api.go
+
+// GetPackageByID
+// @Tags AutoCode
+// @Summary 根据ID获取package
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param id body int true "package ID"
+// @Success 200 {object} response.Response{data=system.SysAutoCode,msg=string} "根据ID获取package成功"
+// @Router /autoCode/getPackageByID/ POST
+func (autoApi *AutoCodeApi) GetPackageById(c *gin.Context) {
+ var pkgId request.GetById
+ err := c.ShouldBindJSON(&pkgId)
+ if err != nil {
+ response.FailWithMessage(err.Error(), c)
+ return
+ }
+ var autoCode system.SysAutoCode
+ fmt.Printf("pkgId%+v", pkgId)
+ if err := global.GVA_DB.First(&autoCode, pkgId).Error; err != nil {
+ global.GVA_LOG.Error("获取失败!", zap.Error(err))
+ response.FailWithMessage("获取失败", c)
+ } else {
+ response.OkWithDetailed(gin.H{"pkg": autoCode}, "获取成功", c)
+ }
+}
+
 // DelPackage
 // @Tags AutoCode
 // @Summary 删除package

server/go.mod

@@ -156,4 +156,4 @@ require (
  modernc.org/mathutil v1.5.0 // indirect
  modernc.org/memory v1.6.0 // indirect
  modernc.org/sqlite v1.23.0 // indirect
-)
+)

server/go.sum

@@ -935,4 +935,4 @@ nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

server/initialize/gorm.go

@@ -48,6 +48,7 @@ func RegisterTables() {
  system.SysExportTemplate{},
  system.Condition{},
  system.JoinTemplate{},
+ system.RecordsDeleteCode{},
 
  example.ExaFile{},
  example.ExaCustomer{},

server/main.go

@@ -35,5 +35,6 @@ func main() {
  db, _ := global.GVA_DB.DB()
  defer db.Close()
  }
+
  core.RunWindowsServer()
 }

server/model/system/request/sys_auto_code.go

@@ -0,0 +1,7 @@
+package request
+
+type SysAutoCode struct {
+ ID uint `gorm:"primarykey" json:"ID"` // 主键ID
+ Label string `json:"label" gorm:"comment:展示名"`
+ Desc string `json:"desc" gorm:"comment:描述"`
+}

server/model/system/sys_auto_code.go

@@ -20,6 +20,7 @@ type AutoCodeStruct struct {
  AutoCreateResource bool `json:"autoCreateResource"` // 是否自动创建资源标识
  BusinessDB string `json:"businessDB"` // 业务数据库
  GvaModel bool `json:"gvaModel"` // 是否使用gva默认Model
+ AutoKeepCode bool `json:"autoKeepCode"`
  Fields []*Field `json:"fields"`
  PrimaryField *Field `json:"primaryField"`
  HasTimer bool `json:"-"`

server/model/system/sys_autocode_history.go

@@ -3,6 +3,7 @@ package system
 import (
  "strconv"
  "strings"
+ "time"
 
  "github.com/flipped-aurora/gin-vue-admin/server/global"
  "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
@@ -39,3 +40,14 @@ func (m *SysAutoCodeHistory) ToRequestIds() request.IdsReq {
  }
  return request.IdsReq{Ids: ids}
 }
+
+// 记录删除文件的路径
+type RecordsDeleteCode struct {
+ Path string `gorm:"type:text;comment:已删除文件保存路径"`
+ File string `gorm:"type:text;comment:新生成文件路径"`
+ UpdateTime time.Time `gorm:"type:datetime;comment:更新时间"`
+}
+
+func (RecordsDeleteCode) TableName() string {
+ return "records"
+}

server/resource/autocode_template/web/form.vue.tpl

@@ -28,7 +28,7 @@
  <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入" />
  {{- end }}
  {{- if eq .FieldType "time.Time" }}
- <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" placeholder="选择日期" :clearable="{{.Clearable}}"></el-date-picker>
+ <el-date-picker v-model="formData.{{ .FieldJson }}" type="datetime" placeholder="选择日期" :clearable="{{.Clearable}}"></el-date-picker>
  {{- end }}
  {{- if eq .FieldType "float64" }}
  <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" :clearable="{{.Clearable}}"></el-input-number>

server/resource/autocode_template/web/table.vue.tpl

@@ -93,19 +93,20 @@
  :data="tableData"
  row-key="{{.PrimaryField.FieldJson}}"
  @selection-change="handleSelectionChange"
+ border resizeable
  {{- if .NeedSort}}
  @sort-change="sortChange"
  {{- end}}
  >
- <el-table-column type="selection" width="55" />
+ <el-table-column align="center" type="selection" width="55" />
  {{ if .GvaModel }}
- <el-table-column align="left" label="日期" prop="createdAt" width="180">
+ <el-table-column align="center" label="日期" prop="createdAt" width="180">
  <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
  </el-table-column>
  {{ end }}
  {{- range .FrontFields}}
  {{- if .CheckDataSource }}
- <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="center" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
  <template #default="scope">
  {{if eq .DataSource.Association 2}}
  <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
@@ -117,17 +118,17 @@
  </template>
  </el-table-column>
  {{- else if .DictType}}
- <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="center" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
  <template #default="scope">
  {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
  </template>
  </el-table-column>
  {{- else if eq .FieldType "bool" }}
- <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="center" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
  <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
  </el-table-column>
  {{- else if eq .FieldType "time.Time" }}
- <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="180">
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="center" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="180">
  <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
  </el-table-column>
  {{- else if eq .FieldType "picture" }}
@@ -177,7 +178,7 @@
  </template>
  </el-table-column>
  {{- else }}
- <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="center" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
  {{- end }}
  {{- end }}
  <el-table-column align="left" label="操作" fixed="right" min-width="240">
@@ -246,7 +247,7 @@
  <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
  {{- end }}
  {{- if eq .FieldType "time.Time" }}
- <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}" />
+ <el-date-picker v-model="formData.{{ .FieldJson }}" type="datetime" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}" />
  {{- end }}
  {{- if eq .FieldType "float64" }}
  <el-input-number v-model="formData.{{ .FieldJson }}" style="width:100%" :precision="2" :clearable="{{.Clearable}}" />

server/router/system/sys_auto_code.go

@@ -11,16 +11,18 @@ func (s *AutoCodeRouter) InitAutoCodeRouter(Router *gin.RouterGroup) {
  autoCodeRouter := Router.Group("autoCode")
  autoCodeApi := v1.ApiGroupApp.SystemApiGroup.AutoCodeApi
  {
- autoCodeRouter.GET("getDB", autoCodeApi.GetDB) // 获取数据库
- autoCodeRouter.GET("getTables", autoCodeApi.GetTables) // 获取对应数据库的表
- autoCodeRouter.GET("getColumn", autoCodeApi.GetColumn) // 获取指定表所有字段信息
- autoCodeRouter.POST("preview", autoCodeApi.PreviewTemp) // 获取自动创建代码预览
- autoCodeRouter.POST("createTemp", autoCodeApi.CreateTemp) // 创建自动化代码
- autoCodeRouter.POST("createPackage", autoCodeApi.CreatePackage) // 创建package包
- autoCodeRouter.POST("getPackage", autoCodeApi.GetPackage) // 获取package包
- autoCodeRouter.POST("delPackage", autoCodeApi.DelPackage) // 删除package包
- autoCodeRouter.POST("createPlug", autoCodeApi.AutoPlug) // 自动插件包模板
- autoCodeRouter.POST("installPlugin", autoCodeApi.InstallPlugin) // 自动安装插件
- autoCodeRouter.POST("pubPlug", autoCodeApi.PubPlug) // 打包插件
+ autoCodeRouter.GET("getDB", autoCodeApi.GetDB) // 获取数据库
+ autoCodeRouter.GET("getTables", autoCodeApi.GetTables) // 获取对应数据库的表
+ autoCodeRouter.GET("getColumn", autoCodeApi.GetColumn) // 获取指定表所有字段信息
+ autoCodeRouter.POST("preview", autoCodeApi.PreviewTemp) // 获取自动创建代码预览
+ autoCodeRouter.POST("createTemp", autoCodeApi.CreateTemp) // 创建自动化代码
+ autoCodeRouter.POST("createPackage", autoCodeApi.CreatePackage) // 创建package包
+ autoCodeRouter.POST("updatePackageDetail", autoCodeApi.UpdatePackageDetail) // 修改package包展示名/描述
+ autoCodeRouter.POST("getPackage", autoCodeApi.GetPackage) // 获取package包
+ autoCodeRouter.POST("getPackageById", autoCodeApi.GetPackageById) // 获取package包
+ autoCodeRouter.POST("delPackage", autoCodeApi.DelPackage) // 删除package包
+ autoCodeRouter.POST("createPlug", autoCodeApi.AutoPlug) // 自动插件包模板
+ autoCodeRouter.POST("installPlugin", autoCodeApi.InstallPlugin) // 自动安装插件
+ autoCodeRouter.POST("pubPlug", autoCodeApi.PubPlug) // 打包插件
  }
 }