From 9e144100c13258e31af89296ce37b8f4ae33021f Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Tue, 17 Aug 2021 11:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/system/service/tools_gen_table.go | 5 ++++-
 template/vm/go/controller.template    | 2 +-
 template/vm/go/dao.template           | 6 +++---
 template/vm/go/dao_internal.template  | 2 +-
 template/vm/go/model.template         | 2 +-
 template/vm/go/router.template        | 1 +
 template/vm/go/service.template       | 1 +
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/system/service/tools_gen_table.go b/app/system/service/tools_gen_table.go
index 5cfad93..8e482bd 100644
--- a/app/system/service/tools_gen_table.go
+++ b/app/system/service/tools_gen_table.go
@@ -632,7 +632,10 @@ func (s *toolsGenTable) GenData(tableId int64, ctx context.Context) (data g.MapS
 //剔除多余的换行
 func (s *toolsGenTable) trimBreak(str string) (rStr string, err error) {
 	var b []byte
-	if b, err = gregex.Replace("(([\\s\t]*)\r?\n){2,}", []byte("$2\n\n"), []byte(str)); err == nil {
+	if b, err = gregex.Replace("(([\\s\t]*)\r?\n){2,}", []byte("$2\n"), []byte(str)); err != nil {
+		return
+	}
+	if b, err = gregex.Replace("(([\\s\t]*)/{4}\r?\n)", []byte("$2\n\n"), b); err == nil {
 		rStr = gconv.String(b)
 	}
 	return
diff --git a/template/vm/go/controller.template b/template/vm/go/controller.template
index ad10245..6592d29 100644
--- a/template/vm/go/controller.template
+++ b/template/vm/go/controller.template
@@ -4,7 +4,7 @@
 // 生成路径: {{.table.PackageName}}/api/{{.table.BusinessName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
-
+////
 {{$structName := .table.BusinessName | CaseCamelLower}}
 
 package api
diff --git a/template/vm/go/dao.template b/template/vm/go/dao.template
index 7230690..94d7042 100644
--- a/template/vm/go/dao.template
+++ b/template/vm/go/dao.template
@@ -4,7 +4,7 @@
 // 生成路径: {{.table.PackageName}}/dao/{{.table.TableName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
-
+////
 package dao
 
 {{$hasGTime:=false}}
@@ -36,9 +36,9 @@ var (
     }
 )
 
-
+////
 // Fill with you ideas below.
-
+////
 
 // {{.table.ClassName}}SearchReq 分页请求参数
 type {{.table.ClassName}}SearchReq struct {
diff --git a/template/vm/go/dao_internal.template b/template/vm/go/dao_internal.template
index b3ea1e3..8ef9de5 100644
--- a/template/vm/go/dao_internal.template
+++ b/template/vm/go/dao_internal.template
@@ -4,7 +4,7 @@
 // 生成路径: {{.table.PackageName}}/dao/internal/{{.table.TableName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
-
+////
 package internal
 
 
diff --git a/template/vm/go/model.template b/template/vm/go/model.template
index 6ad6618..a9d9774 100644
--- a/template/vm/go/model.template
+++ b/template/vm/go/model.template
@@ -4,7 +4,7 @@
 // 生成路径: {{.table.PackageName}}/model/{{.table.TableName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
-
+////
 package model
 
 
diff --git a/template/vm/go/router.template b/template/vm/go/router.template
index f7acbe1..c977eaa 100644
--- a/template/vm/go/router.template
+++ b/template/vm/go/router.template
@@ -4,6 +4,7 @@
 // 生成路径: {{.table.PackageName}}/router/{{.table.BusinessName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
+////
 package router
 
 import (
diff --git a/template/vm/go/service.template b/template/vm/go/service.template
index ceff0fd..6c1ad60 100644
--- a/template/vm/go/service.template
+++ b/template/vm/go/service.template
@@ -4,6 +4,7 @@
 // 生成路径: {{.table.PackageName}}/service/{{.table.BusinessName}}.go
 // 生成人：{{.table.FunctionAuthor}}
 // ==========================================================================
+////
 {{$structName := .table.BusinessName | CaseCamelLower}}
 
 package service