oak-domain 2.6.7 → 2.6.9

package/lib/store/checker.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRemoveCheckers = exports.createAuthCheckers = exports.translateCheckerInSyncContext = exports.translateCheckerInAsyncContext = void 0;
+exports.createCreateCheckers = exports.createRemoveCheckers = exports.createAuthCheckers = exports.translateCheckerInSyncContext = exports.translateCheckerInAsyncContext = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var filter_1 = require("../store/filter");
@@ -11,6 +11,7 @@ var string_1 = require("../utils/string");
 var lodash_1 = require("../utils/lodash");
 var relation_1 = require("./relation");
 var uuid_1 = require("../utils/uuid");
+var action_1 = require("../actions/action");
 /**
  *
  * @param checker 要翻译的checker
@@ -112,7 +113,7 @@ function translateCheckerInAsyncContext(checker) {
             var fn = (function (_a, context, option) {
                 var operation = _a.operation;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var result, _b, filter, action;
+                    var result, _b, filter, action, errMsg2;
                     return tslib_1.__generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
@@ -145,7 +146,8 @@ function translateCheckerInAsyncContext(checker) {
                                 if (_c.sent()) {
                                     return [2 /*return*/];
                                 }
-                                throw new Exception_1.OakUserUnpermittedException(errMsg_2);
+                                errMsg2 = typeof errMsg_2 === 'function' ? errMsg_2(operation, context, option) : errMsg_2;
+                                throw new Exception_1.OakUserUnpermittedException(errMsg2);
                             case 5: return [2 /*return*/, 0];
                         }
                     });
@@ -235,7 +237,8 @@ function translateCheckerInSyncContext(checker) {
                     if ((0, filter_1.checkFilterContains)(entity, context, result, filter, true)) {
                         return;
                     }
-                    throw new Exception_1.OakUserUnpermittedException(errMsg_4);
+                    var errMsg2 = typeof errMsg_4 === 'function' ? errMsg_4(operation, context, option) : errMsg_4;
+                    throw new Exception_1.OakUserUnpermittedException(errMsg2);
                 }
             };
             return {
@@ -438,19 +441,20 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
                         if (d.entity === attr && typeof d.entityId === 'string') {
                             return d.entityId;
                         }
-                        throw new Exception_1.OakUserUnpermittedException();
                     }
                     else {
                         (0, assert_1.default)(typeof relation === 'string');
                         if (typeof d["".concat(attr, "Id")] === 'string') {
                             return d["".concat(attr, "Id")];
                         }
-                        throw new Exception_1.OakUserUnpermittedException();
                     }
                 };
                 if (relation === 2) {
                     if (data instanceof Array) {
-                        var fkIds = (0, lodash_1.uniq)(data.map(function (d) { return getForeignKeyId_1(d); }));
+                        var fkIds = (0, lodash_1.uniq)(data.map(function (d) { return getForeignKeyId_1(d); }).filter(function (ele) { return !!ele; }));
+                        if (fkIds.length === 0) {
+                            return new Exception_1.OakUserUnpermittedException();
+                        }
                         return {
                             $entity: attr,
                             $filter: (0, filter_1.addFilterSegment)(filterMaker2(userId), { id: { $in: fkIds } }),
@@ -458,6 +462,9 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
                         };
                     }
                     var fkId_1 = getForeignKeyId_1(data);
+                    if (!fkId_1) {
+                        return new Exception_1.OakUserUnpermittedException();
+                    }
                     return {
                         $entity: attr,
                         $filter: (0, filter_1.addFilterSegment)(filterMaker2(userId), { id: fkId_1 }),
@@ -465,7 +472,10 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
                 }
                 (0, assert_1.default)(typeof relation === 'string');
                 if (data instanceof Array) {
-                    var fkIds = (0, lodash_1.uniq)(data.map(function (d) { return getForeignKeyId_1(d); }));
+                    var fkIds = (0, lodash_1.uniq)(data.map(function (d) { return getForeignKeyId_1(d); }).filter(function (ele) { return !!ele; }));
+                    if (fkIds.length === 0) {
+                        return new Exception_1.OakUserUnpermittedException();
+                    }
                     return {
                         $entity: relation,
                         $filter: (0, filter_1.addFilterSegment)(filterMaker2(userId), { id: { $in: fkIds } }),
@@ -473,6 +483,9 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
                     };
                 }
                 var fkId = getForeignKeyId_1(data);
+                if (!fkId) {
+                    return new Exception_1.OakUserUnpermittedException();
+                }
                 return {
                     $entity: relation,
                     $filter: (0, filter_1.addFilterSegment)(filterMaker2(userId), { id: fkId }),
@@ -483,9 +496,9 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
                 var filter_4 = operation.filter;
                 if (filter_4) {
                     var counter = translateCreateFilterMaker(entity2, filter_4, userId);
-                    if (counter instanceof Exception_1.OakUserUnpermittedException) {
-                        throw counter;
-                    }
+                    // if (counter instanceof OakUserUnpermittedException) {
+                    //     throw counter;
+                    // }
                     return counter;
                 }
                 throw new Exception_1.OakUserUnpermittedException();
@@ -593,19 +606,25 @@ function execCreateCounter(context, counter) {
     }
     else if (counter === null || counter === void 0 ? void 0 : counter.$entity) {
         var _a = counter, $entity = _a.$entity, $filter = _a.$filter, _b = _a.$count, $count_1 = _b === void 0 ? 1 : _b;
-        var count = context.count($entity, {
+        // count不走reinforceSelection，先用select
+        var result = context.select($entity, {
+            data: {
+                id: 1,
+            },
             filter: $filter,
+            indexFrom: 0,
+            count: $count_1,
         }, { dontCollect: true });
-        if (count instanceof Promise) {
-            return count.then(function (c2) {
-                if (c2 >= $count_1) {
+        if (result instanceof Promise) {
+            return result.then(function (r2) {
+                if (r2.length >= $count_1) {
                     return undefined;
                 }
                 return new Exception_1.OakUserUnpermittedException();
             });
         }
         else {
-            return count >= $count_1 ? undefined : new Exception_1.OakUserUnpermittedException();
+            return result.length >= $count_1 ? undefined : new Exception_1.OakUserUnpermittedException();
         }
     }
 }
@@ -783,7 +802,10 @@ function createAuthCheckers(schema, authDict) {
                         var filter = makePotentialFilter(operation, context, raFilterMakerDict_1[relation]);
                         return filter;
                     },
-                    errMsg: '越权操作',
+                    errMsg: function (operation, context) {
+                        console.error("\u521B\u5EFA".concat(entity, "\u65F6\u8D8A\u6743\uFF0CuserId\u662F").concat(context.getCurrentUserId(), "\uFF0C\u6570\u636E\u662F").concat(JSON.stringify(operation.data)));
+                        return "\u521B\u5EFA".concat(entity, "\u65F6\u8D8A\u6743");
+                    },
                 });
                 checkers.push({
                     entity: userEntityName,
@@ -841,7 +863,10 @@ function createAuthCheckers(schema, authDict) {
                         }
                         return makeFilterFromRows(toBeRemoved); */
                     },
-                    errMsg: '越权操作',
+                    errMsg: function (operation, context) {
+                        console.error("\u79FB\u9664".concat(entity, "\u65F6\u8D8A\u6743\uFF0CuserId\u662F").concat(context.getCurrentUserId(), "\uFF0C\u79FB\u9664\u6761\u4EF6\u662F").concat(JSON.stringify(operation.filter)));
+                        return "\u79FB\u9664".concat(entity, "\u65F6\u8D8A\u6743");
+                    },
                 });
                 // 转让权限现在用update动作，只允许update userId给其它人
                 // todo 等实现的时候再写
@@ -858,7 +883,11 @@ function createAuthCheckers(schema, authDict) {
                             var filter = makePotentialFilter(operation, context, filterMaker);
                             return filter;
                         },
-                        errMsg: '定义的actionAuth中检查出来越权操作',
+                        errMsg: function (operation, context) {
+                            var _a = operation, action = _a.action, data = _a.data, filter = _a.filter;
+                            console.error("\u5BF9".concat(entity, "\u8FDB\u884C").concat(action, "\u65F6\u8D8A\u6743\uFF0CuserId\u662F").concat(context.getCurrentUserId(), "\n                                \u6570\u636E\u662F").concat(JSON.stringify(data), "\uFF0C\u6761\u4EF6\u662F").concat(JSON.stringify(filter)));
+                            return "\u5BF9".concat(entity, "\u8FDB\u884C").concat(action, "\u65F6\u8D8A\u6743");
+                        },
                     });
                 };
                 for (var a in actionAuth) {
@@ -1216,3 +1245,155 @@ function createRemoveCheckers(schema, authDict) {
     return checkers;
 }
 exports.createRemoveCheckers = createRemoveCheckers;
+function checkAttributeLegal(schema, entity, data) {
+    var _a;
+    var attributes = schema[entity].attributes;
+    for (var attr in data) {
+        if (attributes[attr]) {
+            var _b = attributes[attr], type = _b.type, params = _b.params, defaultValue = _b.default, enumeration = _b.enumeration, notNull = _b.notNull;
+            if (data[attr] === null || data[attr] === undefined) {
+                if (notNull && defaultValue === undefined) {
+                    throw new Exception_1.OakAttrNotNullException(entity, [attr]);
+                }
+                if (defaultValue !== undefined) {
+                    Object.assign(data, (_a = {},
+                        _a[attr] = defaultValue,
+                        _a));
+                }
+                continue;
+            }
+            switch (type) {
+                case 'char':
+                case 'varchar': {
+                    if (typeof data[attr] !== 'string') {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a string');
+                    }
+                    var length_1 = params.length;
+                    if (length_1 && data[attr].length > length_1) {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too long');
+                    }
+                    break;
+                }
+                case 'int':
+                case 'smallint':
+                case 'tinyint':
+                case 'bigint':
+                case 'decimal':
+                case 'money': {
+                    if (typeof data[attr] !== 'number') {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not a number');
+                    }
+                    var _c = params || {}, min = _c.min, max = _c.max;
+                    if (typeof min === 'number' && data[attr] < min) {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too small');
+                    }
+                    if (typeof max === 'number' && data[attr] > max) {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'too big');
+                    }
+                    break;
+                }
+                case 'enum': {
+                    (0, assert_1.default)(enumeration);
+                    if (!enumeration.includes(data[attr])) {
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not in enumberation');
+                    }
+                    break;
+                }
+            }
+        }
+        else {
+            // 这里似乎还有一种update中带cascade remove的case，等遇到再说（貌似cascadeUpdate没有处理完整这种情况） by Xc
+            if (typeof data[attr] === 'object' && data[attr].action === 'remove') {
+                console.warn('cascade remove可能是未处理的边界，请注意');
+            }
+        }
+    }
+}
+function createCreateCheckers(schema) {
+    var checkers = [];
+    var _loop_9 = function (entity) {
+        var _a = schema[entity], attributes = _a.attributes, actions = _a.actions;
+        var notNullAttrs = Object.keys(attributes).filter(function (ele) { return attributes[ele].notNull; });
+        var updateActions = (0, lodash_1.difference)(actions, action_1.excludeUpdateActions);
+        checkers.push({
+            entity: entity,
+            type: 'data',
+            action: 'create',
+            checker: function (data) {
+                var checkData = function (data2) {
+                    var e_9, _a, e_10, _b;
+                    var illegalNullAttrs = (0, lodash_1.difference)(notNullAttrs, Object.keys(data2));
+                    if (illegalNullAttrs.length > 0) {
+                        try {
+                            // 要处理多对一的cascade create
+                            for (var illegalNullAttrs_1 = (e_9 = void 0, tslib_1.__values(illegalNullAttrs)), illegalNullAttrs_1_1 = illegalNullAttrs_1.next(); !illegalNullAttrs_1_1.done; illegalNullAttrs_1_1 = illegalNullAttrs_1.next()) {
+                                var attr = illegalNullAttrs_1_1.value;
+                                if (attr === 'entityId') {
+                                    if (illegalNullAttrs.includes('entity')) {
+                                        continue;
+                                    }
+                                }
+                                else if (attr === 'entity' && attributes[attr].ref) {
+                                    var hasCascadeCreate = false;
+                                    try {
+                                        for (var _c = (e_10 = void 0, tslib_1.__values(attributes[attr].ref)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                            var ref = _d.value;
+                                            if (data2[ref] && data2[ref].action === 'create') {
+                                                hasCascadeCreate = true;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                                    finally {
+                                        try {
+                                            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                                        }
+                                        finally { if (e_10) throw e_10.error; }
+                                    }
+                                    if (hasCascadeCreate) {
+                                        continue;
+                                    }
+                                }
+                                else if (attributes[attr].type === 'ref') {
+                                    var ref = attributes[attr].ref;
+                                    if (data2[ref] && data2[ref].action === 'create') {
+                                        continue;
+                                    }
+                                }
+                                // 到这里说明确实是有not null的属性没有赋值
+                                throw new Exception_1.OakAttrNotNullException(entity, illegalNullAttrs);
+                            }
+                        }
+                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        finally {
+                            try {
+                                if (illegalNullAttrs_1_1 && !illegalNullAttrs_1_1.done && (_a = illegalNullAttrs_1.return)) _a.call(illegalNullAttrs_1);
+                            }
+                            finally { if (e_9) throw e_9.error; }
+                        }
+                    }
+                    checkAttributeLegal(schema, entity, data2);
+                };
+                if (data instanceof Array) {
+                    data.forEach(function (ele) { return checkData(ele); });
+                }
+                else {
+                    checkData(data);
+                }
+            }
+        }, {
+            entity: entity,
+            type: 'data',
+            action: updateActions,
+            checker: function (data) {
+                checkAttributeLegal(schema, entity, data);
+            }
+        });
+    };
+    for (var entity in schema) {
+        _loop_9(entity);
+    }
+    return checkers;
+}
+exports.createCreateCheckers = createCreateCheckers;

package/lib/store/modi.js

@@ -151,8 +151,8 @@ function createModiRelatedTriggers(schema) {
     var _this = this;
     var triggers = [];
     var _loop_2 = function (entity) {
-        var inModi = schema[entity].inModi;
-        if (inModi) {
+        var toModi = schema[entity].toModi;
+        if (toModi) {
             // 当关联modi的对象被删除时，对应的modi也删除。这里似乎只需要删除掉活跃对象？因为oper不能删除，所以oper和modi是必须要支持对deleted对象的容错？
             // 这里没有想清楚，by Xc 20230209
             triggers.push({

package/lib/store/relation.js

@@ -55,6 +55,7 @@ function judgeRelation(schema, entity, attr) {
     else if (attributes.hasOwnProperty('entity')
         && attributes.hasOwnProperty('entityId')
         && schema.hasOwnProperty(attr)) {
+        (0, assert_1.default)(attributes.entity.ref.includes(attr), '不应当出现的case');
         // 反向指针的外键
         return 2;
     }

package/lib/timers/vaccum.js

@@ -5,7 +5,6 @@ var tslib_1 = require("tslib");
 var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 var fs_1 = require("fs");
 var filter_1 = require("../store/filter");
-var node_zlib_1 = require("node:zlib");
 var stream_1 = require("stream");
 var uuid_1 = require("../utils/uuid");
 /**
@@ -23,7 +22,7 @@ function vaccumEntities(option, context) {
                 case 0:
                     entities = option.entities, backupDir = option.backupDir;
                     _loop_1 = function (ele) {
-                        var entity, filter, aliveLine, filter2, zip, now, backFile, fd_1, attributes_1, projection_1, attr, count_1, appendData_1, gzip_1, source_1, destination_1, _c, _d, _e;
+                        var entity, filter, aliveLine, filter2, zip, now, backFile, fd_1, attributes_1, projection_1, attr, count_1, appendData_1, createGzip, gzip_1, source_1, destination_1, _c, _d, _e;
                         var _f, _g;
                         return tslib_1.__generator(this, function (_h) {
                             switch (_h.label) {
@@ -37,7 +36,7 @@ function vaccumEntities(option, context) {
                                     if (filter) {
                                         filter2 = (0, filter_1.combineFilters)([filter2, filter]);
                                     }
-                                    if (!backupDir) return [3 /*break*/, 4];
+                                    if (!(backupDir && process.env.OAK_PLATFORM === 'server')) return [3 /*break*/, 4];
                                     zip = option.zip;
                                     now = (0, dayjs_1.default)();
                                     backFile = "".concat(backupDir, "/").concat(entity, "-").concat(now.format('YYYY-MM-DD HH:mm:ss'), ".csv");
@@ -107,7 +106,8 @@ function vaccumEntities(option, context) {
                                     return [3 /*break*/, 4];
                                 case 2:
                                     if (!zip) return [3 /*break*/, 4];
-                                    gzip_1 = (0, node_zlib_1.createGzip)();
+                                    createGzip = require('zlib').createGzip;
+                                    gzip_1 = createGzip();
                                     source_1 = (0, fs_1.createReadStream)(backFile);
                                     destination_1 = (0, fs_1.createWriteStream)("".concat(backFile, ".zip"));
                                     return [4 /*yield*/, new Promise(function (resolve, reject) {

package/lib/types/Auth.d.ts

@@ -35,7 +35,7 @@ export declare type RelationChecker<ED extends EntityDict, T extends keyof ED, C
     when?: 'after';
     action: ED[T]['Action'] | Array<ED[T]['Action']>;
     relationFilter: (operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option: OperateOption | SelectOption) => SyncOrAsync<ED[T]['Selection']['filter']>;
-    errMsg: string;
+    errMsg: string | ((operation: ED[T]['Operation'] | ED[T]['Selection'], context: Cxt, option?: OperateOption | SelectOption) => string);
     conditionalFilter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Operation'], context: Cxt, option: OperateOption) => SyncOrAsync<ED[T]['Selection']['filter']>);
 };
 export declare type LogicalChecker<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = {

package/lib/types/Connector.d.ts

@@ -24,4 +24,10 @@ export declare abstract class Connector<ED extends EntityDict, BackCxt extends A
         body: any;
         headers?: Record<string, any>;
     };
+    abstract getBridgeRouter(): string;
+    abstract makeBridgeUrl(url: string, headers?: Record<string, string>): string;
+    abstract parseBridgeRequestQuery(urlParams: string): {
+        url: string;
+        headers?: Record<string, string>;
+    };
 }

package/lib/types/Entity.d.ts

@@ -65,7 +65,7 @@ export interface EntityShape {
     $$updateAt$$: number | Date;
     $$deleteAt$$?: number | Date | null;
 }
-interface GeneralEntityShape extends EntityShape {
+export interface GeneralEntityShape extends EntityShape {
     [K: string]: any;
 }
 export declare type MakeAction<A extends string> = A;
@@ -181,4 +181,5 @@ export declare type Configuration = {
     actionType?: ActionType;
     static?: boolean;
 };
+export declare type OtmKey<K extends string> = K | `${K}$${number}`;
 export {};

package/lib/types/Exception.d.ts

@@ -55,12 +55,15 @@ export declare class OakRowInconsistencyException<ED extends EntityDict> extends
 export declare class OakInputIllegalException<ED extends EntityDict> extends OakUserException<ED> {
     private attributes;
     private entity;
-    constructor(entity: string, attributes: string[], message?: string);
-    getEntity(): string;
+    constructor(entity: keyof ED, attributes: string[], message?: string);
+    getEntity(): keyof ED;
     getAttributes(): string[];
     addAttributesPrefix(prefix: string): void;
     toString(): string;
 }
+export declare class OakAttrNotNullException<ED extends EntityDict> extends OakInputIllegalException<ED> {
+    constructor(entity: keyof ED, attributes: string[], message?: string);
+}
 /**
  * 用户权限不够时抛的异常
  */

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakException = void 0;
+exports.makeException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakDataException = exports.OakException = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var OakException = /** @class */ (function (_super) {
@@ -179,6 +179,15 @@ var OakInputIllegalException = /** @class */ (function (_super) {
 }(OakUserException));
 exports.OakInputIllegalException = OakInputIllegalException;
 ;
+// 属性为空
+var OakAttrNotNullException = /** @class */ (function (_super) {
+    tslib_1.__extends(OakAttrNotNullException, _super);
+    function OakAttrNotNullException(entity, attributes, message) {
+        return _super.call(this, entity, attributes, message || '属性不允许为空') || this;
+    }
+    return OakAttrNotNullException;
+}(OakInputIllegalException));
+exports.OakAttrNotNullException = OakAttrNotNullException;
 /**
  * 用户权限不够时抛的异常
  */
@@ -344,6 +353,11 @@ function makeException(data) {
             e.setOpRecords(data.opRecords);
             return e;
         }
+        case 'OakAttrNotNullException': {
+            var e = new OakAttrNotNullException(data.entity, data.attributes, data.message);
+            e.setOpRecords(data.opRecords);
+            return e;
+        }
         default:
             return;
     }

package/lib/utils/SimpleConnector.d.ts

@@ -4,8 +4,10 @@ import { AsyncContext, AsyncRowStore } from '../store/AsyncRowStore';
 import { SyncContext } from '../store/SyncRowStore';
 import { Connector, EntityDict, OakException } from "../types";
 export declare class SimpleConnector<ED extends EntityDict, BackCxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>> extends Connector<ED, BackCxt, FrontCxt> {
-    static ROUTER: string;
-    private serverUrl;
+    static ASPECT_ROUTER: string;
+    static BRIDGE_ROUTER: string;
+    private serverAspectUrl;
+    private serverBridgeUrl;
     private makeException;
     private contextBuilder;
     constructor(serverUrl: string, makeException: (exceptionData: any) => OakException<ED>, contextBuilder: (str: string | undefined) => (store: AsyncRowStore<ED, BackCxt>) => Promise<BackCxt>);
@@ -32,4 +34,15 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
         body: any;
         headers?: Record<string, any> | undefined;
     };
+    getBridgeRouter(): string;
+    /**
+     * 通过本地服务器桥接访问外部资源的url
+     * @param url
+     * @param headers
+     */
+    makeBridgeUrl(url: string, headers?: Record<string, string>): string;
+    parseBridgeRequestQuery(urlParams: string): {
+        url: string;
+        headers?: Record<string, string> | undefined;
+    };
 }

package/lib/utils/SimpleConnector.js

@@ -4,6 +4,7 @@ exports.SimpleConnector = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var stream_1 = require("stream");
+var url_1 = tslib_1.__importDefault(require("url"));
 var types_1 = require("../types");
 function makeContentTypeAndBody(data) {
     //
@@ -24,7 +25,8 @@ var SimpleConnector = /** @class */ (function (_super) {
     tslib_1.__extends(SimpleConnector, _super);
     function SimpleConnector(serverUrl, makeException, contextBuilder) {
         var _this = _super.call(this) || this;
-        _this.serverUrl = "".concat(serverUrl).concat(SimpleConnector.ROUTER);
+        _this.serverAspectUrl = "".concat(serverUrl).concat(SimpleConnector.ASPECT_ROUTER);
+        _this.serverBridgeUrl = "".concat(serverUrl).concat(SimpleConnector.BRIDGE_ROUTER);
         _this.makeException = makeException;
         _this.contextBuilder = contextBuilder;
         return _this;
@@ -37,7 +39,7 @@ var SimpleConnector = /** @class */ (function (_super) {
                     case 0:
                         cxtStr = context.toString();
                         _a = makeContentTypeAndBody(params), contentType = _a.contentType, body = _a.body;
-                        return [4 /*yield*/, global.fetch(this.serverUrl, {
+                        return [4 /*yield*/, global.fetch(this.serverAspectUrl, {
                                 method: 'POST',
                                 headers: Object.assign({
                                     'oak-cxt': cxtStr,
@@ -82,7 +84,7 @@ var SimpleConnector = /** @class */ (function (_super) {
         });
     };
     SimpleConnector.prototype.getRouter = function () {
-        return SimpleConnector.ROUTER;
+        return SimpleConnector.ASPECT_ROUTER;
     };
     SimpleConnector.prototype.parseRequest = function (headers, body, store) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -139,7 +141,40 @@ var SimpleConnector = /** @class */ (function (_super) {
             },
         };
     };
-    SimpleConnector.ROUTER = '/aspect';
+    SimpleConnector.prototype.getBridgeRouter = function () {
+        return SimpleConnector.BRIDGE_ROUTER;
+    };
+    /**
+     * 通过本地服务器桥接访问外部资源的url
+     * @param url
+     * @param headers
+     */
+    SimpleConnector.prototype.makeBridgeUrl = function (url, headers) {
+        // if (process.env.PROD !== 'true') {
+        //     console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
+        //     return url;
+        // }
+        var encodeUrl = encodeURIComponent(url);
+        // const urlParse = URL.parse(url, true);
+        // const { search } = urlParse as {
+        //     search: string;
+        // };
+        // if (headers) {
+        //     search.append('headers', JSON.stringify(headers));
+        // }
+        return "".concat(this.serverBridgeUrl, "?url=").concat(encodeUrl);
+    };
+    SimpleConnector.prototype.parseBridgeRequestQuery = function (urlParams) {
+        var search = new url_1.default.URLSearchParams(urlParams);
+        var url = search.get('url');
+        var headers = search.get('headers');
+        return {
+            url: url,
+            headers: headers && JSON.parse(headers),
+        };
+    };
+    SimpleConnector.ASPECT_ROUTER = '/aspect';
+    SimpleConnector.BRIDGE_ROUTER = '/bridge';
     return SimpleConnector;
 }(types_1.Connector));
 exports.SimpleConnector = SimpleConnector;

package/lib/utils/money.d.ts

@@ -2,4 +2,5 @@ declare const ToCent: (float: number) => number;
 declare const ToYuan: (int: number) => number;
 declare const StringToCent: (value: string, allowNegative?: true) => number | undefined;
 declare const CentToString: (value: number) => string | undefined;
-export { ToCent, ToYuan, StringToCent, CentToString, };
+declare const ThousandCont: (value: number) => string | undefined;
+export { ToCent, ToYuan, StringToCent, CentToString, ThousandCont };

package/lib/utils/money.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CentToString = exports.StringToCent = exports.ToYuan = exports.ToCent = void 0;
+exports.ThousandCont = exports.CentToString = exports.StringToCent = exports.ToYuan = exports.ToCent = void 0;
 var ToCent = function (float) {
     return Math.round(float * 100);
 };
@@ -22,3 +22,19 @@ var CentToString = function (value) {
     }
 };
 exports.CentToString = CentToString;
+var ThousandCont = function (value) {
+    var value1 = "".concat(value);
+    var numArr = value1.split('.');
+    value1 = numArr[0];
+    var result = '';
+    while (value1.length > 3) {
+        result = ',' + value1.slice(-3) + result;
+        value1 = value1.slice(0, value1.length - 3);
+    }
+    if (value1) {
+        result = value1 + result;
+    }
+    result = result + '.' + numArr[1];
+    return result;
+};
+exports.ThousandCont = ThousandCont;

package/lib/utils/validator.js

@@ -114,7 +114,7 @@ function checkAttributesNotNull(entity, data, attributes, allowEmpty) {
         }
     });
     if (attrs.length > 0) {
-        throw new types_1.OakInputIllegalException(entity, attrs, '属性不能为空');
+        throw new types_1.OakAttrNotNullException(entity, attrs, '属性不能为空');
     }
 }
 exports.checkAttributesNotNull = checkAttributesNotNull;

package/lib/utils/version.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 版本比较
+ * @param curVersion 当前版本
+ * @param reqVersion 比较版本
+ * @returns
+ */
+export declare const compareVersion: (curVersion: string, reqVersion: string) => number;