cgserver 7.13.2504 → 7.14.2504

package/debug.log

@@ -4,3 +4,5 @@
 [0705/134804.446:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
 [0705/134805.911:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
 [0705/134805.944:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[0705/155200.976:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[0705/155201.034:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)

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

@@ -19,7 +19,10 @@ class MongoBaseService {
         this._t_type = type;
         this._table = table;
     }
-    async getNextId() {
+    async getNextId(key) {
+        if (!key) {
+            key = this._table;
+        }
         let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
         return id;
     }

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

@@ -98,6 +98,11 @@ class MongoManager {
         Log_1.GLog.info("mongo try reconnect");
         this.init(this._mongocfg);
     }
+    /**
+     * 获取自增长id
+     * @param key
+     * @returns 小于等于0为异常
+     */
     async getAutoIds(key) {
         if (!this._mongo) {
             return -1;
@@ -108,14 +113,17 @@ class MongoManager {
             let where = this._convertWhere({ _id: key });
             let rs = await Core_1.core.safeCall(col.findOneAndUpdate, col, where, { $inc: { id: 1 } }, { upsert: true });
             if (rs.ok) {
-                return rs.value.id + 1;
+                if (rs.value) {
+                    return rs.value.id + 1;
+                }
+                return 0 + 1;
             }
-            return 0 + 1;
+            return -1;
         }
         catch (e) {
             Log_1.GLog.error(e.stack);
         }
-        return -1;
+        return -2;
     }
     _convertWhere(where) {
         if (!where || !where._id) {

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

@@ -11,7 +11,7 @@ export declare class MongoBaseService<T> {
     constructor(table: string, type: {
         new (): T;
     });
-    getNextId(): Promise<any>;
+    getNextId(key?: string): Promise<any>;
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id

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

@@ -50,6 +50,11 @@ declare class MongoManager {
     onConnect(): void;
     onEnd(): void;
     onError(err: any): void;
+    /**
+     * 获取自增长id
+     * @param key
+     * @returns 小于等于0为异常
+     */
     getAutoIds(key: string): Promise<any>;
     protected _convertWhere(where?: any): any;
     /**

package/package.json

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