cgserver 10.0.13 → 10.0.15

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

@@ -11,7 +11,7 @@ class Config {
      * 是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
      */
     static debug = false;
-    static rootDataDir = "data";
+    static rootDataDir = "data/";
     constructor(filename) {
         this._file_name = filename;
     }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gServerCfg = exports.IServerConfig = void 0;
+const Log_1 = require("../Logic/Log");
 const FrameworkConfig_1 = require("./FrameworkConfig");
 class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     port = -1;
@@ -14,11 +15,15 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
         this._suffix = this._server_name;
     }
     init() {
+        if (exports.gServerCfg) {
+            Log_1.gLog.error("ServerConfig init must be unique");
+            return;
+        }
+        exports.gServerCfg = this;
         let ret = super.init();
         if (!ret) {
             return ret;
         }
-        exports.gServerCfg = this;
         return ret;
     }
 }

package/dist/lib/Framework/SocketServer/ISocketServer.js

@@ -5,7 +5,6 @@ const ws = require("websocket");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
-const IServerConfig_1 = require("../Config/IServerConfig");
 const Config_1 = require("../Config/Config");
 const cgserver_1 = require("../cgserver");
 const Log_1 = require("../Logic/Log");
@@ -58,8 +57,9 @@ class ISocketServer {
     }
     async run() {
         cgserver_1.gCgServer.addSocketServer(this);
-        let dbcfg = IServerConfig_1.gServerCfg.db;
-        await cgserver_1.gCgServer.initDb(dbcfg);
+        if (this._cfg.db) {
+            await cgserver_1.gCgServer.initDb(this._cfg.db);
+        }
         this.initWebSocket();
     }
     pause() {

package/dist/lib/Framework/WebServer/IWebServer.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IWebServer = void 0;
 const Engine_1 = require("./Engine/Engine");
 const RazorJs_1 = require("./Engine/RazorJs");
-const IServerConfig_1 = require("../Config/IServerConfig");
 const cgserver_1 = require("../cgserver");
 const EventTool_1 = require("../Logic/EventTool");
 const Log_1 = require("../Logic/Log");
+const IServerConfig_1 = require("../Config/IServerConfig");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -14,14 +14,18 @@ class IWebServer {
      * 启动服务器
      * @param server_index 这个是服务器的配置index
      */
-    async start(cfg) {
+    async start(cfg, dbcfg) {
         cgserver_1.gCgServer.addWebServer(this);
         if (!cfg) {
             Log_1.gLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        let dbcfg = IServerConfig_1.gServerCfg.db;
-        await cgserver_1.gCgServer.initDb(dbcfg);
+        if (!dbcfg && IServerConfig_1.gServerCfg) {
+            dbcfg = IServerConfig_1.gServerCfg.db;
+        }
+        if (dbcfg) {
+            await cgserver_1.gCgServer.initDb(dbcfg);
+        }
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());
         this._engine.start();

package/dist/lib/Framework/cgserver.js

@@ -41,6 +41,14 @@ class CgServer {
     get dataRootDir() {
         return Config_1.Config.rootDataDir;
     }
+    _timezone = "Asia/Shanghai";
+    get timezone() {
+        return this._timezone;
+    }
+    set timezone(value) {
+        this._timezone = value;
+        process.env.TZ = "Asia/Shanghai";
+    }
     constructor() {
         this.init();
     }
@@ -130,6 +138,9 @@ class CgServer {
         this._socketservers.push(server);
     }
     async initDb(dbcfg) {
+        if (!dbcfg) {
+            return;
+        }
         await MSSqlManager_1.gMSSqlMgr.init(dbcfg.mssql);
         await MysqlManager_1.gMysqlMgr.init(dbcfg.mysql);
         await RedisManager_1.gRedisMgr.init(dbcfg.redis);

package/dist/types/Framework/WebServer/IWebServer.d.ts

@@ -1,12 +1,13 @@
 import { Engine } from './Engine/Engine';
 import { WebServerConfig } from '../Config/FrameworkConfig';
+import { DbConfig } from '../index_export_';
 export declare class IWebServer {
     protected _engine: Engine;
     /**
      * 启动服务器
      * @param server_index 这个是服务器的配置index
      */
-    start(cfg: WebServerConfig): Promise<boolean>;
+    start(cfg: WebServerConfig, dbcfg?: DbConfig): Promise<boolean>;
     pause(): void;
     resume(): void;
     /**

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

@@ -23,6 +23,9 @@ export declare class CgServer {
      */
     set customprocessid(value: string);
     get dataRootDir(): string;
+    protected _timezone: string;
+    get timezone(): string;
+    set timezone(value: string);
     constructor();
     init(): void;
     protected _done: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "10.0.13",
+  "version": "10.0.15",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -40,7 +40,7 @@
     "@types/mssql": "^9.1.5",
     "@types/node": "^20.11.20",
     "@types/nodemailer": "^6.4.14",
-    "@types/redis": "^4.0.10",
+    "@types/redis": "^4.0.11",
     "@types/reflect-metadata": "^0.1.0",
     "@types/request": "^2.48.12",
     "@types/underscore": "^1.11.15",
@@ -63,16 +63,16 @@
     "log4js": "^6.9.1",
     "mime": "^3.0.0",
     "mongodb": "^6.7.0",
-    "mssql": "^11.0.0",
+    "mssql": "^11.0.1",
     "mysql2": "^3.10.2",
     "nodemailer": "^6.9.10",
     "process": "^0.11.10",
     "protobufjs": "^7.2.6",
     "qiniu": "^7.11.0",
     "readline2": "^1.0.1",
-    "redis": "^4.6.13",
-    "reflect-metadata": "^0.2.1",
-    "request": "^2.88.0",
+    "redis": "^4.7.0",
+    "reflect-metadata": "^0.2.2",
+    "request": "^2.88.2",
     "socket.io": "^4.7.4",
     "underscore": "^1.13.6",
     "urlencode": "^2.0.0",