cgserver 13.3.4 → 14.0.0

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

@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMongoAutoIdsSer = exports.MongoBaseService = void 0;
-const mongoose_1 = __importStar(require("mongoose"));
+const mongoose_1 = __importDefault(require("mongoose"));
 const Log_1 = require("../../Logic/Log");
 const MongoManager_1 = require("./MongoManager");
 const SyncCall_1 = require("../../Decorator/SyncCall");
@@ -103,8 +70,8 @@ class MongoBaseService {
         let ret = await this.mongo.create(this.model, doc);
         return ret;
     }
-    async insert(doc) {
-        let ret = await this.mongo.insert(this.model, doc);
+    async insert(doc, options) {
+        let ret = await this.mongo.insert(this.model, doc, options);
         return ret;
     }
     async updateOne(filter, update, options) {
@@ -147,7 +114,7 @@ class MongoBaseService {
     }
 }
 exports.MongoBaseService = MongoBaseService;
-const autoIdSchema = new mongoose_1.Schema({
+const autoIdSchema = new mongoose_1.default.Schema({
     _id: { type: String },
     autoid: { type: Number, required: true, default: 0 }
 }, { id: false });

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

@@ -10,10 +10,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gMongoMgr = exports.MongoExt = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoConfig = void 0;
-const mongoose_1 = require("mongoose");
 const Core_1 = require("../../Core/Core");
 const Log_1 = require("../../Logic/Log");
-const mongoose_2 = __importDefault(require("mongoose"));
+const mongoose_1 = __importDefault(require("mongoose"));
 const MongoActionCheck_1 = require("../../Decorator/MongoActionCheck");
 class MongoConfig {
     open = false;
@@ -141,15 +140,15 @@ class MongoExt {
         this._inited = true;
         Log_1.gLog.info("mongo config=" + JSON.stringify(this._mongocfg));
         this._mongocfg.options.dbName = this._mongocfg.database;
-        this._connection = mongoose_2.default.createConnection("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
+        this._connection = mongoose_1.default.createConnection("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
         this._connection = this._connection.useDb(this._mongocfg.database);
         this._connection.once("open", this.onOpen.bind(this));
         this._connection.on("close", this.onClose.bind(this));
         this._connection.on("connectionCreated", this.onConnect.bind(this));
         this._connection.on("connectionClosed", this.onDisconnect.bind(this));
         await this._connection.asPromise();
-        while (this._connection.readyState != mongoose_1.ConnectionStates.connected) {
-            if (this._connection.readyState != mongoose_1.ConnectionStates.connecting) {
+        while (this._connection.readyState != mongoose_1.default.ConnectionStates.connected) {
+            if (this._connection.readyState != mongoose_1.default.ConnectionStates.connecting) {
                 Log_1.gLog.error("MongoDB connection is not ready, please check the connection settings. Current state: " + this._connection.readyState);
                 return false;
             }
@@ -236,12 +235,12 @@ class MongoExt {
         let one = await newDoc.save();
         return one;
     }
-    async insert(model, doc) {
+    async insert(model, doc, options) {
         if (!model) {
             Log_1.gLog.error("Model is not defined");
             return null;
         }
-        const newDoc = await model.insertOne(doc);
+        const newDoc = await model.insertOne(doc, options);
         return newDoc;
     }
     async updateOne(model, filter, update, options) {
@@ -322,7 +321,7 @@ class MongoExt {
             return {};
         }
         if (filter.id && typeof filter.id === 'string') {
-            filter._id = new mongoose_1.Types.ObjectId(filter.id);
+            filter._id = new mongoose_1.default.Types.ObjectId(filter.id);
             delete filter.id;
         }
         else if (filter.id) {
@@ -335,7 +334,7 @@ class MongoExt {
         if (!one) {
             return one;
         }
-        if (typeof one._id === 'object' && one._id instanceof mongoose_1.Types.ObjectId) {
+        if (typeof one._id === 'object' && one._id instanceof mongoose_1.default.Types.ObjectId) {
             one.id = one._id.toString();
         }
         else {

package/dist/lib/Framework/Server/WebServer/Engine/Response.js

@@ -103,7 +103,7 @@ class Response {
             let size = stats.size;
             var f = fs.createReadStream(fullPath);
             this._res.writeHead(200, {
-                'Content-Type': mime.getType(fullPath) || 'application/octet-stream',
+                'Content-Type': mime.default.getType(fullPath) || 'application/octet-stream',
                 'Content-Disposition': 'attachment; filename=' + fileName,
                 'Content-Length': size
             });

package/dist/lib/Framework/ThirdParty/WechatTool.js

@@ -40,14 +40,6 @@ const IServerConfig_1 = require("../Config/IServerConfig");
 const Log_1 = require("../Logic/Log");
 const HttpTool_1 = require("../Logic/HttpTool");
 class WechatOAMsg {
-    // <xml>
-    // <ToUserName><![CDATA[toUser]]></ToUserName>
-    // <FromUserName><![CDATA[fromUser]]></FromUserName>
-    // <CreateTime>1348831860</CreateTime>
-    // <MsgType><![CDATA[text]]></MsgType>
-    // <Content><![CDATA[this is a test]]></Content>
-    // <MsgId>1234567890123456</MsgId>
-    // </xml>
     toUserName = "";
     fromUserName = ""; //其实是一个userid
     createTime = -1;

package/dist/lib/Framework/global.js

@@ -19,7 +19,6 @@ const Alisms_1 = require("./ThirdParty/Alisms");
 const AppleTool_1 = require("./ThirdParty/AppleTool");
 const EmailTool_1 = require("./ThirdParty/EmailTool");
 const QQTool_1 = require("./ThirdParty/QQTool");
-const QiniuTool_1 = require("./ThirdParty/QiniuTool");
 const WechatTool_1 = require("./ThirdParty/WechatTool");
 const ControllerManager_1 = require("./Server/WebServer/Engine/ControllerManager");
 const cgserver_1 = require("./cgserver");
@@ -45,7 +44,6 @@ class global {
     static gByteTool = ByteTool_1.gByteTool;
     static gSmsTool = Alisms_1.gSMSTool;
     static gEmailTool = EmailTool_1.gEmailTool;
-    static gQiniuTool = QiniuTool_1.gQiniuTool;
     static gQQTool = QQTool_1.gQQTool;
     static gWechatTool = WechatTool_1.gWechatTool;
     static gWechatOATool = WechatTool_1.gWechatTool;

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

@@ -113,6 +113,6 @@ export declare class core {
     static aesEncode(content: string, key: string, iv: string): string;
     static aesDecode(base64_str: string, key: string, iv: string): string;
     static getUuid(): string;
-    static signatureBase64(private_key: string, rsa_name: string, payload: string): any;
-    static signatureVerifyBase64(signature: string, private_key: string, rsa_name: string, payload: string): any;
+    static signatureBase64(private_key: string, rsa_name: string, payload: string): NonSharedBuffer;
+    static signatureVerifyBase64(signature: string, private_key: string, rsa_name: string, payload: string): boolean;
 }

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

@@ -1,5 +1,6 @@
-import mongoose, { FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
+import mongoose from 'mongoose';
 import { IMongoBaseModel, MongoExt } from './MongoManager';
+export type PartialModel<T> = Partial<mongoose.ApplyBasicCreateCasting<T>>;
 export declare class MongoBaseService<T extends IMongoBaseModel> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
@@ -7,21 +8,23 @@ export declare class MongoBaseService<T extends IMongoBaseModel> {
     protected _dbname: string;
     protected _mongo: MongoExt;
     get mongo(): MongoExt;
-    get model(): mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}> & mongoose.Default__v<mongoose.Require_id<T>>>, any>;
+    get model(): mongoose.Model<T, {}, {}, {}, mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}, mongoose.DefaultSchemaOptions> & mongoose.Require_id<T> & {
+        __v: number;
+    }>, any, T>;
     constructor(collection_name: string, schema: mongoose.Schema<T>, dbname?: string);
-    findOne(filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
-    find(filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
-    findById(id: string | Types.ObjectId, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T>;
+    findOne(filter?: mongoose.QueryFilter<T>, projection?: any, options?: any): Promise<T | null>;
+    find(filter?: mongoose.QueryFilter<T>, projection?: mongoose.ProjectionType<T>, options?: mongoose.QueryOptions): Promise<T[]>;
+    findById(id: any, projection?: mongoose.ProjectionType<T>, options?: mongoose.QueryOptions): Promise<T>;
     create(doc: Partial<T>): Promise<T>;
-    insert(doc: Partial<T>): Promise<T>;
-    updateOne(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<mongoose.UpdateWriteOpResult>;
-    updateMany(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<mongoose.UpdateWriteOpResult>;
-    deleteOne(filter: FilterQuery<T>): Promise<number>;
-    deleteMany(filter: FilterQuery<T>): Promise<number>;
-    exists(filter: FilterQuery<T>): Promise<boolean>;
+    insert(doc: Partial<T>, options?: mongoose.SaveOptions): Promise<T>;
+    updateOne(filter: mongoose.QueryFilter<T>, update: mongoose.UpdateQuery<T>, options?: mongoose.mongo.UpdateOptions): Promise<mongoose.UpdateWriteOpResult>;
+    updateMany(filter: mongoose.QueryFilter<T>, update: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, options?: (mongoose.mongo.UpdateOptions & mongoose.MongooseUpdateQueryOptions<T>) | null): Promise<mongoose.UpdateWriteOpResult>;
+    deleteOne(filter: mongoose.QueryFilter<T>): Promise<number>;
+    deleteMany(filter: mongoose.QueryFilter<T>): Promise<number>;
+    exists(filter: mongoose.QueryFilter<T>): Promise<boolean>;
     aggregate(pipeline?: any[]): mongoose.Aggregate<any[]>;
-    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: MongooseQueryOptions): Promise<T>;
-    countDocuments(filter?: FilterQuery<T>): Promise<number>;
+    findOneAndUpdate(filter: mongoose.QueryFilter<T>, update: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, options?: mongoose.QueryOptions<T> | null): Promise<T>;
+    countDocuments(filter?: mongoose.QueryFilter<T>): Promise<number>;
     getAutoIds(): Promise<number>;
 }
 export interface IAutoIdModel extends IMongoBaseModel {

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

@@ -1,5 +1,4 @@
-import { UpdateQuery } from 'mongoose';
-import mongoose, { FilterQuery, MongooseQueryOptions } from 'mongoose';
+import mongoose from 'mongoose';
 export interface IMongoBaseModel {
     _id: any;
     id: any;
@@ -75,19 +74,19 @@ export declare class MongoExt {
         available: any;
     }>;
     onError(err: Error): void;
-    findOne<T>(model: mongoose.Model<T>, filter?: FilterQuery<T>, projection?: any, options?: any): Promise<T | null>;
-    find<T>(model: mongoose.Model<T>, filter?: FilterQuery<T>, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T[]>;
-    findById<T>(model: mongoose.Model<T>, id: any, projection?: mongoose.ProjectionType<T>, options?: MongooseQueryOptions): Promise<T | null>;
+    findOne<T>(model: mongoose.Model<T>, filter?: mongoose.QueryFilter<T>, projection?: any, options?: any): Promise<T | null>;
+    find<T>(model: mongoose.Model<T>, filter?: mongoose.QueryFilter<T>, projection?: mongoose.ProjectionType<T>, options?: mongoose.QueryOptions): Promise<T[]>;
+    findById<T>(model: mongoose.Model<T>, id: any, projection?: mongoose.ProjectionType<T>, options?: mongoose.QueryOptions): Promise<T | null>;
     create<T>(model: mongoose.Model<T>, doc: Partial<T>): Promise<T>;
-    insert<T>(model: mongoose.Model<T>, doc: Partial<T>): Promise<T>;
-    updateOne<T>(model: mongoose.Model<T>, filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<mongoose.UpdateWriteOpResult>;
-    updateMany<T>(model: mongoose.Model<T>, filter: FilterQuery<T>, update: UpdateQuery<T>, options?: any): Promise<mongoose.UpdateWriteOpResult>;
-    deleteOne<T>(model: mongoose.Model<T>, filter: FilterQuery<T>): Promise<number>;
-    deleteMany<T>(model: mongoose.Model<T>, filter: FilterQuery<T>): Promise<number>;
-    exists<T>(model: mongoose.Model<T>, filter: FilterQuery<T>): Promise<boolean>;
+    insert<T>(model: mongoose.Model<T>, doc: Partial<T>, options?: mongoose.SaveOptions): Promise<T>;
+    updateOne<T>(model: mongoose.Model<T>, filter: mongoose.QueryFilter<T>, update: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, options?: (mongoose.mongo.UpdateOptions & mongoose.MongooseUpdateQueryOptions<T>) | null): Promise<mongoose.UpdateWriteOpResult>;
+    updateMany<T>(model: mongoose.Model<T>, filter: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, update: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, options?: (mongoose.mongo.UpdateOptions & mongoose.MongooseUpdateQueryOptions<T>) | null): Promise<mongoose.UpdateWriteOpResult>;
+    deleteOne<T>(model: mongoose.Model<T>, filter: mongoose.QueryFilter<T>): Promise<number>;
+    deleteMany<T>(model: mongoose.Model<T>, filter: mongoose.QueryFilter<T>): Promise<number>;
+    exists<T>(model: mongoose.Model<T>, filter: mongoose.QueryFilter<T>): Promise<boolean>;
     aggregate<T>(model: mongoose.Model<T>, pipeline?: any[]): mongoose.Aggregate<any[]>;
-    findOneAndUpdate<T>(model: mongoose.Model<T>, filter: FilterQuery<T>, update: UpdateQuery<T>, options?: MongooseQueryOptions): Promise<T>;
-    countDocuments<T>(model: mongoose.Model<T>, filter?: FilterQuery<T>): Promise<number>;
+    findOneAndUpdate<T>(model: mongoose.Model<T>, filter: mongoose.QueryFilter<T>, update: mongoose.UpdateQuery<T> | mongoose.UpdateWithAggregationPipeline, options?: mongoose.QueryOptions<T> | null): Promise<T>;
+    countDocuments<T>(model: mongoose.Model<T>, filter?: mongoose.QueryFilter<T>): Promise<number>;
     protected _convertFilter(filter: any): any;
     protected _convertId(one: any): any;
 }