From e7e46bb6b8f0496d67593909f2caadb9c8f478c8 Mon Sep 17 00:00:00 2001
From: songzhibin97 <718428482@qq.com>
Date: Sun, 18 Jul 2021 14:16:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E6=8F=92=E5=85=A5=E7=82=B9&?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config.yaml                     |  2 +-
 server/service/system/sys_auto_code.go | 33 ++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/server/config.yaml b/server/config.yaml
index 112b2624..fa0c233d 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -73,7 +73,7 @@ local:
 autocode:
   transfer-restart: true
   root: ""
-  server: /server/autocode
+  server: /server
   server-api: /api/v1/autocode
   server-initialize: /initialize
   server-model: /model/autocode
diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go
index ee53fdf0..31178fdc 100644
--- a/server/service/system/sys_auto_code.go
+++ b/server/service/system/sys_auto_code.go
@@ -154,6 +154,14 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go")
 		initializeRouterFilePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
 			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "router.go")
+		initializeApiFilePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SApi, "enter.go")
+
+		initializeAutoRouterFilePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SRouter, "enter.go")
+		initializeServiceFilePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SService, "enter.go")
+
 		err = utils.AutoInjectionCode(initializeGormFilePath, "MysqlTables", "model."+autoCode.StructName+"{},")
 		if err != nil {
 			return err
@@ -162,10 +170,28 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 		if err != nil {
 			return err
 		}
+		err = utils.AutoInjectionCode(initializeApiFilePath, "ApiGroup", autoCode.StructName+"Api")
+		if err != nil {
+			return err
+		}
+		err = utils.AutoInjectionCode(initializeAutoRouterFilePath, "RouterGroup", autoCode.StructName+"Router")
+		if err != nil {
+			return err
+		}
+		err = utils.AutoInjectionCode(initializeServiceFilePath, "ServiceGroup", autoCode.StructName+"Service")
+		if err != nil {
+			return err
+		}
 
 		injectionCodeMeta.WriteString(fmt.Sprintf("%s@%s@%s", initializeGormFilePath, "MysqlTables", "model."+autoCode.StructName+"{},"))
 		injectionCodeMeta.WriteString(";")
 		injectionCodeMeta.WriteString(fmt.Sprintf("%s@%s@%s", initializeRouterFilePath, "Routers", "router.Init"+autoCode.StructName+"Router(PrivateGroup)"))
+		injectionCodeMeta.WriteString(";")
+		injectionCodeMeta.WriteString(fmt.Sprintf("%s@%s@%s", initializeApiFilePath, "ApiGroup", autoCode.StructName+"Api"))
+		injectionCodeMeta.WriteString(";")
+		injectionCodeMeta.WriteString(fmt.Sprintf("%s@%s@%s", initializeAutoRouterFilePath, "RouterGroup", autoCode.StructName+"Router"))
+		injectionCodeMeta.WriteString(";")
+		injectionCodeMeta.WriteString(fmt.Sprintf("%s@%s@%s", initializeServiceFilePath, "ServiceGroup", autoCode.StructName+"Service"))
 
 		// 保存生成信息
 		for _, data := range dataList {
@@ -176,9 +202,9 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 		}
 
 		if global.GVA_CONFIG.AutoCode.TransferRestart {
-			go func() {
-				_ = utils.Reload()
-			}()
+			//go func() {
+			//	_ = utils.Reload()
+			//}()
 		}
 		//return errors.New("创建代码成功并移动文件成功")
 	} else { // 打包
@@ -414,7 +440,6 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
 	// 生成文件路径，填充 autoCodePath 字段，readme.txt.tpl不符合规则，需要特殊处理
 	// resource/template/web/api.js.tpl -> autoCode/web/autoCode.PackageName/api/autoCode.PackageName.js
 	// resource/template/readme.txt.tpl -> autoCode/readme.txt
-	autoPath := "autoCode/"
 	for index, value := range dataList {
 		trimBase := strings.TrimPrefix(value.locationPath, basePath+"/")
 		if trimBase == "readme.txt.tpl" {