cgserver 11.2.1 → 11.2.3

package/README.md

@@ -1,3 +1,5 @@
+11.2.2
+1、日志默认log
 11.2.1
 1、日志新配置
 2、新rpc

package/dist/lib/Framework/Config/FrameworkConfig.js

@@ -93,15 +93,11 @@ class AlipayConfig {
     notify_url_dev;
 }
 class FrameworkConfig extends Config_1.Config {
-    /*
-    *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
-    */
-    console_level = 0;
     log = {
         appenders: {
             console: {
-                "type": "console",
-                "category": "console"
+                type: "console",
+                category: "console"
             },
             log_file: {
                 category: "log_file",
@@ -143,23 +139,15 @@ class FrameworkConfig extends Config_1.Config {
         },
         categories: {
             default: {
-                appenders: ['log_file'],
-                level: 'ALL'
-            },
-            console: {
-                appenders: ['console'],
-                level: 'ALL'
-            },
-            logger: {
-                appenders: ['log_file'],
+                appenders: ['log_file', 'console'],
                 level: 'ALL'
             },
             client_logger: {
-                appenders: ['client_log_file'],
+                appenders: ['client_log_file', 'console'],
                 level: 'ALL'
             },
             error_logger: {
-                appenders: ['error_log_file'],
+                appenders: ['error_log_file', 'console'],
                 level: 'ALL'
             }
         }
@@ -178,7 +166,7 @@ class FrameworkConfig extends Config_1.Config {
     }
     init() {
         let ret = super.init();
-        Log_1.gLog.init(this.log, this.console_level || 0);
+        Log_1.gLog.init(this.log);
         return ret;
     }
 }

package/dist/lib/Framework/Logic/Log.js

@@ -26,25 +26,17 @@ class Log {
     //error and warn
     _error_logger = null;
     _inited = false;
-    /**
-     * 该level只是用来控制控制台的显示的
-     * -1不输出到console，0，仅错误信息输出到console，1，都输出到console
-     */
-    _console_level = 0;
-    init(cfg, console_level = 0) {
+    init(cfg) {
         if (this._inited) {
             return;
         }
         this._inited = true;
-        this._console_level = console_level;
         if (!cfg) {
             return;
         }
         colors.enable();
         log4js.configure(cfg);
-        if (cfg.categories.logger && cfg.categories.logger.appenders.length > 0) {
-            this._logger = log4js.getLogger("logger");
-        }
+        this._logger = log4js.getLogger();
         if (cfg.categories.client_logger) {
             this._client_logger = log4js.getLogger("client_logger");
         }
@@ -66,26 +58,14 @@ class Log {
     error(message) {
         message = this._convertMsg(message);
         this._error_logger?.error(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.error(time_str + " " + message);
-        }
     }
     info(message) {
         message = this._convertMsg(message);
         this._logger?.info(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.log(time_str + " " + message);
-        }
     }
     warn(message) {
         message = this._convertMsg(message);
         this._error_logger?.warn(message);
-        if (this._console_level >= 0) {
-            let time_str = this._getTimeStr();
-            console.warn(time_str + " " + message);
-        }
     }
     record(message) {
         this.info(message);
@@ -94,12 +74,6 @@ class Log {
         message = this._convertMsg(message);
         this._client_logger?.info(message);
     }
-    _getTimeStr() {
-        let time = new Date();
-        let time_str = this._format(time, "[YYYY-MM-DD HH:mm:SS.");
-        time_str += time.getMilliseconds() + "]";
-        return time_str;
-    }
     _isObject(param) {
         return typeof (param) === "object";
     }
@@ -109,42 +83,6 @@ class Log {
     _isNumber(param) {
         return typeof (param) === "number";
     }
-    _format(src, formatStr) {
-        if (this._isString(src)) {
-            let args = Array.prototype.slice.call(arguments, 1);
-            return src.replace(/\{(\d+)\}/g, function (m, i) {
-                return args[i];
-            });
-        }
-        else {
-            if (this._isNumber(src)) {
-                src = new Date(src);
-            }
-            let str = formatStr;
-            let Week = ['日', '一', '二', '三', '四', '五', '六'];
-            let month = src.getMonth() + 1;
-            let year = src.getFullYear();
-            let date = src.getDate();
-            let hour = src.getHours();
-            let min = src.getMinutes();
-            let sec = src.getSeconds();
-            let day = src.getDay();
-            str = str.replace(/yyyy|YYYY/, year);
-            str = str.replace(/yy|YY/, (year % 100) > 9 ? (year % 100).toString() : '0' + (year % 100));
-            str = str.replace(/MM/, month > 9 ? month.toString() : '0' + month);
-            str = str.replace(/M/g, month);
-            str = str.replace(/w|W/g, Week[day]);
-            str = str.replace(/dd|DD/, date > 9 ? date.toString() : '0' + date);
-            str = str.replace(/d|D/g, date);
-            str = str.replace(/hh|HH/, hour > 9 ? hour.toString() : '0' + hour);
-            str = str.replace(/h|H/g, hour);
-            str = str.replace(/mm/, min > 9 ? min.toString() : '0' + min);
-            str = str.replace(/m/g, min);
-            str = str.replace(/ss|SS/, sec > 9 ? sec.toString() : '0' + sec);
-            str = str.replace(/s|S/g, sec);
-            return str;
-        }
-    }
 }
 exports.Log = Log;
 exports.gLog = new Log();

package/dist/types/Framework/Config/FrameworkConfig.d.ts

@@ -102,7 +102,6 @@ declare class AlipayConfig {
     notify_url_dev: "";
 }
 export declare class FrameworkConfig extends Config {
-    console_level: number;
     log: {
         appenders: {
             console: {
@@ -152,14 +151,6 @@ export declare class FrameworkConfig extends Config {
                 appenders: string[];
                 level: string;
             };
-            console: {
-                appenders: string[];
-                level: string;
-            };
-            logger: {
-                appenders: string[];
-                level: string;
-            };
             client_logger: {
                 appenders: string[];
                 level: string;

package/dist/types/Framework/Logic/Log.d.ts

@@ -4,22 +4,15 @@ export declare class Log {
     protected _client_logger: log4js.Logger;
     protected _error_logger: log4js.Logger;
     protected _inited: boolean;
-    /**
-     * 该level只是用来控制控制台的显示的
-     * -1不输出到console，0，仅错误信息输出到console，1，都输出到console
-     */
-    protected _console_level: number;
-    init(cfg?: log4js.Configuration, console_level?: number): void;
+    init(cfg?: log4js.Configuration): void;
     protected _convertMsg(message?: any): any;
     error(message?: any): void;
     info(message: any): void;
     warn(message?: any): void;
     record(message?: any): void;
     clientLog(message?: any): void;
-    protected _getTimeStr(): any;
     protected _isObject(param: any): boolean;
     protected _isString(param: any): boolean;
     protected _isNumber(param: any): boolean;
-    protected _format(src: any, formatStr: any): any;
 }
 export declare let gLog: Log;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "11.2.1",
+  "version": "11.2.3",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",