重构项目

pkg/utils/AuthToken.go

@@ -1,35 +1,35 @@
 package utils
 
 import (
-	"SafelineAPI/internal/app/safeLineApi"
+	"SafelineAPI/internal/app/SafelineRequest"
 	"io"
 	"net/http"
 )
 
-func AuthSafeLine(url safeLineApi.URL) (safeLineApi.AuthTokenResp, int, error) {
-	resp, err := Request(safeLineApi.GetTOKEN, url.AuthTokenUrl(), nil, nil)
+func AuthSafeLine(url SafelineRequest.URL) (SafelineRequest.AuthTokenResp, int, error) {
+	resp, err := Request(SafelineRequest.GetTOKEN, url.AuthTokenUrl(), nil, nil)
 	if err != nil {
-		return safeLineApi.AuthTokenResp{}, 0, err
+		return SafelineRequest.AuthTokenResp{}, 0, err
 	}
 	defer resp.Body.Close()
 	data, _ := io.ReadAll(resp.Body)
-	var authTokenResp safeLineApi.AuthTokenResp
+	var authTokenResp SafelineRequest.AuthTokenResp
 	authTokenResp.Unmarshal(data)
 	return authTokenResp, resp.StatusCode, nil
 }
 
-func VerifyAuthToken(url safeLineApi.URL, token string) (safeLineApi.AuthTokenResp, int, error) {
+func VerifyAuthToken(url SafelineRequest.URL, token string) (SafelineRequest.AuthTokenResp, int, error) {
 	header := http.Header{
 		"X-SLCE-API-TOKEN": []string{token},
 	}
 
-	resp, err := Request(safeLineApi.GetTOKEN, url.AuthTokenUrl(), nil, header)
+	resp, err := Request(SafelineRequest.GetTOKEN, url.AuthTokenUrl(), nil, header)
 	if err != nil {
-		return safeLineApi.AuthTokenResp{}, 0, err
+		return SafelineRequest.AuthTokenResp{}, 0, err
 	}
 	defer resp.Body.Close()
 	data, _ := io.ReadAll(resp.Body)
-	var authTokenResp safeLineApi.AuthTokenResp
+	var authTokenResp SafelineRequest.AuthTokenResp
 	authTokenResp.Unmarshal(data)
 	return authTokenResp, resp.StatusCode, nil
 }

pkg/utils/List.go

@@ -1,14 +1,14 @@
 package utils
 
 import (
+	"SafelineAPI/internal/app/SafelineRequest"
 	"SafelineAPI/internal/app/logger"
-	"SafelineAPI/internal/app/safeLineApi"
 	"io"
 	"net/http"
 	"os"
 )
 
-func GetList(url *safeLineApi.URL, token string) safeLineApi.Nodes {
+func GetList(url *SafelineRequest.URL, token string) []SafelineRequest.Nodes {
 	header := http.Header{
 		"X-SLCE-API-TOKEN": []string{token},
 	}
@@ -19,7 +19,7 @@ func GetList(url *safeLineApi.URL, token string) safeLineApi.Nodes {
 	}
 	defer resp.Body.Close()
 	data, _ := io.ReadAll(resp.Body)
-	var listResp safeLineApi.ListResp
+	var listResp SafelineRequest.ListResp
 	listResp.Unmarshal(data)
 	return listResp.Data.Nodes
 }

pkg/utils/Upsert.go

@@ -1,13 +1,13 @@
 package utils
 
 import (
+	"SafelineAPI/internal/app/SafelineRequest"
 	"SafelineAPI/internal/app/logger"
-	"SafelineAPI/internal/app/safeLineApi"
 	"io"
 	"net/http"
 )
 
-func Upsert(url *safeLineApi.URL, token string, body io.Reader) safeLineApi.UpsertResp {
+func Upsert(url *SafelineRequest.URL, token string, body io.Reader) SafelineRequest.UpsertResp {
 	header := http.Header{
 		"X-SLCE-API-TOKEN": []string{token},
 		"Content-Type":     []string{"application/json"},
@@ -15,11 +15,11 @@ func Upsert(url *safeLineApi.URL, token string, body io.Reader) safeLineApi.Upse
 	resp, err := Request(UPSERT, url.SSLCertUrl(), body, header)
 	if err != nil {
 		logger.Error.Printf("更新证书时发生错误: %s%s%s", logger.Red, err, logger.Reset)
-		return safeLineApi.UpsertResp{}
+		return SafelineRequest.UpsertResp{}
 	}
 	defer resp.Body.Close()
 	data, _ := io.ReadAll(resp.Body)
-	var upsertResp safeLineApi.UpsertResp
+	var upsertResp SafelineRequest.UpsertResp
 	upsertResp.Unmarshal(data)
 	return upsertResp
 }

pkg/utils/kvp.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"strings"
+)
+
+type KVPair map[string]string
+
+func (kvp *KVPair) Set(str string) {
+	kvps := strings.Split(str, ",")
+	for _, i := range kvps {
+		kv := strings.SplitN(i, "=", 2)
+		(*kvp)[kv[0]] = kv[1]
+	}
+}