midway-fatcms 0.0.16 → 0.0.17

package/dist/service/curd/CurdMixByDictService.js

@@ -12,25 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurdMixByDictService = void 0;
 const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
-const CurdProService_1 = require("./CurdProService");
 const CurdMixUtils_1 = require("./CurdMixUtils");
-const SystemTables_1 = require("../../models/SystemTables");
-const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
-const global_config_1 = require("../../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../../models/bizmodels");
+const BizMemCacheStore_1 = require("../../service/base/bizmemcache/BizMemCacheStore");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
 let CurdMixByDictService = class CurdMixByDictService {
-    async getFromCache(code) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByDict);
-        return cacheService.getJsonObject(code);
-    }
-    async setToCache(code, value) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByDict);
-        return cacheService.setJsonObject(code, value);
-    }
     async handleExecuteContextPrepare(executeContext) {
         const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
         if (!codes || codes.length === 0) {
@@ -40,42 +27,17 @@ let CurdMixByDictService = class CurdMixByDictService {
         executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
     }
     async getDictItemRows(codes) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const noCacheCodes = [];
-        // 从缓存里面取
-        let cachedRows = [];
-        for (let i = 0; i < codes.length; i++) {
-            const code = codes[i];
-            const rows1 = await this.getFromCache(code);
-            // const rows1 = [];
-            if (rows1 && rows1.length > 0) {
-                cachedRows = cachedRows.concat(rows1);
-            }
-            else {
-                noCacheCodes.push(code);
-            }
-        }
-        // 从数据库里面取
+        var _a;
+        const dictCodeMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getDataDictItem()) === null || _a === void 0 ? void 0 : _a.dictCodeMap) || {};
         let selectedRows = [];
-        if (noCacheCodes.length > 0) {
-            const res1 = await this.curdProService.executeCrudByCfg({
-                columns: ['dict_code', 'label', 'value', 'style', 'code'],
-                condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0, status: 1 },
-            }, {
-                sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
-                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemDbName,
-                sqlDbType: SystemDbType,
-            });
-            selectedRows = res1.getResRows();
-            //放到缓存里
-            for (let i = 0; i < noCacheCodes.length; i++) {
-                const noCacheCode = noCacheCodes[i];
-                const rows1 = selectedRows.filter(e => e.dict_code === noCacheCode);
-                await this.setToCache(noCacheCode, rows1);
+        for (let index = 0; index < codes.length; index++) {
+            const dict_code = codes[index];
+            const itemRows = dictCodeMap[dict_code];
+            if (Array.isArray(itemRows)) {
+                selectedRows = selectedRows.concat(itemRows);
             }
         }
-        return cachedRows.concat(selectedRows);
+        return selectedRows;
     }
     async handleExecuteContext(executeContext) {
         const multiKeyMap = executeContext[TMP_CTX_KEY];
@@ -101,14 +63,6 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], CurdMixByDictService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], CurdMixByDictService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], CurdMixByDictService.prototype, "cacheServiceFactory", void 0);
 CurdMixByDictService = __decorate([
     (0, core_1.Provide)()
 ], CurdMixByDictService);

package/dist/service/curd/CurdMixBySysConfigService.d.ts

@@ -1,12 +1,7 @@
 import { Context } from '@midwayjs/koa';
-import { CurdProService } from './CurdProService';
 import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 export declare class CurdMixBySysConfigService implements IExecuteContextHandler {
     ctx: Context;
-    protected curdProService: CurdProService;
-    private cacheServiceFactory;
-    private getFromCache;
-    private setToCache;
     private queryConfigRowsUseCache;
     handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
     handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -11,59 +11,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurdMixBySysConfigService = void 0;
 const core_1 = require("@midwayjs/core");
-const CurdProService_1 = require("./CurdProService");
 const CurdMixUtils_1 = require("./CurdMixUtils");
 const _ = require("lodash");
-const SystemTables_1 = require("../../models/SystemTables");
-const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const parseConfig_1 = require("../../libs/utils/parseConfig");
-const global_config_1 = require("../../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../../models/bizmodels");
+const BizMemCacheStore_1 = require("../../service/base/bizmemcache/BizMemCacheStore");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.sysCfgEnum);
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 let CurdMixBySysConfigService = class CurdMixBySysConfigService {
-    async getFromCache(code) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.GetSysConfigOne);
-        return cacheService.getJsonObject(code);
-    }
-    async setToCache(code, value) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.GetSysConfigOne);
-        return cacheService.setJsonObject(code, value);
-    }
-    async queryConfigRowsUseCache(codes) {
-        const resultRowMap = {};
-        for (let i = 0; i < codes.length; i++) {
-            const code = codes[i];
-            const row = await this.getFromCache(code);
-            if (row) {
-                resultRowMap[code] = row;
-            }
-        }
-        const notCachedCodes = codes.filter((code) => !resultRowMap[code]);
-        if (notCachedCodes.length === 0) {
-            return Object.values(resultRowMap);
-        }
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res1 = await this.curdProService.executeCrudByCfg({
-            condition: { config_code: { $in: notCachedCodes }, deleted_at: 0, status: 1 },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
+    queryConfigRowsUseCache(codes) {
+        var _a;
+        const codeSet = new Set(codes);
+        const sysConfigList = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysConfig()) === null || _a === void 0 ? void 0 : _a.sysConfigList) || [];
+        return sysConfigList.filter((row) => {
+            const { config_code } = row;
+            return codeSet.has(config_code);
         });
-        const rows = res1.getResRows();
-        if (Array.isArray(rows) && rows.length > 0) {
-            for (let i = 0; i < rows.length; i++) {
-                const row = rows[i];
-                const { config_code } = row;
-                await this.setToCache(config_code, row);
-                resultRowMap[config_code] = row;
-            }
-        }
-        return Object.values(resultRowMap);
     }
     async handleExecuteContextPrepare(executeContext) {
         const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
@@ -71,7 +34,7 @@ let CurdMixBySysConfigService = class CurdMixBySysConfigService {
             return;
         }
         const multiKeyMap = new MultiKeyMap_1.MultiKeyMap();
-        const rows = await this.queryConfigRowsUseCache(codes);
+        const rows = this.queryConfigRowsUseCache(codes);
         for (let i = 0; i < rows.length; i++) {
             const row = rows[i];
             const { config_code } = row;
@@ -104,14 +67,6 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], CurdMixBySysConfigService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], CurdMixBySysConfigService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], CurdMixBySysConfigService.prototype, "cacheServiceFactory", void 0);
 CurdMixBySysConfigService = __decorate([
     (0, core_1.Provide)()
 ], CurdMixBySysConfigService);

package/dist/service/curd/CurdMixByWorkbenchService.d.ts

@@ -4,7 +4,6 @@ import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/cru
 export declare class CurdMixByWorkbenchService implements IExecuteContextHandler {
     protected ctx: Context;
     protected curdProService: CurdProService;
-    private cacheServiceFactory;
     private loadWorkbenchListMap;
     handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
     handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -8,44 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var CurdMixByWorkbenchService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurdMixByWorkbenchService = void 0;
 const core_1 = require("@midwayjs/core");
 const _ = require("lodash");
 const CurdProService_1 = require("./CurdProService");
 const CurdMixUtils_1 = require("./CurdMixUtils");
-const SystemTables_1 = require("../../models/SystemTables");
-const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
-const global_config_1 = require("../../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../../models/bizmodels");
+const BizMemCacheStore_1 = require("../../service/base/bizmemcache/BizMemCacheStore");
 const workbenchMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.workbenchBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
-let CurdMixByWorkbenchService = CurdMixByWorkbenchService_1 = class CurdMixByWorkbenchService {
+let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
     async loadWorkbenchListMap() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
-            cacheName: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
-            refreshCache: false,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(CurdMixByWorkbenchService_1);
-                const reqJson = {
-                    columns: 'workbench_code,workbench_name,workbench_domain',
-                    condition: { deleted_at: 0, status: 1 },
-                };
-                const res = await service.curdProService.executeCrudByCfg(reqJson, {
-                    sqlTable: SystemTables_1.SystemTables.sys_workbench,
-                    sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                    sqlDatabase: SystemDbName,
-                    sqlDbType: SystemDbType,
-                });
-                const workbenchList = res.getResRows();
-                return MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);
-            },
-        });
+        var _a;
+        const workbenchList = ((_a = BizMemCacheStore_1.bizMemCacheStore.getWorkbench()) === null || _a === void 0 ? void 0 : _a.workbenchList) || [];
+        return MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);
     }
     async handleExecuteContextPrepare(executeContext) {
         const relations = workbenchMixUtils.pickColumnRelations(executeContext);
@@ -55,12 +32,12 @@ let CurdMixByWorkbenchService = CurdMixByWorkbenchService_1 = class CurdMixByWor
         executeContext[TMP_CTX_KEY] = await this.loadWorkbenchListMap();
     }
     async handleExecuteContext(executeContext) {
-        const userInfoMap = executeContext[TMP_CTX_KEY];
-        if (!userInfoMap || userInfoMap.size === 0) {
+        const workbenchInfoMap = executeContext[TMP_CTX_KEY];
+        if (!workbenchInfoMap || workbenchInfoMap.size === 0) {
             return;
         }
         workbenchMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
-            workbenchMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+            workbenchMixUtils.copyColumnRelationToRowNoRelatedCode(row, workbenchInfoMap, columnRelation);
         });
     }
 };
@@ -72,11 +49,7 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CurdProService_1.CurdProService)
 ], CurdMixByWorkbenchService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], CurdMixByWorkbenchService.prototype, "cacheServiceFactory", void 0);
-CurdMixByWorkbenchService = CurdMixByWorkbenchService_1 = __decorate([
+CurdMixByWorkbenchService = __decorate([
     (0, core_1.Provide)()
 ], CurdMixByWorkbenchService);
 exports.CurdMixByWorkbenchService = CurdMixByWorkbenchService;

package/dist/service/curd/CurdProService.d.ts

@@ -191,6 +191,5 @@ export declare class CurdProService extends BaseService {
      * );
      */
     getAllTableInfos(query: ITableNamesQuery, options?: ITableNamesOptions): Promise<ITableListResult>;
-    loadMethodCache(ctx?: any): Promise<void>;
     loadTableMetaCache(ctx?: any): Promise<void>;
 }

package/dist/service/curd/CurdProService.js

@@ -25,7 +25,6 @@ const crud_sharding_1 = require("../../libs/crud-sharding");
 const fixCfgModel_1 = require("./fixCfgModel");
 const global_config_1 = require("../../libs/global-config/global-config");
 const fixSoftDelete_1 = require("../../libs/crud-pro-quick/fixSoftDelete");
-const CrudProCachedCfgService_1 = require("../../libs/crud-pro/services/CrudProCachedCfgService");
 function toVisitor(ctx) {
     const workbenchInfo = ctx.workbenchInfo;
     const userSession = ctx.userSession;
@@ -360,9 +359,6 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
         const curdPro = this.getCrudPro();
         return curdPro.getAllTableInfos(query, options);
     }
-    async loadMethodCache(ctx) {
-        (0, CrudProCachedCfgService_1.clearMethodCache)();
-    }
     async loadTableMetaCache(ctx) {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         await this.getAllTableInfos({

package/dist/service/proxyapi/ProxyApiLoadService.d.ts

@@ -1,21 +1,16 @@
-import { Context } from '@midwayjs/koa';
 import { BaseService } from '../base/BaseService';
 import { RouteTrie } from './RouteTrie';
 /**
  * 接口代理。 数据加载
  */
 export declare class ProxyApiLoadService extends BaseService {
-    protected ctx: Context;
-    private curdProService;
     private workbenchService;
     /**
-     * 创建路由树。刷新路由缓存
-     * 先构建全新的 RouteTrie，完成后原子替换，避免重建期间路由不可用
-     * @param workbench_code
+     * 获取站点路由树；routeTrieMap 为空或缺失时懒重建
      */
-    buildRouteTrie(workbench_code: string): Promise<RouteTrie>;
+    getRouteTrie(workbench_code: string): RouteTrie;
+    private buildRouteTrie;
     private buildUpstreamMap;
     private loadProxyApiEntity;
     private addUpstreamInfo;
-    refreshRouteTrie(): Promise<any>;
 }

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -15,16 +15,13 @@ const _ = require("lodash");
 const BaseService_1 = require("../base/BaseService");
 const RouteTrie_1 = require("./RouteTrie");
 const RouteHandler_1 = require("./RouteHandler");
-const CurdProService_1 = require("../curd/CurdProService");
-const SystemTables_1 = require("../../models/SystemTables");
-const keys_1 = require("../../libs/crud-pro/models/keys");
 const functions_1 = require("../../libs/utils/functions");
 const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const WeightedRandom_1 = require("./WeightedRandom");
 const WeightedRoundRobin_1 = require("./WeightedRoundRobin");
+const BizMemCacheStore_1 = require("../../service/base/bizmemcache/BizMemCacheStore");
 const WorkbenchService_1 = require("../WorkbenchService");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
-const global_config_1 = require("../../libs/global-config/global-config");
 function toUpstreamInfo(config_content) {
     const obj = (0, functions_1.parseJsonObject)(config_content);
     if (!obj) {
@@ -62,40 +59,41 @@ function toUpstreamInfo(config_content) {
  */
 let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseService {
     /**
-     * 创建路由树。刷新路由缓存
-     * 先构建全新的 RouteTrie，完成后原子替换，避免重建期间路由不可用
-     * @param workbench_code
+     * 获取站点路由树；routeTrieMap 为空或缺失时懒重建
      */
-    async buildRouteTrie(workbench_code) {
-        const upstreamMap = await this.buildUpstreamMap();
-        const newRouteTrie = new RouteTrie_1.RouteTrie();
-        const entities = await this.loadProxyApiEntity(workbench_code, upstreamMap);
+    getRouteTrie(workbench_code) {
+        var _a;
+        const cacheObj = BizMemCacheStore_1.bizMemCacheStore.getSysProxyApi();
+        if ((_a = cacheObj === null || cacheObj === void 0 ? void 0 : cacheObj.routeTrieMap) === null || _a === void 0 ? void 0 : _a[workbench_code]) {
+            return cacheObj.routeTrieMap[workbench_code];
+        }
+        return this.buildRouteTrie(workbench_code);
+    }
+    buildRouteTrie(workbench_code) {
+        const upstreamMap = this.buildUpstreamMap();
+        const routeTrie = new RouteTrie_1.RouteTrie();
+        const entities = this.loadProxyApiEntity(workbench_code, upstreamMap);
         for (let i = 0; i < entities.length; i++) {
             const entity = entities[i];
             if (entity.status === 1) {
                 const path_prefix2 = '/' + entity.upstream_code + entity.path_prefix;
-                newRouteTrie.addRoute(path_prefix2, new RouteHandler_1.RouteHandler(entity));
+                routeTrie.addRoute(path_prefix2, new RouteHandler_1.RouteHandler(entity));
             }
         }
-        (0, RouteTrie_1.setRouteTrie)(workbench_code, newRouteTrie);
-        return newRouteTrie;
+        const cacheObj = BizMemCacheStore_1.bizMemCacheStore.getSysProxyApi();
+        if (cacheObj) {
+            if (!cacheObj.routeTrieMap) {
+                cacheObj.routeTrieMap = {};
+            }
+            cacheObj.routeTrieMap[workbench_code] = routeTrie;
+        }
+        return routeTrie;
     }
-    async buildUpstreamMap() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        //       biz_tag={'upstream'}
-        const res = await this.curdProService.executeCrudByCfg({
-            condition: {
-                biz_tag: 'upstream',
-                deleted_at: 0,
-            },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-        });
+    buildUpstreamMap() {
+        var _a;
+        const sysConfigList = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysConfig()) === null || _a === void 0 ? void 0 : _a.sysConfigList) || [];
+        const rows = sysConfigList.filter((row) => row.biz_tag === 'upstream');
         const upstreamMap = {};
-        const rows = res.getResRows();
         for (let i = 0; i < rows.length; i++) {
             const row = rows[i];
             const { config_code, config_content } = row || {};
@@ -103,30 +101,24 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         }
         return upstreamMap;
     }
-    async loadProxyApiEntity(workbench_code, upstreamMap) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res = await this.curdProService.executeCrudByCfg({
-            condition: {},
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_proxyapi,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-        });
-        const rows0 = res.getResRows();
-        const rows = rows0.filter(s => {
+    loadProxyApiEntity(workbench_code, upstreamMap) {
+        var _a;
+        const rows0 = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysProxyApi()) === null || _a === void 0 ? void 0 : _a.sysProxyApiList) || [];
+        const rows = [];
+        for (let i = 0; i < rows0.length; i++) {
+            const s = rows0[i];
             if (!(0, functions_1.isEntityOK)(s)) {
-                return false;
+                continue;
             }
             if (!s.workbench_code_array) {
                 throw new exceptions_1.CommonException('IS_SUPPORT_CURRENT_WORKBENCH', '未配置支持的站点字段');
             }
-            return this.workbenchService.isMatchWorkbenchCode(s.workbench_code_array, workbench_code);
-        });
-        for (let i = 0; i < rows.length; i++) {
-            const row = rows[i];
-            const upstream_code = row.upstream_code;
-            this.addUpstreamInfo(row, upstream_code, upstreamMap);
+            if (!this.workbenchService.isMatchWorkbenchCode(s.workbench_code_array, workbench_code)) {
+                continue;
+            }
+            const row = JSON.parse(JSON.stringify(s));
+            this.addUpstreamInfo(row, row.upstream_code, upstreamMap);
+            rows.push(row);
         }
         return rows;
     }
@@ -141,27 +133,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         row.weightedRandom = new WeightedRandom_1.WeightedRandom(upstreamInfo.targetList || []);
         row.weightedRoundRobin = new WeightedRoundRobin_1.WeightedRoundRobin(upstreamInfo.targetList || []);
     }
-    async refreshRouteTrie() {
-        const workbenchList = await this.workbenchService.getAllWorkbenchInfoList();
-        for (let i = 0; i < workbenchList.length; i++) {
-            const workbenchInfo = workbenchList[i];
-            try {
-                await this.buildRouteTrie(workbenchInfo.workbench_code);
-            }
-            catch (e) {
-                this.logError('ProxyApiLoadService_runBySchedule', e);
-            }
-        }
-    }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], ProxyApiLoadService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], ProxyApiLoadService.prototype, "curdProService", void 0);
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", WorkbenchService_1.WorkbenchService)

package/dist/service/proxyapi/ProxyApiService.d.ts

@@ -56,6 +56,8 @@ export declare class ProxyApiService extends ApiBaseService {
      * @private
      */
     private selectTargetByBalanceStrategy;
+    private buildRequestHeaders;
     private setRequestHeaders;
+    private buildRequestBody;
     private buildUserContextHeader;
 }

package/dist/service/proxyapi/ProxyApiService.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyApiService = void 0;
 const core_1 = require("@midwayjs/core");
 const _ = require("lodash");
-const RouteTrie_1 = require("./RouteTrie");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const devops_1 = require("../../models/devops");
 const CurdProService_1 = require("../curd/CurdProService");
@@ -23,6 +22,7 @@ const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const ProxyApiLoadService_1 = require("./ProxyApiLoadService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const base64_1 = require("../../libs/utils/base64");
+const functions_1 = require("../../libs/utils/functions");
 /**
  * 接口代理
  */
@@ -33,7 +33,7 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
      * @param upstream_path : 形如/[upstream_code]/[api_path]
      */
     async handleProxyRequest(current_workbench_code, upstream_path) {
-        const routeTrie = (0, RouteTrie_1.getRouteTrie)(current_workbench_code);
+        const routeTrie = this.proxyApiLoadService.getRouteTrie(current_workbench_code);
         const ss = routeTrie.findLongestMatch(upstream_path);
         if (!ss) {
             throw new devops_1.BizException('路径没有匹配到', exceptions_1.Exceptions.CFG_NOT_FOUND);
@@ -69,16 +69,12 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
         // const response_type: ResponseType = (proxyApiEntity.response_type || 'stream') as any;
         const response_type = 'stream';
         try {
-            const headers = {
-                ...ctx.headers,
-                host: targetUrl.host, // 设置正确的 host
-            };
-            delete headers['content-length'];
-            this.setRequestHeaders(headers, proxyApiEntity);
+            const headers = this.buildRequestHeaders(targetUrl.host, proxyApiEntity);
+            const requestBody = this.buildRequestBody(ctx.request.body, proxyApiEntity);
             const axiosParams = {
                 method: ctx.method,
                 url: targetUrl.toString(),
-                data: ctx.request.body,
+                data: requestBody,
                 headers: headers,
                 responseType: response_type,
                 timeout: Number(proxyApiEntity.timeout_ms) || 5 * 60 * 1000,
@@ -227,6 +223,16 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
         const ss = targetList[proxyApiEntity.targetIndex];
         return ss ? ss.origin : null;
     }
+    buildRequestHeaders(targetHost, proxyApiEntity) {
+        const ctx = this.ctx;
+        const headers = {
+            ...ctx.headers,
+            host: targetHost, // 设置正确的 host
+        };
+        delete headers['content-length'];
+        this.setRequestHeaders(headers, proxyApiEntity);
+        return headers;
+    }
     setRequestHeaders(headers, proxyApiEntity) {
         const ctx = this.ctx;
         // 转发IP
@@ -251,6 +257,23 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
         if (proxyApiEntity.change_origin && proxyApiEntity.change_origin.length > 0) {
             headers.origin = proxyApiEntity.change_origin;
         }
+        // 强制设置自定义Header
+        const custom_header = (0, functions_1.parseJsonObject)(proxyApiEntity.custom_header);
+        if (custom_header && typeof custom_header === 'object' && Object.keys(custom_header).length > 0) {
+            Object.assign(headers, custom_header);
+        }
+    }
+    buildRequestBody(requestBody, proxyApiEntity) {
+        // 强制设置自定义body
+        const custom_body = (0, functions_1.parseJsonObject)(proxyApiEntity.custom_body);
+        if (custom_body && typeof custom_body === 'object' && Object.keys(custom_body).length > 0) {
+            if (requestBody && typeof requestBody === 'object') {
+                Object.assign(requestBody, custom_body);
+                return requestBody;
+            }
+            return custom_body;
+        }
+        return requestBody;
     }
     buildUserContextHeader(proxyApiEntity) {
         var _a, _b, _c;

package/dist/service/proxyapi/RouteTrie.d.ts

@@ -8,10 +8,4 @@ declare class RouteTrie {
     getRouteCount(): number;
     findLongestMatch(path: string): any;
 }
-declare function getRouteTrie(domainCode: string): RouteTrie;
-/**
- * 原子替换指定 domainCode 的 RouteTrie
- * 用于重建路由时先构建新树再整体替换，避免清空后重建期间路由不可用
- */
-declare function setRouteTrie(domainCode: string, routeTrie: RouteTrie): void;
-export { RouteTrie, getRouteTrie, setRouteTrie };
+export { RouteTrie };

package/dist/service/proxyapi/RouteTrie.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRouteTrie = exports.getRouteTrie = exports.RouteTrie = void 0;
+exports.RouteTrie = void 0;
 class RouteTrieNode {
     constructor() {
         this.children = {}; // 子节点字典
@@ -54,19 +54,3 @@ class RouteTrie {
     }
 }
 exports.RouteTrie = RouteTrie;
-const ROUTE_TRIE_MANAGER = {};
-function getRouteTrie(domainCode) {
-    if (!ROUTE_TRIE_MANAGER[domainCode]) {
-        ROUTE_TRIE_MANAGER[domainCode] = new RouteTrie();
-    }
-    return ROUTE_TRIE_MANAGER[domainCode];
-}
-exports.getRouteTrie = getRouteTrie;
-/**
- * 原子替换指定 domainCode 的 RouteTrie
- * 用于重建路由时先构建新树再整体替换，避免清空后重建期间路由不可用
- */
-function setRouteTrie(domainCode, routeTrie) {
-    ROUTE_TRIE_MANAGER[domainCode] = routeTrie;
-}
-exports.setRouteTrie = setRouteTrie;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",