cgserver 12.2.4 → 12.2.6

package/README.md

@@ -1,5 +1,11 @@
 # 版本更新日志
 
+## v12.2.6
+- mongo 新增 findOneAndUpdate 接口到处
+
+## v12.2.5
+- Core 统一hash接口
+
 ## v12.2.4
 - mongo 添加了mongo的执行日志
 

package/dist/lib/Framework/Core/Core.js

@@ -369,29 +369,17 @@ class core {
         newStr += last;
         return newStr;
     }
-    static md5(str, inputEncoding = null, encoding = "hex") {
-        let _md5 = crypto.createHash('md5');
+    static hash(algorithm, str, inputEncoding = null, encoding = "hex") {
+        let _hash = crypto.createHash(algorithm);
         let hash = null;
         if (inputEncoding) {
-            hash = _md5.update(str, inputEncoding);
+            hash = _hash.update(str, inputEncoding);
         }
         else {
-            hash = _md5.update(str);
+            hash = _hash.update(str);
         }
-        let md5_str = hash.digest(encoding);
-        return md5_str;
-    }
-    static sha1(str, inputEncoding = null, encoding = "hex") {
-        let _sha1 = crypto.createHash('sha1');
-        let hash = null;
-        if (inputEncoding) {
-            hash = _sha1.update(str, inputEncoding);
-        }
-        else {
-            hash = _sha1.update(str);
-        }
-        let sha1_str = hash.digest(encoding);
-        return sha1_str;
+        let hash_str = hash.digest(encoding);
+        return hash_str;
     }
     static getLocalIP = function () {
         let iptable = {};

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

@@ -54,6 +54,10 @@ class MongoBaseService {
         let rs = await this.mongoDb.findOne(this._table, where, property);
         return rs.one;
     }
+    async findOneAndUpdate(where = null, update, options) {
+        let rs = await this.mongoDb.findOneAndUpdate(this._table, where, update, options);
+        return rs;
+    }
     async countDocuments(where = null, options) {
         let rs = await this.mongoDb.countDocuments(this._table, where);
         return rs.count;

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

@@ -698,6 +698,20 @@ class MongoExt {
         this._mongocfg.debug && Log_1.gLog.info({ key: "bulkWrite", dt, arguments });
         return bwr;
     }
+    async findOneAndUpdate(collection, filter, update, options) {
+        let now = Date.now();
+        let dt = 0;
+        if (!this._mongoDb) {
+            dt = Date.now() - now;
+            this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
+            return;
+        }
+        let col = this._mongoDb.collection(collection);
+        let rs = await col.findOneAndUpdate(filter, update, options);
+        dt = Date.now() - now;
+        this._mongocfg.debug && Log_1.gLog.info({ key: "findOneAndUpdate", dt, arguments });
+        return rs;
+    }
 }
 exports.MongoExt = MongoExt;
 exports.gMongoMgr = new MongoManager();

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

@@ -42,8 +42,7 @@ export declare class core {
      * @param str
      */
     static fuzzy(str: string): string;
-    static md5(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
-    static sha1(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
+    static hash(algorithm: string, str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

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

@@ -27,6 +27,9 @@ export declare class MongoBaseService<T extends MongoBaseModel> {
     }, property?: {
         [key: string]: any;
     }): Promise<T>;
+    findOneAndUpdate(where: {
+        [key: string]: any;
+    }, update: any, options?: mongo.FindOneAndUpdateOptions): Promise<T>;
     countDocuments(where?: {
         [key: string]: any;
     }, options?: mongo.CountDocumentsOptions): Promise<number>;

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

@@ -205,5 +205,6 @@ export declare class MongoExt {
      */
     quickTransaction(cb: Function, options?: mongo.TransactionOptions): Promise<false | any>;
     bulkWrite(collection: string, operations: mongo.AnyBulkWriteOperation<mongo.BSON.Document>[], options?: mongo.BulkWriteOptions): Promise<mongo.BulkWriteResult>;
+    findOneAndUpdate(collection: string, filter: any, update: any, options?: mongo.FindOneAndUpdateOptions): Promise<any>;
 }
 export declare let gMongoMgr: MongoManager;

package/package.json

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