优化服务启动流程，修复后端配置组件名称和vue组件名称不一致无法缓存问题

server/internal/cmd/auth.go

@@ -27,10 +27,10 @@ var (
 			select {
 			case <-serverCloseSignal:
 				service.AuthClient().Stop(ctx)
+				g.Log().Debug(ctx, "auth successfully closed ..")
 				serverWg.Done()
 			}
 
-			g.Log().Debug(ctx, "auth successfully closed ..")
 			return
 		},
 	}

server/internal/cmd/cmd.go

@@ -52,23 +52,17 @@ var (
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 			g.Log().Debug(ctx, "starting all server")
 
-			simple.SafeGo(ctx, func(ctx context.Context) {
-				if err := Queue.Func(ctx, parser); err != nil {
-					g.Log().Fatal(ctx, "queue consumer start fail:", err)
-				}
-			})
+			// 需要启动的服务
+			var allServers = []*gcmd.Command{Http, Queue, Cron}
 
-			simple.SafeGo(ctx, func(ctx context.Context) {
-				if err := Cron.Func(ctx, parser); err != nil {
-					g.Log().Fatal(ctx, "cron start fail:", err)
-				}
-			})
-
-			simple.SafeGo(ctx, func(ctx context.Context) {
-				if err := Http.Func(ctx, parser); err != nil {
-					g.Log().Fatal(ctx, "http server start fail:", err)
-				}
-			})
+			for _, server := range allServers {
+				var cmd = server
+				simple.SafeGo(ctx, func(ctx context.Context) {
+					if err := cmd.Func(ctx, parser); err != nil {
+						g.Log().Fatal(ctx, "%v start fail:", cmd.Name, err)
+					}
+				})
+			}
 
 			// 信号监听
 			signalListen(ctx, signalHandlerForOverall)

server/internal/cmd/cron.go

@@ -33,10 +33,10 @@ var (
 			case <-serverCloseSignal:
 				service.CronClient().Stop(ctx)
 				crons.StopALL()
+				g.Log().Debug(ctx, "cron successfully closed ..")
 				serverWg.Done()
 			}
 
-			g.Log().Debug(ctx, "cron successfully closed ..")
 			return
 		},
 	}

server/internal/cmd/queue.go

@@ -32,10 +32,10 @@ var (
 
 			select {
 			case <-serverCloseSignal:
+				g.Log().Debug(ctx, "queue successfully closed ..")
 				serverWg.Done()
 			}
 
-			g.Log().Debug(ctx, "queue successfully closed ..")
 			return
 		},
 	}

server/internal/library/location/location.go

@@ -131,7 +131,7 @@ func GetLocation(ctx context.Context, ip string) (data *IpLocationData, err erro
 	}
 
 	if validate.IsLocalIPAddr(ip) {
-		return nil, fmt.Errorf("must be a public ip:%v", ip)
+		return // nil, fmt.Errorf("must be a public ip:%v", ip)
 	}
 
 	if cacheMap.Contains(ip) {

server/internal/library/network/tcp/client.go

@@ -96,14 +96,14 @@ func NewClient(config *ClientConfig) (client *Client, err error) {
 
 	if config.ConnectInterval <= 0 {
 		client.connectInterval = 5 * time.Second
-		client.Logger.Debugf(client.Ctx, "invalid connectInterval, reset to %v", client.connectInterval)
+		//client.Logger.Debugf(client.Ctx, "invalid connectInterval, reset to %v", client.connectInterval)
 	} else {
 		client.connectInterval = config.ConnectInterval
 	}
 
 	if config.Timeout <= 0 {
 		client.timeout = 10 * time.Second
-		client.Logger.Debugf(client.Ctx, "invalid timeout, reset to %v", client.timeout)
+		//client.Logger.Debugf(client.Ctx, "invalid timeout, reset to %v", client.timeout)
 	} else {
 		client.timeout = config.Timeout
 	}

server/internal/logic/admin/dept.go

@@ -7,7 +7,6 @@ package admin
 
 import (
 	"context"
-	"fmt"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -100,7 +99,7 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
 		if err != nil {
 			return
 		}
-		in.Tree = fmt.Sprintf("%str_%v ", pTree.String(), in.Id)
+		in.Tree = tree.GenLabel(pTree.String(), in.Id)
 
 		err = dao.AdminDept.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 			// 更新数据
@@ -129,7 +128,8 @@ func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string
 	}
 	for _, child := range list {
 		child.Level = _level + 1
-		child.Tree = fmt.Sprintf("%str_%v ", _tree, child.Id)
+		child.Tree = tree.GenLabel(_tree, child.Id)
+
 		_, err = dao.AdminDept.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update()
 		if err != nil {
 			return err

server/internal/logic/admin/role.go

@@ -7,7 +7,6 @@ package admin
 
 import (
 	"context"
-	"fmt"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -224,7 +223,7 @@ func (s *sAdminRole) Edit(ctx context.Context, in *role.EditReq) (err error) {
 		if err != nil {
 			return
 		}
-		in.Tree = fmt.Sprintf("%str_%v ", pTree.String(), in.Id)
+		in.Tree = tree.GenLabel(pTree.String(), in.Id)
 
 		err = dao.AdminRole.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 			// 更新数据
@@ -252,7 +251,8 @@ func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree st
 	}
 	for _, child := range list {
 		child.Level = _level + 1
-		child.Tree = fmt.Sprintf("%str_%v ", _tree, child.Id)
+		child.Tree = tree.GenLabel(_tree, child.Id)
+
 		_, err = dao.AdminRole.Ctx(ctx).Where("id", child.Id).Data("level", child.Level, "tree", child.Tree).Update()
 		if err != nil {
 			return err

server/internal/logic/sys/log.go

@@ -197,7 +197,7 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {
 
 	ipData, err := location.GetLocation(ctx, clientIp)
 	if err != nil {
-		g.Log().Stdout(false).Debugf(ctx, "location.GetLocation clientIp:%v, err:%+v", clientIp, err)
+		g.Log().Debugf(ctx, "location.GetLocation clientIp:%v, err:%+v", clientIp, err)
 	}
 
 	if ipData == nil {