From 9482887ab32c7e40fb47cb4c0dc0c8fa46cc9407 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Thu, 20 Jul 2023 19:57:18 +0800
Subject: [PATCH] modify resetUIA2Driver and uia2HttpRequest

---
 hrp/pkg/uixt/client.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/hrp/pkg/uixt/client.go b/hrp/pkg/uixt/client.go
index 766f4849..287f475d 100644
--- a/hrp/pkg/uixt/client.go
+++ b/hrp/pkg/uixt/client.go
@@ -93,14 +93,14 @@ func (wd *Driver) httpRequest(method string, rawURL string, rawBody []byte) (raw
 	return
 }
 
-func (wd *Driver) resetUIA2Driver() (string, error) {
+func (wd *Driver) resetUIA2Driver() error {
 	ud, err := NewUIADriver(NewCapabilities(), wd.urlPrefix.String())
 	if err != nil {
-		return "", err
+		return err
 	}
 	wd.client = ud.client
 	wd.sessionId = ud.sessionId
-	return ud.sessionId, nil
+	return nil
 }
 
 func (wd *Driver) uia2HttpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
@@ -112,13 +112,12 @@ func (wd *Driver) uia2HttpRequest(method string, rawURL string, rawBody []byte,
 		}
 		// wait for UIA2 server to resume automatically
 		time.Sleep(3 * time.Second)
-		var oldSessionID, newSessionID string
-		oldSessionID = wd.sessionId
-		if newSessionID, err = wd.resetUIA2Driver(); err != nil {
-			log.Err(err).Msgf("failed to reset uia2 session, retry count: %v", retryCount)
+		oldSessionID := wd.sessionId
+		if err = wd.resetUIA2Driver(); err != nil {
+			log.Err(err).Msgf("failed to reset uia2 driver, retry count: %v", retryCount)
 			continue
 		}
-		log.Debug().Str("new session", newSessionID).Str("old session", oldSessionID).Msgf("successful to reset uia2 session, retry count: %v", retryCount)
+		log.Debug().Str("new session", wd.sessionId).Str("old session", oldSessionID).Msgf("successful to reset uia2 driver, retry count: %v", retryCount)
 		if oldSessionID != "" {
 			rawURL = strings.Replace(rawURL, oldSessionID, wd.sessionId, 1)
 		}