fix: fix gbk text

nacos-group · Mar 31, 2019 · 93c3559 · 93c3559
1 parent 2942e19
commit 93c3559
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/packages/nacos-config/package.json b/packages/nacos-config/package.json
@@ -26,7 +26,7 @@
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.9.4",
     "contributors": "^0.5.1",
-    "midway-bin": "^0.3.2",
+    "midway-bin": "1",
     "mm": "^2.4.1",
     "pedding": "^1.1.0",
     "tslint": "^5.11.0",

diff --git a/packages/nacos-config/src/http_agent.ts b/packages/nacos-config/src/http_agent.ts
@@ -18,7 +18,7 @@ import { HTTP_CONFLICT, HTTP_NOT_FOUND, HTTP_OK, VERSION } from './const';
 import { ClientOptionKeys, IConfiguration, IServerListManager } from './interface';
 import * as urllib from 'urllib';
 import * as crypto from 'crypto';
-import { encodingParams } from './utils';
+import { encodingParams, transformGBKToUTF8 } from './utils';
 
 export class HttpAgent {
 
@@ -153,7 +153,7 @@ export class HttpAgent {
         this.debug('%s %s, got %s, body: %j', method, url, res.status, res.data);
         switch (res.status) {
           case HTTP_OK:
-            return res.data;
+            return this.decodeResData(res, method);
           case HTTP_NOT_FOUND:
             return null;
           case HTTP_CONFLICT:
@@ -199,4 +199,17 @@ export class HttpAgent {
     return `${url}/${this.contextPath}`;
   }
 
+  decodeResData(res, method = 'GET') {
+    if (method === 'GET' && /charset=GBK/.test(res.headers[ 'content-type' ]) && this.defaultEncoding === 'utf8') {
+      try {
+        return transformGBKToUTF8(res.data);
+      } catch (err) {
+        console.error(`transform gbk data to utf8 error, msg=${err.messager}`);
+        return res.data;
+      }
+    } else {
+      return res.data;
+    }
+  }
+
 }
diff --git a/packages/nacos-config/src/utils.ts b/packages/nacos-config/src/utils.ts
@@ -74,3 +74,8 @@ export function checkParameters(dataIds, group, datumId?) {
     assert(exports.isValid(datumId), `[datumId] only allow digital, letter and symbols in [ "_", "-", ".", ":" ], but got ${datumId}`);
   }
 }
+
+
+export function transformGBKToUTF8(text) {
+  return iconv.decode(iconv.encode(text, 'gbk'), 'utf8');
+}