fixed gbk issue.

whhh233 · Feb 25, 2020 · c6d2b76 · c6d2b76
1 parent c70303e
commit c6d2b76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Proxy.js b/Proxy.js
@@ -188,8 +188,7 @@ let Proxy = ({httpprefix, serverName, port, cookieDomainRewrite, locationReplace
                 logSave(`utf-8 text...`)
                 let originBody = gunzipped
                 body = gunzipped.toString('utf-8');
-                if (body.indexOf('="text/html; charset=gb') !== -1 ||
-                    body.indexOf('=\'text/html; charset=gb') !== -1) {
+                if (body.indexOf(' charset=gb') !== -1) {
                     logSave(`gb2312 found...`)
                     body = iconv.decode(originBody, 'gbk')
                     gbFlag = true
@@ -206,8 +205,7 @@ let Proxy = ({httpprefix, serverName, port, cookieDomainRewrite, locationReplace
             logSave(`utf-8 text...`)
             let originBody = body
             body = body.toString('utf-8');
-            if (body.indexOf('="text/html; charset=gb') !== -1 ||
-                body.indexOf('=\'text/html; charset=gb') !== -1) {
+            if (body.indexOf(' charset=gb') !== -1) {
               logSave(`gb2312 found...`)
               body = iconv.decode(originBody, 'gbk')
               gbFlag = true

diff --git a/test/siteproxylocal.test.js b/test/siteproxylocal.test.js
@@ -80,6 +80,6 @@ test('reuters.com /article issue', async () => {
     method: 'get',
     url,
   })
-  console.log(`${response.data}`)
+  // console.log(`${response.data}`)
   expect(response.data.indexOf(`"url":"/article`)).toBe(-1)
 }, 30000);