cgserver 9.2.1 → 9.2.3

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

@@ -4,14 +4,13 @@ exports.Config = void 0;
 const fs = require("fs");
 const jsonc_1 = require("jsonc");
 class Config {
-    _suffix = "";
     _is_init = false;
     _file_name = "";
     /**
      * 是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
      */
     static debug = false;
-    static rootDataDir = "data/";
+    static rootDataDir = "data";
     constructor(filename) {
         this._file_name = filename;
     }
@@ -19,27 +18,18 @@ class Config {
         if (this._is_init) {
             return false;
         }
-        let suffix2 = "_r";
+        if (Config.rootDataDir.endsWith("/")) {
+            Config.rootDataDir = Config.rootDataDir.substring(0, Config.rootDataDir.length - 1);
+        }
+        let suffix2 = "/";
         if (Config.debug) {
-            suffix2 = "_d";
+            suffix2 = "_d/";
         }
-        let path = Config.rootDataDir + this._file_name + "_" + this._suffix + suffix2 + ".json";
+        let path = Config.rootDataDir + suffix2 + this._file_name + ".json";
         path = path.toLowerCase();
         if (!fs.existsSync(path)) {
-            path = Config.rootDataDir + this._file_name + "_" + this._suffix + ".json";
-            path = path.toLowerCase();
-            if (!fs.existsSync(path)) {
-                path = Config.rootDataDir + this._file_name + suffix2 + ".json";
-                path = path.toLowerCase();
-                if (!fs.existsSync(path)) {
-                    path = Config.rootDataDir + this._file_name + ".json";
-                    path = path.toLowerCase();
-                    if (!fs.existsSync(path)) {
-                        console.error(path + " not exist!");
-                        return true;
-                    }
-                }
-            }
+            console.error(path + " not exist!");
+            return false;
         }
         let content = fs.readFileSync(path).toString();
         let jsonData = jsonc_1.jsonc.parse(content);

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

@@ -11,7 +11,6 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     }
     constructor(server_name) {
         super();
-        this._suffix = server_name;
         this._server_name = server_name;
     }
     init() {

package/dist/lib/Framework/Database/MysqlBaseService.js

@@ -5,7 +5,6 @@ const Property_1 = require("./Decorator/Property");
 const MysqlManager_1 = require("./MysqlManager");
 const Log_1 = require("../Logic/Log");
 const DBCache_1 = require("./Decorator/DBCache");
-const IServerConfig_1 = require("../Config/IServerConfig");
 class BaseModel {
 }
 exports.BaseModel = BaseModel;
@@ -42,7 +41,7 @@ class MysqlBaseService {
             throw new Error("数据表的类必须要具有Table装饰器");
         }
         this._table = "`" + table.table + "`";
-        if (!IServerConfig_1.GServerCfg.db.mysql.auto) {
+        if (!MysqlManager_1.GMysqlMgr.cfg.auto) {
             //未开启自动创建数据表
             return;
         }

package/dist/lib/Framework/Database/MysqlManager.js

@@ -34,6 +34,10 @@ class MysqlManager {
     get isValid() {
         return !!this._pool;
     }
+    _cfg = null;
+    get cfg() {
+        return this._cfg;
+    }
     constructor() {
     }
     async init(cfg) {
@@ -42,6 +46,7 @@ class MysqlManager {
             || !cfg.open) {
             return;
         }
+        this._cfg = cfg;
         this._pool = mysql2.createPool(cfg.poolcfg);
         console.log("mysql config=" + JSON.stringify(cfg));
         //这个的初始化位置不能变，必须位于cbs前，pool后

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

@@ -1,5 +1,4 @@
 export declare class Config {
-    protected _suffix: string;
     protected _is_init: boolean;
     protected _file_name: string;
     /**

package/dist/types/Framework/Database/MysqlManager.d.ts

@@ -20,6 +20,8 @@ declare class MysqlManager {
     protected _init_cbs: any[];
     protected _pool: mysql2.Pool;
     get isValid(): boolean;
+    protected _cfg: MysqlConfig;
+    get cfg(): MysqlConfig;
     constructor();
     init(cfg: MysqlConfig): Promise<void>;
     registerInitCb(cb: Function): void;

package/package.json

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