cgserver 7.2.686 → 7.3.1434

package/dist/lib/Core/Core.js

@@ -6,6 +6,7 @@ let request = require('request');
 const _ = require("underscore");
 const crypto = require("crypto");
 const Log_1 = require("../Logic/Log");
+const CryptoJS = require("crypto-js");
 /**
  * 常用的工具函数类
  */
@@ -600,5 +601,39 @@ class core {
             return { errcode: { id: 1008613, des: "failed" } };
         }
     }
+    //判断当前日期为当年第几周
+    static getYearWeek(time) {
+        //date1是当前日期
+        //date2是当年第一天
+        //d是当前日期是今年第多少天
+        //用d + 当前年的第一天的周差距的和在除以7就是本年第几周
+        let tar = new Date(time);
+        let start = new Date(tar.getFullYear(), 0, 1);
+        let days = Math.round((tar.valueOf() - start.valueOf()) / 86400000);
+        return Math.ceil((days + ((start.getDay() + 1) - 1)) / 7);
+    }
+    static toBase64(content) {
+        var wordArray = CryptoJS.enc.Hex.parse(content);
+        var base64Str = CryptoJS.enc.Base64.stringify(wordArray);
+        return base64Str;
+    }
+    static aesEncode(content, key, iv) {
+        let _iv = CryptoJS.enc.Utf8.parse(iv);
+        let etext = CryptoJS.AES.encrypt(content, key, {
+            iv: _iv,
+            mode: CryptoJS.mode.CBC,
+            padding: CryptoJS.pad.Pkcs7
+        }).toString();
+        return etext;
+    }
+    static aesDecode(base64_str, key, iv) {
+        let _iv = CryptoJS.enc.Utf8.parse(iv);
+        let dtext = CryptoJS.AES.decrypt(base64_str, key, {
+            iv: _iv,
+            mode: CryptoJS.mode.CBC,
+            padding: CryptoJS.pad.Pkcs7
+        }).toString(CryptoJS.enc.Utf8);
+        return dtext;
+    }
 }
 exports.core = core;

package/dist/lib/Database/MongoBaseService.js

@@ -75,5 +75,40 @@ class MongoBaseService {
         let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
         return ret;
     }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getsInArray(array, where, pre_match) {
+        let agg = this.aggregate();
+        if (pre_match) {
+            agg = agg.match(pre_match);
+        }
+        agg = agg.unwind("$" + array);
+        if (where) {
+            agg = agg.match(where);
+        }
+        let all = await agg.toArray();
+        let items = [];
+        for (let i = 0; i < all.length; ++i) {
+            items.push(all[i][array]);
+        }
+        return items;
+    }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getInArray(array, where, pre_match) {
+        let items = await this.getsInArray(array, where, pre_match);
+        if (items.length <= 0) {
+            return null;
+        }
+        return items[0];
+    }
 }
 exports.MongoBaseService = MongoBaseService;

package/dist/lib/Logic/HttpTool.js

@@ -4,12 +4,12 @@ exports.GHttpTool = void 0;
 const request = require("request");
 const qs = require("querystring");
 const Log_1 = require("./Log");
-const cgserver_1 = require("cgserver");
+const Core_1 = require("../Core/Core");
 exports.GHttpTool = null;
 class HttpTool {
     get(options_url) {
         let options = null;
-        if (cgserver_1.core.isString(options_url)) {
+        if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
         }
         else {
@@ -23,7 +23,7 @@ class HttpTool {
                     Log_1.GLog.error(error);
                 }
                 try {
-                    if (cgserver_1.core.isString(body)) {
+                    if (Core_1.core.isString(body)) {
                         body = JSON.parse(body);
                     }
                 }
@@ -41,7 +41,7 @@ class HttpTool {
     }
     post(options_url) {
         let options = null;
-        if (cgserver_1.core.isString(options_url)) {
+        if (Core_1.core.isString(options_url)) {
             options = { url: options_url };
         }
         else {
@@ -55,7 +55,7 @@ class HttpTool {
                     Log_1.GLog.error(error);
                 }
                 try {
-                    if (cgserver_1.core.isString(body)) {
+                    if (Core_1.core.isString(body)) {
                         body = JSON.parse(body);
                     }
                 }

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

@@ -101,4 +101,8 @@ export declare class core {
     static convertToGlobalStr(num: number): string;
     static sleep(milliseconds: number): Promise<unknown>;
     static safeCall(func: Function, thisArg?: any, ...params: any[]): Promise<any>;
+    static getYearWeek(time: number): number;
+    static toBase64(content: string): string;
+    static aesEncode(content: string, key: string, iv: string): string;
+    static aesDecode(base64_str: string, key: string, iv: string): string;
 }

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

@@ -64,4 +64,18 @@ export declare class MongoBaseService<T> {
         rs: string;
     }>;
     aggregate(pipeline?: Document[], options?: mongo.AggregateOptions): mongo.AggregationCursor<mongo.Document>;
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    getsInArray<T>(array: string, where?: any, pre_match?: any): Promise<T[]>;
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    getInArray<T>(array: string, where?: any, pre_match?: any): Promise<T>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "7.2.686",
+  "version": "7.3.1434",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -33,6 +33,7 @@
     "@alicloud/sms-sdk": "^1.1.6",
     "@types/cookie-parser": "^1.4.2",
     "@types/cors": "^2.8.12",
+    "@types/crypto-js": "^4.1.1",
     "@types/express": "^4.17.13",
     "@types/formidable": "^2.0.0",
     "@types/mime": "^2.0.3",
@@ -48,10 +49,10 @@
     "@types/websocket": "^1.0.4",
     "alipay_sdk2": "^1.1.6",
     "alipay-sdk": "^3.1.7",
-    "cgserver": "^6.9.468",
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
+    "crypto-js": "^4.1.1",
     "ec-key": "0.0.4",
     "express": "^4.17.1",
     "fast-xml-parser": "^3.21.1",