Merge pull request #11 from ArtisanCloud/develop

Develop
ArtisanCloud · Feb 10, 2025 · 6093525 · 6093525
2 parents d7c7729 + 438e1af
commit 6093525
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/internal/kernel/accessToken.go b/internal/kernel/accessToken.go
@@ -96,11 +96,11 @@ func (acHandler *AccessTokenHandler) OverrideGetMiddlewareOfLog() {
 			return func(request *http.Request) (response *http.Response, err error) {
 				l = l.WithContext(request.Context())
 
-				request2.LogRequest(l, request)
+				request2.LogRequest(acHandler.Config.HttpDebug, l, request)
 				response, err = handle(request)
 				if err == nil {
 					l.WithContext(request.Context())
-					response2.LogResponse(l, response)
+					response2.LogResponse(acHandler.Config.HttpDebug, l, response)
 				}
 				return response, err
 			}

diff --git a/internal/kernel/baseClient.go b/internal/kernel/baseClient.go
@@ -112,11 +112,11 @@ func (client *BaseClient) OverrideGetMiddlewareOfLog() {
 			return func(request *http.Request) (response *http.Response, err error) {
 				l = l.WithContext(request.Context())
 
-				request2.LogRequest(l, request)
+				request2.LogRequest(client.Config.HttpDebug, l, request)
 				response, err = handle(request)
 				if err == nil {
 					l.WithContext(request.Context())
-					response2.LogResponse(l, response)
+					response2.LogResponse(client.Config.HttpDebug, l, response)
 				}
 				return response, err
 			}

diff --git a/internal/kernel/request/log.go b/internal/kernel/request/log.go
@@ -8,7 +8,10 @@ import (
 	"net/http"
 )
 
-func LogRequest(logger *logger.Logger, request *http.Request) {
+func LogRequest(needLog bool, logger *logger.Logger, request *http.Request) {
+	if !needLog {
+		return
+	}
 	var output bytes.Buffer
 	// 前置中间件
 	output.WriteString(fmt.Sprintf("%s %s ", request.Method, request.URL.String()))

diff --git a/internal/kernel/response/log.go b/internal/kernel/response/log.go
@@ -7,7 +7,10 @@ import (
 	"net/http/httputil"
 )
 
-func LogResponse(l *logger.Logger, response *http.Response) {
+func LogResponse(needLog bool, l *logger.Logger, response *http.Response) {
+	if !needLog {
+		return
+	}
 	var output bytes.Buffer
 	output.Write([]byte("------------------"))
 	output.Write([]byte("response content:"))

diff --git a/internal/kernel/response/parse.go b/internal/kernel/response/parse.go
@@ -26,7 +26,7 @@ func ParseResponseToObject(res *http.Response, obj interface{}) error {
 	}
 
 	// 打印响应内容 (可选)
-	fmt.Printf("Response Body: %s\n", string(bodyBytes))
+	//fmt.Printf("Response Body: %s\n", string(bodyBytes))
 
 	// 将响应体内容解析到目标对象
 	err = json.Unmarshal(bodyBytes, obj)

diff --git a/internal/service/wechat/officialAccount/publish/response/publish.go b/internal/service/wechat/officialAccount/publish/response/publish.go
@@ -23,7 +23,7 @@ type PublishGetRes struct {
 
 	PublishId     uint64         `json:"publish_id"`
 	PublishStatus int            `json:"publish_status"`
-	ArticleId     interface{}    `json:"article_id"`
+	ArticleId     string         `json:"article_id"`
 	ArticleDetail *ArticleDetail `json:"article_detail"`
 	FailIdx       []int          `json:"fail_idx"`
 }

diff --git a/pkg/client/config/config.go b/pkg/client/config/config.go
@@ -7,16 +7,16 @@ type MediaXConfig struct {
 }
 
 type LocalConfig struct {
-	*WeChatOfficialAccountConfig `yaml:"wechat_config" json:"weChatConfig"`
-	*DouYinConfig                `yaml:"douyin_config" json:"douYinConfig"`
-	*RedBookConfig               `yaml:"redbook_config" json:"redBookConfig"`
+	*WeChatOfficialAccountConfig `yaml:"wechat_config" json:"wechat_config"`
+	*DouYinConfig                `yaml:"douyin_config" json:"douyin_config"`
+	*RedBookConfig               `yaml:"redbook_config" json:"redbook_config"`
 }
 
 type AppConfig struct {
-	BaseUri   string  `yaml:"base_uri" json:"baseUri"`
-	ProxyUri  string  `yaml:"proxy_uri" json:"proxyUri"`
+	BaseUri   string  `yaml:"base_uri" json:"base_uri"`
+	ProxyUri  string  `yaml:"proxy_uri" json:"proxy_uri"`
 	Timeout   float64 `yaml:"timeout" json:"timeout"`
-	AppID     string  `yaml:"app_id" json:"appId"`
-	AppSecret string  `yaml:"app_secret" json:"appSecret"`
-	HttpDebug bool    `yaml:"http_debug" json:"httpDebug"`
+	AppID     string  `yaml:"app_id" json:"app_id"`
+	AppSecret string  `yaml:"app_secret" json:"app_secret"`
+	HttpDebug bool    `yaml:"http_debug" json:"http_debug"`
 }