|
|
@@ -414,7 +414,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
|
|
|
this.post(options, err => {});
|
|
|
}
|
|
|
log(msg, level = "INFO") {
|
|
|
- if (!(this.logLevels[this._logLevel] < this.logLevels[level.toUpperCase()])) console.log(`██[${level}] [${this.scriptName}]`+'\n'+`${msg}`+'\n');
|
|
|
+ if (!(this.logLevels[this._logLevel] < this.logLevels[level.toUpperCase()])) console.log(`██[${level}]`+'-'+`${msg}`+'\n');
|
|
|
}
|
|
|
logDebug(msg) {
|
|
|
this.log(msg, "DEBUG");
|
|
|
@@ -603,10 +603,21 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
|
|
|
$http.post(_options, {});
|
|
|
}
|
|
|
}
|
|
|
+ costTime() {
|
|
|
+ let info = `${this.scriptName}执行完毕!`
|
|
|
+ // if (this.isNode && this.isExecComm) {
|
|
|
+ // info = `指令【${this.comm[1]}】执行完毕!`
|
|
|
+ // }
|
|
|
+ this._endTime = new Date().getTime();
|
|
|
+ const ms = this._endTime - this._startTime;
|
|
|
+ const costTime = ms / 1000;
|
|
|
+ this.log(`${info}耗时【${costTime}】秒`);
|
|
|
+ }
|
|
|
done(value = {}) {
|
|
|
- this._endTime = Date.now();
|
|
|
- let span = (this._endTime - this._startTime) / 1e3;
|
|
|
- magicJS.logDebug(`SCRIPT COMPLETED: ${span}S.`);
|
|
|
+ // this._endTime = Date.now();
|
|
|
+ // let span = (this._endTime - this._startTime) / 1e3;
|
|
|
+ // this.log(`SCRIPT COMPLETED: ${span}S.`);
|
|
|
+ this.costTime();
|
|
|
if (typeof $done !== "undefined") {
|
|
|
$done(value);
|
|
|
}
|