magic模块更改

Scripts/util/MagicJS3.js

@@ -78,6 +78,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
     };
     const MagicLogger = (scriptName, logLevel = "INFO") => {
         let _level = logLevel;
+        let logSeparator = '\n';
         const logLevels = {
             SNIFFER: 6,
             DEBUG: 5,
@@ -99,6 +100,16 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             NONE: ""
         };
         const _log = (msg, level = "INFO") => {
+            // let level = "INFO";
+            // if (logs.length > 1) {
+            //     let lastParam = logs[logs.length-1];
+            //     let leveArr = ["SNIFFER","DEBUG","INFO","NOTIFY","WARNING","ERROR","RETRY"];
+            //     if(typeof(lastParam) == 'string' && leveArr.indexOf(lastParam) > 0){
+            //         level = lastParam;
+            //         logs.length = logs.length-1;
+            //     }
+            // }
+            // let msg = logs.join('\n');
             if (!(logLevels[_level] < logLevels[level.toUpperCase()])) console.log(`██[${scriptName}][${level}]`+''+`${logEmoji[level.toUpperCase()]}${msg}`+'\n'+``);
         };
         const setLevel = logLevel => {
@@ -109,28 +120,36 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
                 return _level;
             },
             setLevel: setLevel,
-            sniffer: msg => {
+            sniffer: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "SNIFFER");
             },
-            log: msg => {
+            log: (...logs) => {
+                let msg = logs.join(logSeparator);
                 console.log(`██[${scriptName}]`+''+`${msg}`+'\n'+``);
             },
-            debug: msg => {
+            debug: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "DEBUG");
             },
-            info: msg => {
+            info: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "INFO");
             },
-            notify: msg => {
+            notify: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "NOTIFY");
             },
-            warning: msg => {
+            warning: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "WARNING");
             },
-            error: msg => {
+            error: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "ERROR");
             },
-            retry: msg => {
+            retry: (...logs) => {
+                let msg = logs.join(logSeparator);
                 _log(msg, "RETRY");
             }
         };
@@ -185,6 +204,22 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             }
         }
 
+        toStr(data, defVal=null){
+            try{
+                return JSON.stringify(data);
+            }catch{
+                return defVal;
+            }
+        }
+
+        toObj(str, defVal=null){
+            try{
+                return JSON.parse(str);
+            }catch{
+                return defVal;
+            }
+        }
+
         checkRecordRequestBody() {
             if (!this.isRequest) {
                 return;