cgserver 10.0.14 → 10.0.16

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;
@@ -10,11 +11,15 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     }
     constructor(server_name) {
         super();
-        exports.gServerCfg = this;
         this._server_name = server_name;
         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;

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

@@ -67,6 +67,7 @@ class HttpTool {
         }
         if (this._debug) {
             Log_1.gLog.info("prepare post:" + options.url);
+            Log_1.gLog.info("prepare post data:" + JSON.stringify(options.json || options.body || options.formData || options.form || options.qs));
         }
         return new Promise((resolve, reject) => {
             request.post(options, (error, response, body) => {

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

@@ -138,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/package.json

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