mm_ret 1.4.5 → 1.4.6

package/lib/error.js

@@ -23,31 +23,31 @@ class Error {
             "zh-CN": {
                 "10000": "业务逻辑错误",
                 "0": "成功",
-                "‌100": "继续",
-                "‌101": "切换协议‌",
-                "‌200": "确定",
-                "‌201": "已创建",
-                "‌202": "已接受",
-                "‌204": "无内容",
-                "‌301": "已永久移动",
-                "‌302": "已找到",
-                "‌303": "见其他",
-                "‌304": "未修改",
-                "‌307": "临时重定向‌",
-                "‌400": "错误请求",
-                "‌401": "未授权",
-                "‌403": "禁止访问",
-                "‌404": "未找到",
-                "‌405": "方法不允许",
-                "‌408": "请求超时",
-                "‌413": "Payload Too Large",
-                "‌415": "不支持的媒体类型",
-                "‌429": "请求过多",
-                "‌500": "内部服务器错误",
-                "‌501": "未实现",
-                "‌502": "错误网关",
-                "‌503": "服务不可用",
-                "‌504": "网关超时",
+                "100": "继续",
+                "101": "切换协议",
+                "200": "确定",
+                "201": "已创建",
+                "202": "已接受",
+                "204": "无内容",
+                "301": "已永久移动",
+                "302": "已找到",
+                "303": "见其他",
+                "304": "未修改",
+                "307": "临时重定向",
+                "400": "错误请求",
+                "401": "未授权",
+                "403": "禁止访问",
+                "404": "未找到",
+                "405": "方法不允许",
+                "408": "请求超时",
+                "413": "Payload Too Large",
+                "415": "不支持的媒体类型",
+                "429": "请求过多",
+                "500": "内部服务器错误",
+                "501": "未实现",
+                "502": "错误网关",
+                "503": "服务不可用",
+                "504": "网关超时",
                 "-32700": "格式错误",
                 "-32701": "不支持的编码",
                 "-32702": "编码中包含无效字符",
@@ -66,31 +66,31 @@ class Error {
             "en-US": {
                 "10000": "business logic error",
                 "0": "success",
-                "‌100": "Continue",
-                "‌101": "Switching Protocols‌",
-                "‌200": "OK",
-                "‌201": "Created",
-                "‌202": "Accepted",
-                "‌204": "No Content",
-                "‌301": "Moved Permanently",
-                "‌302": "Found",
-                "‌303": "See Other",
-                "‌304": "Not Modified‌",
-                "‌307": "Temporary Redirect‌",
-                "‌400": "Bad Request",
-                "‌401": "Unauthorized",
-                "‌403": "Forbidden",
-                "‌404": "Not Found",
-                "‌405": "Method Not Allowed",
-                "‌408": "Request Timeout",
-                "‌413": "Payload Too Large",
-                "‌415": "Unsupported Media Type",
-                "‌429": "Too Many Requests‌",
-                "‌500": "Internal Server Error",
-                "‌501": "Not Implemented",
-                "‌502": "Bad Gateway",
-                "‌503": "Service Unavailable",
-                "‌504": "Gateway Timeout",
+                "100": "Continue",
+                "101": "Switching Protocols",
+                "200": "OK",
+                "201": "Created",
+                "202": "Accepted",
+                "204": "No Content",
+                "301": "Moved Permanently",
+                "302": "Found",
+                "303": "See Other",
+                "304": "Not Modified",
+                "307": "Temporary Redirect",
+                "400": "Bad Request",
+                "401": "Unauthorized",
+                "403": "Forbidden",
+                "404": "Not Found",
+                "405": "Method Not Allowed",
+                "408": "Request Timeout",
+                "413": "Payload Too Large",
+                "415": "Unsupported Media Type",
+                "429": "Too Many Requests",
+                "500": "Internal Server Error",
+                "501": "Not Implemented",
+                "502": "Bad Gateway",
+                "503": "Service Unavailable",
+                "504": "Gateway Timeout",
                 "-32700": "not well formed",
                 "-32701": "unsupported encoding",
                 "-32702": "invalid character for encoding",
@@ -126,7 +126,7 @@ Error.prototype.setConfig = function (config) {
 Error.prototype.get = function (code) {
     const lang = this._config.lang;
     const lang_pack = this._langs[lang];
-
+    
     if (lang_pack && lang_pack[code]) {
         return lang_pack[code];
     }

package/lib/ret.js

@@ -95,8 +95,10 @@ Ret.prototype._getMessage = function (code) {
  */
 Ret.prototype._toJsonRPC = function (result, error, id, diy = false) {
 	const ret = {
-		id
 	};
+	if (id) {
+		ret.id = id;
+	}
 
 	if (result) {
 		ret.result = result;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_ret",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "description": "这是超级美眉http请求结果输出类函数模块，用于输出json-rpc2.0标准结果",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -88,6 +88,9 @@ function reqDemo() {
 	$.log.debug("=== 测试JSON-RPC风格请求 进，RESTful风格请求 出 === ");
 	$.req.setFormat("json-rpc");
 	reqTest(new Req({ format: "restful" }));
+
+	var rest = $.ret.error(404, 'Not Found');
+	console.log("这hi", rest);
 }
 
 reqDemo();