Update Env.js

解决Node.js环境下非UTF-8编码问题如：Node.js环境下设置this.encoding = 'GBK'即可
zhu1979 · Jul 26, 2021 · 34e5f4e · 34e5f4e
1 parent 4a828a7
commit 34e5f4e
Showing 1 changed file with 8 additions and 28 deletions.
diff --git a/Env.js b/Env.js
@@ -310,22 +310,12 @@ function Env(name, opts) {
           })
           .then(
             (resp) => {
-              if (this.encoding !== 'utf-8') {
-                const { statusCode: status, statusCode, headers, rawBody } = resp
-                callback(null, { status, statusCode, headers, rawBody }, iconv.decode(rawBody,this.encoding))
-              } else {
-                const { statusCode: status, statusCode, headers, body } = resp
-                callback(null, { status, statusCode, headers, body }, body)
-              }
+              const { statusCode: status, statusCode, headers, rawBody } = resp
+              callback(null, { status, statusCode, headers, rawBody }, iconv.decode(rawBody,this.encoding))
             },
             (err) => {
-              if (this.encoding !== 'utf-8') {
-                const { message: error, response: resp } = err
-                callback(error, resp, resp && iconv.decode(resp.rawBody,this.encoding))
-              } else {
-                const { message: error, response: resp } = err
-                callback(error, resp, resp && resp.body)
-              }
+              const { message: error, response: resp } = err
+              callback(error, resp, resp && iconv.decode(resp.rawBody,this.encoding))
             }
           )
       }
@@ -369,22 +359,12 @@ function Env(name, opts) {
         const { url, ..._opts } = opts
         this.got[method](url, _opts).then(
           (resp) => {
-            if (this.encoding !== 'utf-8') {
-              const { statusCode: status, statusCode, headers, rawBody } = resp
-              callback(null, { status, statusCode, headers, rawBody }, iconv.decode(rawBody,this.encoding))
-            } else {
-              const { statusCode: status, statusCode, headers, body } = resp
-              callback(null, { status, statusCode, headers, body }, body)
-            }
+            const { statusCode: status, statusCode, headers, rawBody } = resp
+            callback(null, { status, statusCode, headers, rawBody }, iconv.decode(rawBody,this.encoding))
           },
           (err) => {
-            if (this.encoding !== 'utf-8') {
-              const { message: error, response: resp } = err
-              callback(error, resp, resp && iconv.decode(resp.rawBody,this.encoding))
-            } else {
-              const { message: error, response: resp } = err
-              callback(error, resp, resp && resp.body)
-            }
+            const { message: error, response: resp } = err
+            callback(error, resp, resp && iconv.decode(resp.rawBody,this.encoding))
           }
         )
       }