cgserver 10.0.12 → 10.0.14
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.
- package/dist/lib/Framework/Config/Config.js +1 -1
- package/dist/lib/Framework/Config/IServerConfig.js +1 -1
- package/dist/lib/Framework/Database/Mongo/MongoManager.js +4 -3
- package/dist/lib/Framework/cgserver.js +8 -0
- package/dist/types/Framework/Database/Mongo/MongoBaseService.d.ts +1 -1
- package/dist/types/Framework/Database/Mongo/MongoManager.d.ts +1 -1
- package/dist/types/Framework/cgserver.d.ts +3 -0
- package/package.json +6 -6
|
@@ -10,6 +10,7 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
|
|
|
10
10
|
}
|
|
11
11
|
constructor(server_name) {
|
|
12
12
|
super();
|
|
13
|
+
exports.gServerCfg = this;
|
|
13
14
|
this._server_name = server_name;
|
|
14
15
|
this._suffix = this._server_name;
|
|
15
16
|
}
|
|
@@ -18,7 +19,6 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
|
|
|
18
19
|
if (!ret) {
|
|
19
20
|
return ret;
|
|
20
21
|
}
|
|
21
|
-
exports.gServerCfg = this;
|
|
22
22
|
return ret;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -216,21 +216,22 @@ class MongoExt {
|
|
|
216
216
|
where = {};
|
|
217
217
|
}
|
|
218
218
|
this._convertWhere(where);
|
|
219
|
-
let rs = { errcode: null,
|
|
219
|
+
let rs = { errcode: null, lst: null };
|
|
220
220
|
if (!this._mongoDb) {
|
|
221
221
|
rs.errcode = _error_1.EErrorCode.No_Mongo;
|
|
222
222
|
return rs;
|
|
223
223
|
}
|
|
224
|
-
let
|
|
224
|
+
let lst = null;
|
|
225
225
|
try {
|
|
226
226
|
let col = this._mongoDb.collection(collection);
|
|
227
|
-
|
|
227
|
+
lst = await col.distinct(key, where);
|
|
228
228
|
}
|
|
229
229
|
catch (e) {
|
|
230
230
|
Log_1.gLog.error({ collection, key, where });
|
|
231
231
|
Log_1.gLog.error(e.stack);
|
|
232
232
|
rs.errcode = _error_1.EErrorCode.Mongo_Error;
|
|
233
233
|
}
|
|
234
|
+
rs.lst = lst;
|
|
234
235
|
return rs;
|
|
235
236
|
}
|
|
236
237
|
async findMany(collection, where = {}, property = {}, sort, skip = 0, limit = 0) {
|
|
@@ -41,6 +41,14 @@ class CgServer {
|
|
|
41
41
|
get dataRootDir() {
|
|
42
42
|
return Config_1.Config.rootDataDir;
|
|
43
43
|
}
|
|
44
|
+
_timezone = "Asia/Shanghai";
|
|
45
|
+
get timezone() {
|
|
46
|
+
return this._timezone;
|
|
47
|
+
}
|
|
48
|
+
set timezone(value) {
|
|
49
|
+
this._timezone = value;
|
|
50
|
+
process.env.TZ = "Asia/Shanghai";
|
|
51
|
+
}
|
|
44
52
|
constructor() {
|
|
45
53
|
this.init();
|
|
46
54
|
}
|
|
@@ -23,6 +23,9 @@ export declare class CgServer {
|
|
|
23
23
|
*/
|
|
24
24
|
set customprocessid(value: string);
|
|
25
25
|
get dataRootDir(): string;
|
|
26
|
+
protected _timezone: string;
|
|
27
|
+
get timezone(): string;
|
|
28
|
+
set timezone(value: string);
|
|
26
29
|
constructor();
|
|
27
30
|
init(): void;
|
|
28
31
|
protected _done: number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cgserver",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.14",
|
|
4
4
|
"author": "trojan",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"description": "free for all.Websocket or Http",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@types/mssql": "^9.1.5",
|
|
41
41
|
"@types/node": "^20.11.20",
|
|
42
42
|
"@types/nodemailer": "^6.4.14",
|
|
43
|
-
"@types/redis": "^4.0.
|
|
43
|
+
"@types/redis": "^4.0.11",
|
|
44
44
|
"@types/reflect-metadata": "^0.1.0",
|
|
45
45
|
"@types/request": "^2.48.12",
|
|
46
46
|
"@types/underscore": "^1.11.15",
|
|
@@ -63,16 +63,16 @@
|
|
|
63
63
|
"log4js": "^6.9.1",
|
|
64
64
|
"mime": "^3.0.0",
|
|
65
65
|
"mongodb": "^6.7.0",
|
|
66
|
-
"mssql": "^11.0.
|
|
66
|
+
"mssql": "^11.0.1",
|
|
67
67
|
"mysql2": "^3.10.2",
|
|
68
68
|
"nodemailer": "^6.9.10",
|
|
69
69
|
"process": "^0.11.10",
|
|
70
70
|
"protobufjs": "^7.2.6",
|
|
71
71
|
"qiniu": "^7.11.0",
|
|
72
72
|
"readline2": "^1.0.1",
|
|
73
|
-
"redis": "^4.
|
|
74
|
-
"reflect-metadata": "^0.2.
|
|
75
|
-
"request": "^2.88.
|
|
73
|
+
"redis": "^4.7.0",
|
|
74
|
+
"reflect-metadata": "^0.2.2",
|
|
75
|
+
"request": "^2.88.2",
|
|
76
76
|
"socket.io": "^4.7.4",
|
|
77
77
|
"underscore": "^1.13.6",
|
|
78
78
|
"urlencode": "^2.0.0",
|