midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.50

package/dist/service/curd/CurdProService.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CurdProService = exports.DBUtils = void 0;
+exports.CurdProService = void 0;
 const _ = require("lodash");
 const core_1 = require("@midwayjs/core");
 const CrudPro_1 = require("../../libs/crud-pro/CrudPro");
@@ -20,7 +20,9 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const ExecuteContextFunc_1 = require("../../libs/crud-pro/models/ExecuteContextFunc");
 const BaseService_1 = require("../base/BaseService");
-const bizmodels_1 = require("../../models/bizmodels");
+const CrudProQuick_1 = require("../../service/curd/CrudProQuick");
+const fixCfgModel_1 = require("./fixCfgModel");
+const global_config_1 = require("../../libs/global-config/global-config");
 function toVisitor(ctx) {
     const workbenchInfo = ctx.workbenchInfo;
     const userSession = ctx.userSession;
@@ -35,6 +37,7 @@ function toVisitor(ctx) {
             roleCodes: [],
             functionCodes: [],
             workbenchCode: (workbenchInfo === null || workbenchInfo === void 0 ? void 0 : workbenchInfo.workbench_code) || '',
+            bizExt: {}
         };
     }
     const sessionInfo = userSession.getSessionInfo();
@@ -48,6 +51,7 @@ function toVisitor(ctx) {
         roleCodes: sessionInfo.roleCodes || [],
         functionCodes: sessionInfo.functionCodes || [],
         workbenchCode: (workbenchInfo === null || workbenchInfo === void 0 ? void 0 : workbenchInfo.workbench_code) || '',
+        bizExt: sessionInfo.bizExt || {}
     };
 }
 class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
@@ -61,27 +65,30 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
     }
     async getConnectionPool(sqlCfgModel) {
         if (!sqlCfgModel.sqlDatabase) {
-            console.error('查询语句中未指定数据库', sqlCfgModel.executeSql);
+            console.error('[MyContextFunc]查询语句中未指定数据库', sqlCfgModel.executeSql);
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
         }
         const dataBaseName = sqlCfgModel.sqlDatabase;
-        const sqlDdType = sqlCfgModel.sqlDdType;
-        if (sqlDdType === keys_1.SqlDbType.postgres) {
+        const sqlDbType = sqlCfgModel.sqlDbType;
+        if (sqlDbType === keys_1.SqlDbType.postgres) {
             const dbConfig = _.get(this.postgres2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('[MyContextFunc]postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
             }
             return (0, PostgresUtils_1.getConnectionPool)(dataBaseName, dbConfig);
         }
-        if (sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlDbType === keys_1.SqlDbType.sqlserver) {
             const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
             if (!dbConfig) {
+                console.error('[MyContextFunc]sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
             }
             return (0, SqlServerUtils_1.getConnectionPool)(dataBaseName, dbConfig);
         }
         const dbConfig = _.get(this.mysql2Config, dataBaseName);
         if (!dbConfig) {
+            console.error('[MyContextFunc]MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.DB_NOT_FOUND, 'MySQL配置中不存在此数据库:' + dataBaseName);
         }
         return (0, MySQLUtils_1.getConnectionPool)(dataBaseName, dbConfig);
@@ -96,43 +103,19 @@ class MyContextFunc extends ExecuteContextFunc_1.BaseExecuteContextFunc {
         }
         return null;
     }
-}
-class DBUtils {
-    constructor(sqlDatabase, sqlDdType, curdProService) {
-        this.sqlDatabase = sqlDatabase;
-        this.sqlDdType = sqlDdType;
-        this.curdProService = curdProService;
-    }
-    async getOne(reqJson, sqlTable) {
-        const cfgModel = {
-            sqlTable,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
-            updateCfg: {},
-        };
-        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        return res.getOneObj();
-    }
-    async getList(reqJson, sqlTable) {
-        const cfgModel = {
-            sqlTable,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: this.sqlDatabase,
-            sqlDdType: this.sqlDdType,
-            updateCfg: {},
-        };
-        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        return res.getResRows();
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    async beforeExecuteSQLList(reqJson, cfgJson) {
+        const { bizUpdateCfgModelForCrudPro } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        if (typeof bizUpdateCfgModelForCrudPro === 'function') {
+            await bizUpdateCfgModelForCrudPro(reqJson, cfgJson);
+        }
+        return Promise.resolve();
     }
 }
-exports.DBUtils = DBUtils;
-function isSimpleQuery(sqlSimpleName) {
-    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
-        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
-}
 let CurdProService = class CurdProService extends BaseService_1.BaseService {
     constructor() {
         super(...arguments);
@@ -141,6 +124,9 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
     setResponseCfgHandlers(key, handler) {
         this.responseCfgHandlers[key] = handler;
     }
+    getResponseCfgHandlers() {
+        return this.responseCfgHandlers;
+    }
     /**
      * Execute级别：每次调用都会产生新的
      * @private
@@ -152,11 +138,15 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
         crudPro.transaction = this.ctx.transaction;
         crudPro.logger = this.getContextLogger();
         crudPro.visitor = visitor;
-        crudPro.contextCfg = this.crudProCfg;
+        const crudProCfg = this.crudProCfg || {};
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        crudProCfg.sysDatabaseName = SystemDbName;
+        crudProCfg.sysDatabaseDbType = SystemDbType;
+        crudPro.contextCfg = crudProCfg;
         crudPro.contextFunc = new MyContextFunc({
             mysql2Config: this.mysql2Config,
             postgres2Config: this.postgres2Config,
-            sqlserver2Config: this.sqlserver2Config
+            sqlserver2Config: this.sqlserver2Config,
         }, this.responseCfgHandlers);
         return crudPro;
     }
@@ -181,114 +171,14 @@ let CurdProService = class CurdProService extends BaseService_1.BaseService {
     // 直接执行一个请求
     async executeCrudByCfg(reqJson, cfgModel) {
         this.logInfo('executeCrudByCfg', cfgModel);
-        if (!cfgModel.method) {
-            const req = this.ctx.req;
-            if (req) {
-                cfgModel.method = `${req.method}:${req.url}`;
-            }
-            else {
-                cfgModel.method = 'anonymous';
-            }
-        }
-        if (!cfgModel.updateCfg) {
-            cfgModel.updateCfg = {};
-        }
-        // 应用标准的updateCfg
-        this.applyStandardUpdateCfg(cfgModel);
         const curdPro = this.getCrudPro();
+        // 应用标准的updateCfg。
+        (0, fixCfgModel_1.fixCfgModel)(cfgModel);
         return await curdPro.executeCrudByCfg(reqJson, cfgModel);
     }
-    applyStandardUpdateCfg(cfgModel) {
-        const sqlSimpleName = cfgModel.sqlSimpleName;
-        const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
-        const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
-        // 彻底关闭
-        if (enableStandardUpdateCfg === false) {
-            return;
-        }
-        const getDataCfgArray = () => {
-            // 明确有配置
-            if (Array.isArray(enableStandardUpdateCfg)) {
-                if (enableStandardUpdateCfg.includes('null')) {
-                    return [];
-                }
-                return enableStandardUpdateCfg;
-            }
-            // update 、insert 添加 by
-            return ['by']; // 创建/修改语句默认添加by
-        };
-        const getConditionCfgArray = () => {
-            // 明确有配置
-            if (Array.isArray(enableStandardUpdateCfgCondition)) {
-                if (enableStandardUpdateCfgCondition.includes('null')) {
-                    return [];
-                }
-                return enableStandardUpdateCfgCondition;
-            }
-            return [];
-        };
-        const dataCfgArray = getDataCfgArray();
-        const conditionCfgArray = getConditionCfgArray();
-        const mapping = {
-            'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-            'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
-            'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
-            'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-            'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
-            'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
-            'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
-            'data.modified_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
-        };
-        const buildUpdateCfgBy = (cfgArray, prefix) => {
-            const obj = {};
-            if (Array.isArray(cfgArray)) {
-                for (let i = 0; i < cfgArray.length; i++) {
-                    const suffix = cfgArray[i];
-                    if (suffix) {
-                        const key = `${prefix}_${suffix}`;
-                        obj[key] = mapping[key];
-                    }
-                }
-            }
-            return obj;
-        };
-        // 查询语句
-        if (isSimpleQuery(sqlSimpleName)) {
-            const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj);
-        }
-        // 删除语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_DELETE) {
-            const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj);
-        }
-        // 插入语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-        }
-        // 更新语句
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
-            const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-            Object.assign(cfgModel.updateCfg, updateCfgObj2);
-        }
-        // 插入或更新
-        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
-            sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
-            const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
-            const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
-            const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
-            Object.assign(cfgModel.updateCfg, updateCfgObj1);
-            Object.assign(cfgModel.updateCfg, updateCfgObj2);
-            Object.assign(cfgModel.updateCfg, updateCfgObj3);
-        }
-    }
-    getBbUtil(database, sqlDdType) {
-        return new DBUtils(database, sqlDdType, this);
+    getBbUtil(sqlDatabase, sqlDbType, sqlTable) {
+        const curdPro = this.getCrudPro();
+        return new CrudProQuick_1.CrudProQuick(curdPro, sqlDatabase, sqlDbType, sqlTable);
     }
     async getCachedCfgByMethod(method) {
         const curdPro = this.getCrudPro();

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

@@ -0,0 +1,3 @@
+import { IRequestCfgModel2 } from '../../models/bizmodels';
+declare function fixCfgModel(cfgModel: IRequestCfgModel2): void;
+export { fixCfgModel };

package/dist/service/curd/fixCfgModel.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixCfgModel = void 0;
+const bizmodels_1 = require("../../models/bizmodels");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+function isSimpleQuery(sqlSimpleName) {
+    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
+}
+function fixCfgModel(cfgModel) {
+    if (!cfgModel.method) {
+        cfgModel.method = 'anonymous';
+    }
+    if (!cfgModel.updateCfg) {
+        cfgModel.updateCfg = {};
+    }
+    const sqlSimpleName = cfgModel.sqlSimpleName;
+    const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
+    const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
+    // 彻底关闭
+    if (enableStandardUpdateCfg === false) {
+        return;
+    }
+    const getDataCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfg)) {
+            if (enableStandardUpdateCfg.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfg;
+        }
+        // update 、insert 添加 by
+        return ['by']; // 创建/修改语句默认添加by
+    };
+    const getConditionCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfgCondition)) {
+            if (enableStandardUpdateCfgCondition.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfgCondition;
+        }
+        return [];
+    };
+    const dataCfgArray = getDataCfgArray();
+    const conditionCfgArray = getConditionCfgArray();
+    const mapping = {
+        'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.modified_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+    };
+    const buildUpdateCfgBy = (cfgArray, prefix) => {
+        const obj = {};
+        if (Array.isArray(cfgArray)) {
+            for (let i = 0; i < cfgArray.length; i++) {
+                const suffix = cfgArray[i];
+                if (suffix) {
+                    const key = `${prefix}_${suffix}`;
+                    obj[key] = mapping[key];
+                }
+            }
+        }
+        return obj;
+    };
+    // 查询语句
+    if (isSimpleQuery(sqlSimpleName)) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 删除语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_DELETE) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 插入语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+    }
+    // 更新语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+    }
+    // 插入或更新
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE || sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+        Object.assign(cfgModel.updateCfg, updateCfgObj3);
+    }
+}
+exports.fixCfgModel = fixCfgModel;

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -24,6 +24,7 @@ const WeightedRandom_1 = require("./WeightedRandom");
 const WeightedRoundRobin_1 = require("./WeightedRoundRobin");
 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) {
@@ -79,6 +80,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         return routeTrie;
     }
     async buildUpstreamMap() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //       biz_tag={'upstream'}
         const res = await this.curdProService.executeCrudByCfg({
             condition: {
@@ -86,8 +88,8 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
             },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const upstreamMap = {};
@@ -100,12 +102,13 @@ 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: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const rows0 = res.getResRows();

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

@@ -57,4 +57,5 @@ export declare class ProxyApiService extends ApiBaseService {
      */
     private selectTargetByBalanceStrategy;
     private setRequestHeaders;
+    private buildUserContextHeader;
 }

package/dist/service/proxyapi/ProxyApiService.js

@@ -16,11 +16,13 @@ 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");
+const SystemEntities_1 = require("../../models/SystemEntities");
 const axios_1 = require("axios");
 const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const ProxyApiLoadService_1 = require("./ProxyApiLoadService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+const base64_1 = require("../../libs/utils/base64");
 /**
  * 接口代理
  */
@@ -68,19 +70,20 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
         try {
             const headers = {
                 ...ctx.headers,
-                host: targetUrl.host,
-                'content-length': ctx.get('content-length'),
+                host: targetUrl.host, // 设置正确的 host
             };
+            delete headers['content-length'];
             this.setRequestHeaders(headers, proxyApiEntity);
-            const response = await (0, axios_1.default)({
+            const axiosParams = {
                 method: ctx.method,
                 url: targetUrl.toString(),
                 data: ctx.request.body,
                 headers: headers,
                 responseType: response_type,
-                timeout: proxyApiEntity.timeout_ms || 5 * 60 * 1000,
+                timeout: Number(proxyApiEntity.timeout_ms) || 5 * 60 * 1000,
                 validateStatus: () => true,
-            });
+            };
+            const response = await (0, axios_1.default)(axiosParams);
             ctx.status = response.status;
             const resHeaders = this.toResHeaders(response.headers);
             ctx.set({
@@ -225,14 +228,18 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
     }
     setRequestHeaders(headers, proxyApiEntity) {
         const ctx = this.ctx;
+        // 转发IP
         if (proxyApiEntity.pass_real_ip) {
             headers['x-real-ip'] = ctx.headers['x-real-ip'];
             headers['x-forwarded-for'] = ctx.headers['x-forwarded-for'];
         }
-        if (proxyApiEntity.user_context) {
-            const isLogin = this.ctx.userSession.isLogin();
-            const sessionInfo = this.ctx.userSession.getSessionInfo();
-            headers['x-fatcms-user'] = JSON.stringify({ ...sessionInfo, isLogin });
+        // 转发用户上下文
+        const userContextHeader = this.buildUserContextHeader(proxyApiEntity);
+        if (userContextHeader) {
+            headers['x-fatcms-usercontext'] = userContextHeader;
+        }
+        else {
+            delete headers['x-fatcms-usercontext']; // 只有自己构建的才能被转发。前面传过来的，不要转发。
         }
         if (proxyApiEntity.change_host && proxyApiEntity.change_host.length > 0) {
             headers.host = proxyApiEntity.change_host;
@@ -241,6 +248,33 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
             headers.origin = proxyApiEntity.change_origin;
         }
     }
+    buildUserContextHeader(proxyApiEntity) {
+        var _a, _b;
+        // 传递整个用户上下文
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.SESSION_INFO) {
+            const isLogin = this.ctx.userSession.isLogin();
+            const sessionInfo = this.ctx.userSession.getSessionInfo();
+            const workbenchCode = (_a = this.ctx.workbenchInfo) === null || _a === void 0 ? void 0 : _a.workbench_code;
+            return (0, base64_1.toBase64)({ ...sessionInfo, isLogin, workbenchCode });
+        }
+        // 只传递用户基本信息
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.BASIC_INFO) {
+            const isLogin = this.ctx.userSession.isLogin();
+            const sessionInfo = this.ctx.userSession.getSessionInfo();
+            const workbenchCode = (_b = this.ctx.workbenchInfo) === null || _b === void 0 ? void 0 : _b.workbench_code;
+            const userBasicInfo = { isLogin };
+            if (sessionInfo && isLogin) {
+                userBasicInfo.loginName = sessionInfo.loginName;
+                userBasicInfo.sessionId = sessionInfo.sessionId;
+                userBasicInfo.accountId = sessionInfo.accountId;
+                userBasicInfo.workbenchCode = sessionInfo.workbenchCode;
+                userBasicInfo.accountType = sessionInfo.accountType;
+            }
+            userBasicInfo.workbenchCode = workbenchCode;
+            return (0, base64_1.toBase64)(userBasicInfo);
+        }
+        return null;
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/views/404_app.html

@@ -1,31 +1,31 @@
-<html dir="ltr" lang="zh">
-<head>
-  <meta charset="utf-8">
-  <meta name="color-scheme" content="light dark">
-  <meta name="theme-color" content="#fff">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>无法访问此应用</title>
-  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
-</head>
-<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
-
-<div id="content">
-  <div id="main-frame-error" class="interstitial-wrapper ">
-    <div id="main-content">
-      <div class="icon icon-generic"></div>
-      <div id="main-message">
-        <h1><span>无法访问此应用</span></h1>
-        <p>此应用存在如下可能的状态导致无法访问：应用不存在、应用已下线、站点不支持</p>
-        <p>appCode: <%=appCode%></p>
-        <div>
-          <p>errorMsg: <%=errorMsg%></p>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-</body>
-</html>
-
-
+<html dir="ltr" lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta name="color-scheme" content="light dark">
+  <meta name="theme-color" content="#fff">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <title>无法访问此应用</title>
+  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
+</head>
+<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
+
+<div id="content">
+  <div id="main-frame-error" class="interstitial-wrapper ">
+    <div id="main-content">
+      <div class="icon icon-generic"></div>
+      <div id="main-message">
+        <h1><span>无法访问此应用</span></h1>
+        <p>此应用存在如下可能的状态导致无法访问：应用不存在、应用已下线、站点不支持</p>
+        <p>appCode: <%=appCode%></p>
+        <div>
+          <p>errorMsg: <%=errorMsg%></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
+
+

package/dist/views/404_workbench.html

@@ -1,34 +1,34 @@
-<html dir="ltr" lang="zh">
-<head>
-  <meta charset="utf-8">
-  <meta name="color-scheme" content="light dark">
-  <meta name="theme-color" content="#fff">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>无法访问此网站</title>
-  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
-</head>
-<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
-
-<div id="content">
-  <div id="main-frame-error" class="interstitial-wrapper ">
-    <div id="main-content">
-      <div class="icon icon-generic"></div>
-      <div id="main-message">
-        <h1>
-          <span>无法访问此网站</span>
-        </h1>
-        <p>检查 <span id="domain_span"><%-host%></span> 中是否有拼写错误。</p>
-        <div class="error-code" style="text-transform: none;"><%-errorInfo%></div>
-      </div>
-    </div>
-  </div>
-</div>
-<script>
-  setTimeout(function () {
-    document.getElementById('domain_span').innerHTML = location.host
-  }, 10)
-</script>
-</body>
-</html>
-
-
+<html dir="ltr" lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta name="color-scheme" content="light dark">
+  <meta name="theme-color" content="#fff">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <title>无法访问此网站</title>
+  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
+</head>
+<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
+
+<div id="content">
+  <div id="main-frame-error" class="interstitial-wrapper ">
+    <div id="main-content">
+      <div class="icon icon-generic"></div>
+      <div id="main-message">
+        <h1>
+          <span>无法访问此网站</span>
+        </h1>
+        <p>检查 <span id="domain_span"><%-host%></span> 中是否有拼写错误。</p>
+        <div class="error-code" style="text-transform: none;"><%-errorInfo%></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+  setTimeout(function () {
+    document.getElementById('domain_span').innerHTML = location.host
+  }, 10)
+</script>
+</body>
+</html>
+
+