cgserver 9.2.1 → 9.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -5,7 +5,6 @@ const Property_1 = require("./Decorator/Property");
|
|
|
5
5
|
const MysqlManager_1 = require("./MysqlManager");
|
|
6
6
|
const Log_1 = require("../Logic/Log");
|
|
7
7
|
const DBCache_1 = require("./Decorator/DBCache");
|
|
8
|
-
const IServerConfig_1 = require("../Config/IServerConfig");
|
|
9
8
|
class BaseModel {
|
|
10
9
|
}
|
|
11
10
|
exports.BaseModel = BaseModel;
|
|
@@ -42,7 +41,7 @@ class MysqlBaseService {
|
|
|
42
41
|
throw new Error("数据表的类必须要具有Table装饰器");
|
|
43
42
|
}
|
|
44
43
|
this._table = "`" + table.table + "`";
|
|
45
|
-
if (!
|
|
44
|
+
if (!MysqlManager_1.GMysqlMgr.cfg.auto) {
|
|
46
45
|
//未开启自动创建数据表
|
|
47
46
|
return;
|
|
48
47
|
}
|
|
@@ -34,6 +34,10 @@ class MysqlManager {
|
|
|
34
34
|
get isValid() {
|
|
35
35
|
return !!this._pool;
|
|
36
36
|
}
|
|
37
|
+
_cfg = null;
|
|
38
|
+
get cfg() {
|
|
39
|
+
return this._cfg;
|
|
40
|
+
}
|
|
37
41
|
constructor() {
|
|
38
42
|
}
|
|
39
43
|
async init(cfg) {
|
|
@@ -42,6 +46,7 @@ class MysqlManager {
|
|
|
42
46
|
|| !cfg.open) {
|
|
43
47
|
return;
|
|
44
48
|
}
|
|
49
|
+
this._cfg = cfg;
|
|
45
50
|
this._pool = mysql2.createPool(cfg.poolcfg);
|
|
46
51
|
console.log("mysql config=" + JSON.stringify(cfg));
|
|
47
52
|
//这个的初始化位置不能变，必须位于cbs前，pool后
|
|
@@ -20,6 +20,8 @@ declare class MysqlManager {
|
|
|
20
20
|
protected _init_cbs: any[];
|
|
21
21
|
protected _pool: mysql2.Pool;
|
|
22
22
|
get isValid(): boolean;
|
|
23
|
+
protected _cfg: MysqlConfig;
|
|
24
|
+
get cfg(): MysqlConfig;
|
|
23
25
|
constructor();
|
|
24
26
|
init(cfg: MysqlConfig): Promise<void>;
|
|
25
27
|
registerInitCb(cb: Function): void;
|