优化代码

internal/const/vars.go

@@ -2,6 +2,8 @@
 
 package teaconst
 
+import "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+
 var (
 	// 流量统计
 
@@ -10,4 +12,6 @@ var (
 
 	NodeId       int64 = 0
 	NodeIdString       = ""
+
+	GlobalProductName = nodeconfigs.DefaultProductName
 )

internal/iplibrary/action_http_api.go

@@ -71,7 +71,7 @@ func (this *HTTPAPIAction) runAction(action string, listType IPListType, item *p
 	if err != nil {
 		return err
 	}
-	req.Header.Set("User-Agent", "GoEdge-Node/"+teaconst.Version)
+	req.Header.Set("User-Agent", teaconst.GlobalProductName+"-Node/"+teaconst.Version)
 	resp, err := httpAPIClient.Do(req)
 	if err != nil {
 		return err

internal/nodes/http_request.go

@@ -949,6 +949,22 @@ func (this *HTTPRequest) Format(source string) string {
 			}
 		}
 
+		// product
+		if prefix == "product" {
+			switch suffix {
+			case "name":
+				if sharedNodeConfig.ProductConfig != nil && len(sharedNodeConfig.ProductConfig.Name) > 0 {
+					return sharedNodeConfig.ProductConfig.Name
+				}
+				return teaconst.GlobalProductName
+			case "version":
+				if sharedNodeConfig.ProductConfig != nil && len(sharedNodeConfig.ProductConfig.Version) > 0 {
+					return sharedNodeConfig.ProductConfig.Version
+				}
+				return teaconst.Version
+			}
+		}
+
 		return "${" + varName + "}"
 	})
 }

internal/nodes/node.go

@@ -713,4 +713,9 @@ func (this *Node) onReload(config *nodeconfigs.NodeConfig) {
 		time.Local = location
 		this.timezone = timeZone
 	}
+
+	// product information
+	if config.ProductConfig != nil {
+		teaconst.GlobalProductName = config.ProductConfig.Name
+	}
 }