commit

plugin-compile/package/config/c_log/log_config.go → common/config/c_log/log_config.go

@@ -1,7 +1,7 @@
 package c_log
 
 import (
-	"cicv-data-closedloop/pji/common/cutil"
+	"cicv-data-closedloop/common/util"
 	"fmt"
 	"github.com/sirupsen/logrus"
 	"os"
@@ -13,16 +13,14 @@ import (
 var GlobalLogger *logrus.Logger
 
 // InitLog 初始化日志配置
-func InitLog() {
-	initGlobalLogger()
-}
-
-// initGlobalLogger 初始化日志配置
-func initGlobalLogger() {
+func InitLog(prefix string) {
 	time.Sleep(time.Duration(1) * time.Second)
 	// 创建、追加、读写，777，所有权限
-	logPath := "./log/plugin-compile-" + time.Now().Format("2006-01-02-15-04-05") + ".log"
-	cutil.CreateParentDir(logPath)
+	logPath := "./log/" + prefix + "-" + time.Now().Format("2006-01-02-15-04-05") + ".log"
+	err := util.CreateParentDir(logPath)
+	if err != nil {
+		os.Exit(-1)
+	}
 	f, err := os.OpenFile(logPath, os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
 	if err != nil {
 		os.Exit(-1)

plugin-compile/package/handler/h_validate_request_header/validate_request_header.go → common/handler/h_validate_request_header/validate_request_header.go

@@ -1,8 +1,8 @@
 package h_validate_request_header
 
 import (
-	"cicv-data-closedloop/plugin-compile/package/config/c_log"
-	"cicv-data-closedloop/plugin-compile/package/entity"
+	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/entity"
 	"encoding/json"
 	"fmt"
 	"net/http"

common/util/u_http.go

@@ -0,0 +1,101 @@
+package util
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/url"
+)
+
+func HttpGet(url string) (string, error) {
+	// 创建一个HTTP客户端
+	client := &http.Client{}
+
+	// 创建一个GET请求
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return "", err
+	}
+
+	// 发送请求并获取响应
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+
+		}
+	}(resp.Body)
+
+	// 读取响应的内容
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	return string(body), nil
+}
+func HttpPostJsonResponseString(url string, params map[string]string) (string, error) {
+	jsonData, err := json.Marshal(params)
+	if err != nil {
+		return "", err
+	}
+	resp, err := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
+	if err != nil {
+		return "", err
+	}
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+		}
+	}(resp.Body)
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	return string(body), nil
+}
+
+func HttpGetStringAddHeadersResponseString(baseUrl string, headers map[string]string, params map[string]string) (string, error) {
+
+	// 将参数编码到URL中
+	u, _ := url.Parse(baseUrl)
+	q := u.Query()
+	for key, value := range params {
+		q.Add(key, value)
+	}
+	u.RawQuery = q.Encode()
+
+	// 创建请求
+	req, err := http.NewRequest("GET", u.String(), nil)
+	if err != nil {
+		return "", err
+	}
+
+	// 设置请求头
+	for key, value := range headers {
+		req.Header.Set(key, value)
+	}
+
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+
+	// 读取响应体
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return "", err
+	}
+	result := string(body)
+	//log.GlobalLogger.Info("发送http请求，请求路径=", baseUrl, "，请求头=", headers, "请求参数=", params, "请求结果=", result)
+	return result, nil
+}

common/util/u_io.go

@@ -0,0 +1,26 @@
+package util
+
+import (
+	"cicv-data-closedloop/pji/common/log"
+	"os"
+	"path/filepath"
+)
+
+func CreateDir(directory string) {
+	// 检查目录是否存在
+	if _, err := os.Stat(directory); os.IsNotExist(err) {
+		// 如果目录不存在，创建父目录
+		err := os.MkdirAll(directory, os.ModePerm)
+		if err != nil {
+			log.GlobalLogger.Info("创建目录时发生错误", err)
+		}
+	}
+}
+
+// CreateParentDir 存在不创建，不存在则创建父目录
+func CreateParentDir(filePath string) error {
+	if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
+		return err
+	}
+	return nil
+}

common/util/u_json.go

@@ -0,0 +1,13 @@
+package util
+
+import "encoding/json"
+
+func JsonStringToMap(source string) (map[string]interface{}, error) {
+	var dataMap map[string]interface{}
+	err := json.Unmarshal([]byte(source), &dataMap)
+	if err != nil {
+		return nil, err
+	} else {
+		return dataMap, nil
+	}
+}

common/util/u_time.go

@@ -0,0 +1,9 @@
+package util
+
+import "time"
+
+func GetNowTimeCustom() string {
+	currentTime := time.Now()
+	formattedTime := currentTime.Format("2006-01-02-15-04-05")
+	return formattedTime
+}

plugin-compile/main/main.go

@@ -1,18 +1,18 @@
 package main
 
 import (
-	"cicv-data-closedloop/plugin-compile/package/config/c_log"
+	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/handler/h_validate_request_header"
 	"cicv-data-closedloop/plugin-compile/package/config/c_nacos"
 	"cicv-data-closedloop/plugin-compile/package/config/c_oss"
 	"cicv-data-closedloop/plugin-compile/package/handler/h_compile_plugin"
-	"cicv-data-closedloop/plugin-compile/package/handler/h_validate_request_header"
 	"fmt"
 	"net/http"
 )
 
 func init() {
 	// 初始化日志配置
-	c_log.InitLog()
+	c_log.InitLog("plugin-compile")
 	c_oss.InitOss()
 	c_nacos.InitNacos()
 }

plugin-compile/package/config/c_nacos/nacos_config.go

@@ -1,7 +1,7 @@
 package c_nacos
 
 import (
-	"cicv-data-closedloop/plugin-compile/package/config/c_log"
+	"cicv-data-closedloop/common/config/c_log"
 	"fmt"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"

plugin-compile/package/handler/h_compile_plugin/compile_plugin.go

@@ -1,9 +1,9 @@
 package h_compile_plugin
 
 import (
-	"cicv-data-closedloop/plugin-compile/package/config/c_log"
+	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/plugin-compile/package/config/c_oss"
-	"cicv-data-closedloop/plugin-compile/package/entity"
 	"cicv-data-closedloop/plugin-compile/package/util"
 	"encoding/json"
 	"fmt"

x86_64/oss-config/main/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "cicv-data-closedloop/common/config/c_log"
+
+func init() {
+	c_log.InitLog("oss-config")
+}

x86_64/topic-filter/main/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "cicv-data-closedloop/common/config/c_log"
+
+func init() {
+	c_log.InitLog("topic-filter")
+}