From 97356328be7e075b504bfdd02d091fa98e1c6036 Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Fri, 21 Feb 2025 17:28:58 +0800
Subject: [PATCH] refactor: clean code

---
 internal/pkg/core/logger/builtin.go         | 4 ++--
 internal/pkg/vendors/baishan-sdk/client.go  | 8 +++++---
 internal/pkg/vendors/btpanel-sdk/client.go  | 8 +++++---
 internal/pkg/vendors/cachefly-sdk/client.go | 8 +++++---
 internal/pkg/vendors/cdnfly-sdk/client.go   | 8 +++++---
 internal/pkg/vendors/dnsla-sdk/client.go    | 8 +++++---
 internal/pkg/vendors/gname-sdk/client.go    | 8 +++++---
 7 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/internal/pkg/core/logger/builtin.go b/internal/pkg/core/logger/builtin.go
index 9787817d..fa8932dc 100644
--- a/internal/pkg/core/logger/builtin.go
+++ b/internal/pkg/core/logger/builtin.go
@@ -35,8 +35,8 @@ func (l *DefaultLogger) Logt(tag string, data ...any) {
 				reflect.Float32, reflect.Float64:
 				s = fmt.Sprintf("%v", v)
 			default:
-				jsonData, _ := json.Marshal(v)
-				s = string(jsonData)
+				jbytes, _ := json.Marshal(v)
+				s = string(jbytes)
 			}
 		}
 
diff --git a/internal/pkg/vendors/baishan-sdk/client.go b/internal/pkg/vendors/baishan-sdk/client.go
index e52e6af9..44015b62 100644
--- a/internal/pkg/vendors/baishan-sdk/client.go
+++ b/internal/pkg/vendors/baishan-sdk/client.go
@@ -38,10 +38,12 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r
 		qs := make(map[string]string)
 		if params != nil {
 			temp := make(map[string]any)
-			jsonData, _ := json.Marshal(params)
-			json.Unmarshal(jsonData, &temp)
+			jsonb, _ := json.Marshal(params)
+			json.Unmarshal(jsonb, &temp)
 			for k, v := range temp {
-				qs[k] = fmt.Sprintf("%v", v)
+				if v != nil {
+					qs[k] = fmt.Sprintf("%v", v)
+				}
 			}
 		}
 
diff --git a/internal/pkg/vendors/btpanel-sdk/client.go b/internal/pkg/vendors/btpanel-sdk/client.go
index 8ef38864..67e9fdb1 100644
--- a/internal/pkg/vendors/btpanel-sdk/client.go
+++ b/internal/pkg/vendors/btpanel-sdk/client.go
@@ -48,10 +48,12 @@ func (c *Client) sendRequest(path string, params interface{}) (*resty.Response,
 	data := make(map[string]any)
 	if params != nil {
 		temp := make(map[string]any)
-		jsonData, _ := json.Marshal(params)
-		json.Unmarshal(jsonData, &temp)
+		jsonb, _ := json.Marshal(params)
+		json.Unmarshal(jsonb, &temp)
 		for k, v := range temp {
-			data[k] = v
+			if v != nil {
+				data[k] = v
+			}
 		}
 	}
 	data["request_time"] = timestamp
diff --git a/internal/pkg/vendors/cachefly-sdk/client.go b/internal/pkg/vendors/cachefly-sdk/client.go
index d74c3698..505aafaf 100644
--- a/internal/pkg/vendors/cachefly-sdk/client.go
+++ b/internal/pkg/vendors/cachefly-sdk/client.go
@@ -39,10 +39,12 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r
 		qs := make(map[string]string)
 		if params != nil {
 			temp := make(map[string]any)
-			jsonData, _ := json.Marshal(params)
-			json.Unmarshal(jsonData, &temp)
+			jsonb, _ := json.Marshal(params)
+			json.Unmarshal(jsonb, &temp)
 			for k, v := range temp {
-				qs[k] = fmt.Sprintf("%v", v)
+				if v != nil {
+					qs[k] = fmt.Sprintf("%v", v)
+				}
 			}
 		}
 
diff --git a/internal/pkg/vendors/cdnfly-sdk/client.go b/internal/pkg/vendors/cdnfly-sdk/client.go
index 630e156c..7e2e93f4 100644
--- a/internal/pkg/vendors/cdnfly-sdk/client.go
+++ b/internal/pkg/vendors/cdnfly-sdk/client.go
@@ -45,10 +45,12 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r
 		qs := make(map[string]string)
 		if params != nil {
 			temp := make(map[string]any)
-			jsonData, _ := json.Marshal(params)
-			json.Unmarshal(jsonData, &temp)
+			jsonb, _ := json.Marshal(params)
+			json.Unmarshal(jsonb, &temp)
 			for k, v := range temp {
-				qs[k] = fmt.Sprintf("%v", v)
+				if v != nil {
+					qs[k] = fmt.Sprintf("%v", v)
+				}
 			}
 		}
 
diff --git a/internal/pkg/vendors/dnsla-sdk/client.go b/internal/pkg/vendors/dnsla-sdk/client.go
index 936b634d..60430fa1 100644
--- a/internal/pkg/vendors/dnsla-sdk/client.go
+++ b/internal/pkg/vendors/dnsla-sdk/client.go
@@ -40,10 +40,12 @@ func (c *Client) sendRequest(method string, path string, params interface{}) (*r
 		qs := make(map[string]string)
 		if params != nil {
 			temp := make(map[string]any)
-			jsonData, _ := json.Marshal(params)
-			json.Unmarshal(jsonData, &temp)
+			jsonb, _ := json.Marshal(params)
+			json.Unmarshal(jsonb, &temp)
 			for k, v := range temp {
-				qs[k] = fmt.Sprintf("%v", v)
+				if v != nil {
+					qs[k] = fmt.Sprintf("%v", v)
+				}
 			}
 		}
 
diff --git a/internal/pkg/vendors/gname-sdk/client.go b/internal/pkg/vendors/gname-sdk/client.go
index c4225357..8e2a2ba9 100644
--- a/internal/pkg/vendors/gname-sdk/client.go
+++ b/internal/pkg/vendors/gname-sdk/client.go
@@ -62,10 +62,12 @@ func (c *Client) sendRequest(path string, params interface{}) (*resty.Response,
 	data := make(map[string]string)
 	if params != nil {
 		temp := make(map[string]any)
-		jsonData, _ := json.Marshal(params)
-		json.Unmarshal(jsonData, &temp)
+		jsonb, _ := json.Marshal(params)
+		json.Unmarshal(jsonb, &temp)
 		for k, v := range temp {
-			data[k] = fmt.Sprintf("%v", v)
+			if v != nil {
+				data[k] = fmt.Sprintf("%v", v)
+			}
 		}
 	}
 	data["appid"] = c.appId