midway-fatcms 0.0.1-beta.1 → 0.0.1-beta.11

package/src/service/UserAccountService.ts

@@ -6,8 +6,9 @@ import { CurdMixService } from './curd/CurdMixService';
 import { createUniqueId } from '../libs/utils/functions';
 import { CommonException, Exceptions } from '../libs/crud-pro/exceptions';
 import { IRequestCfgModel, IRequestModel } from '../libs/crud-pro/interfaces';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import {SystemTables} from '../models/SystemTables';
 import { CommonResult } from '../libs/utils/common-dto';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class UserAccountService {
@@ -21,6 +22,9 @@ export class UserAccountService {
    * @param loginName
    */
   public async queryUserAccountByLoginName(loginName: string) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const query = await this.curdMixService.executeCrudByCfg(
       {
         condition: { login_name: loginName },
@@ -30,7 +34,7 @@ export class UserAccountService {
         sqlTable: SystemTables.sys_user_account,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const { row } = query.getResModel();
@@ -47,6 +51,9 @@ export class UserAccountService {
       return [];
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
     const accountIds = accountIdList.map(userId => {
       return `${userId}`;
     });
@@ -56,7 +63,7 @@ export class UserAccountService {
       sqlTable: SystemTables.sys_user_account,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
 
     const reqJson: IRequestModel = {
@@ -81,6 +88,9 @@ export class UserAccountService {
     if (!loginName) {
       throw new CommonException(Exceptions.OTHER_EXCEPTION, 'loginName不存在');
     }
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const pwd_salt = createUniqueId();
     const pwd_md5 = md5(unsaltedPwd + pwd_salt);
     const res1 = await this.curdMixService.executeCrudByCfg(
@@ -92,7 +102,7 @@ export class UserAccountService {
         sqlTable: SystemTables.sys_user_account,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     return CommonResult.successRes(res1.getResModel());

package/src/service/VisitStatService.ts

@@ -3,10 +3,11 @@ import {Context} from '@midwayjs/koa';
 import {IScheduleService} from '../interface';
 import {BaseService} from "./base/BaseService";
 import {CurdProService} from "./curd/CurdProService";
-import {SystemDbName, SystemDbType, SystemTables} from "../models/SystemTables";
+import { SystemTables} from "../models/SystemTables";
 import {KeysOfSimpleSQL} from "../libs/crud-pro/models/keys";
 import {FILE_GET_TYPES} from "../models/bizmodels";
 import {CommonResult} from "../libs/utils/common-dto";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 
 // 3天 的秒数
@@ -35,6 +36,9 @@ export class VisitStatService extends BaseService implements IScheduleService {
 
 
   async flushVisitStatToDB():  Promise<any>   {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     //  统计昨天的数据。
     const stat_date = new Date(Date.now() - 24 * 3600 * 1000).toISOString().split('T')[0];
 
@@ -86,7 +90,7 @@ export class VisitStatService extends BaseService implements IScheduleService {
             }, {
               sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
               sqlDatabase: SystemDbName,
-              sqlDdType: SystemDbType,
+              sqlDbType: SystemDbType,
               sqlTable: SystemTables.sys_visit_stats,
             })
 

package/src/service/WorkbenchService.ts

@@ -1,7 +1,7 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import { SystemTables} from '../models/SystemTables';
 import { BaseService } from './base/BaseService';
 // import { LRUCache } from 'lru-cache';
 import { CurdProService } from './curd/CurdProService';
@@ -11,6 +11,7 @@ import { IWorkbenchEntity } from '../models/SystemEntities';
 import { IScheduleService } from '../interface';
 import { getDebugWorkbenchCode } from '../libs/utils/fatcms-request';
 import { MixinUtils } from '../libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 //
 // const lruCache = new LRUCache<string, any>({
 //   max: 500,
@@ -42,6 +43,10 @@ export class WorkbenchService extends BaseService implements IScheduleService {
   }
 
   public async getAllWorkbenchInfoList(isForceRefresh?: boolean): Promise<IWorkbenchEntity[]> {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
     let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
     if (!listData || isForceRefresh === true) {
       const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
@@ -49,7 +54,7 @@ export class WorkbenchService extends BaseService implements IScheduleService {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       listData = res.getResRows();
       lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);

package/src/service/anyapi/AnyApiService.ts

@@ -1,7 +1,7 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { LRUCache } from 'lru-cache';
 import { BizException } from '../../models/devops';
 import { CurdMixService } from '../curd/CurdMixService';
@@ -13,6 +13,7 @@ import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
 import { WorkbenchService } from '../WorkbenchService';
 import { validateByCfgString } from '../../libs/crud-pro/utils/ValidateUtils';
 import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const lruCache = new LRUCache<string, any>({
   max: 500,
@@ -80,6 +81,8 @@ export class AnyApiService extends ApiBaseService {
   }
 
   private async _getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       { condition: { method: methodCode } },
       {
@@ -87,7 +90,7 @@ export class AnyApiService extends ApiBaseService {
         method: `get_sys_anyapi_${methodCode}`,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         updateCfg: {},
       }
     );

package/src/service/crudstd/CrudStdService.ts

@@ -7,12 +7,13 @@ import { parseJsonObject } from '../../libs/utils/functions';
 import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
 import { BizException } from '../../models/devops';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { CrudStdActionService } from './CrudStdActionService';
 import { CrudStdRelationService } from './CrudStdRelationService';
 import * as _ from 'lodash';
 import { ApiBaseService } from '../base/ApiBaseService';
 import {parseDatabaseName} from "../../libs/crud-pro/utils/DatabaseName";
+import { GLOBAL_STATIC_CONFIG } from '../../libs/global-config/global-config';
 
 export const SPECIAL_SETTING_KEY = {
   QUERY_LIST: 'QUERY_LIST',
@@ -50,7 +51,7 @@ export class CrudStdService extends ApiBaseService {
 
     const cfgModel: IRequestCfgModel = {
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
       sqlSimpleName,
     };
@@ -67,6 +68,10 @@ export class CrudStdService extends ApiBaseService {
 
     // 根据用户配置，设置关联查询的数据信息。
     await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
+
     return await this.curdMixService.executeCrudByCfg(params, cfgModel);
   }
 
@@ -133,13 +138,18 @@ export class CrudStdService extends ApiBaseService {
    * @private
    */
   private async getCrudStdAppInfo(appCode?: string) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
+
     this.logInfo('getCrudStdAppInfo', appCode);
 
     const ss = {
       sqlTable: SystemTables.sys_app,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
   }

package/src/service/curd/CurdMixByAccountService.ts

@@ -4,10 +4,11 @@ import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { ColumnRelation, IRequestCfgModel, IRequestModel } from '../../libs/crud-pro/interfaces';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.accountBasic);
 
@@ -22,6 +23,8 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const relations = dictMixUtils.pickColumnRelations(executeContext);
     if (!relations || relations.length === 0) {
       return;
@@ -30,10 +33,15 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
     const accountIds = new Set<string>();
     dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
       const { sourceColumn } = columnRelation;
-      const accountId = _.get(row, sourceColumn);
-      if (accountId) {
-        accountIds.add(accountId);
+      if (sourceColumn) {
+        const accountId = _.get(row, sourceColumn);
+        if (accountId) {
+          const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+          accountIds.add(fatcmsUserAccountId);
+          row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
+        }
       }
+
     });
 
     if (accountIds.size === 0) {
@@ -45,7 +53,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
       sqlTable: SystemTables.sys_user_account,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
 
     const reqJson: IRequestModel = {
@@ -77,7 +85,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
           { from: 'avatar', to: `${sourceColumn}_user.avatar` },
         ];
       }
-      dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+      dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
     });
   }
 }

package/src/service/curd/CurdMixByDictService.ts

@@ -3,12 +3,13 @@ import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import * as _ from 'lodash';
 import {RedisCacheService} from "../base/RedisCacheService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 
@@ -46,6 +47,11 @@ export class CurdMixByDictService implements IExecuteContextHandler {
   }
 
   private async getDictItemRows(codes: string[]) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
+
     const noCacheCodes: string[] = [];
 
     // 从缓存里面取
@@ -72,7 +78,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
           sqlTable: SystemTables.sys_data_dict_item,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
       selectedRows = res1.getResRows();

package/src/service/curd/CurdMixByLinkToCustomService.ts

@@ -124,7 +124,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
         sqlTable,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: dbName,
-        sqlDdType: dbType,
+        sqlDbType: dbType,
         maxLimit: 4000,
       }
     );

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -4,11 +4,12 @@ import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
 import * as _ from 'lodash';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import { parseConfigContentToEnumInfo } from "../../libs/utils/parseConfig";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
 
@@ -25,6 +26,10 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
     if (!codes || codes.length === 0) {
       return;
@@ -38,7 +43,7 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res1.getResRows();

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -5,10 +5,11 @@ import { LRUCache } from 'lru-cache';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const lruCache = new LRUCache<string, any>({
   max: 500,
@@ -29,6 +30,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   private async loadWorkbenchListMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     let workbenchListMap = lruCache.get('workbenchListMap');
     if (!workbenchListMap) {
       const reqJson = {
@@ -39,7 +43,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       const workbenchList = res.getResRows();
       workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);

package/src/service/curd/CurdMixService.ts

@@ -44,9 +44,9 @@ export class CurdMixService {
     return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(database: string, sqlDdType: SqlDbType) {
+  getBbUtil(database: string, sqlDbType: SqlDbType) {
     this.prepare();
-    return this.curdProService.getBbUtil(database, sqlDdType);
+    return this.curdProService.getBbUtil(database, sqlDbType);
   }
 
   async executeSQL(sqlCfgModel: ISqlCfgModel) {

package/src/service/curd/CurdMixUtils.ts

@@ -1,4 +1,4 @@
-import {ColumnRelation, CopyAttr} from '../../libs/crud-pro/interfaces';
+import { ColumnRelation, CopyAttr } from '../../libs/crud-pro/interfaces';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
 import { KeyOfCrudTypes } from '../../libs/crud-pro/models/keys';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
@@ -33,7 +33,7 @@ function getColumnsRelationAll(sqlCfg: SqlCfgModel, cfgModel: RequestCfgModel):
 
 
 
-function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ){
+function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any) {
   // const codeObject = map.get(sourceValue);
   const codeObject = getValue(sourceValue);
   if (typeof codeObject === 'undefined' || codeObject === null) {
@@ -59,7 +59,7 @@ function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyA
 
 
 
-function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ): boolean {
+function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any): boolean {
   let isSetArray = false;
   // 支持关联JSON数组
   if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
@@ -80,15 +80,12 @@ function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAt
                 _.set(row, toStr, codeObject);
 
                 isSetArray = true;
-
               } else {
-
                 const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
+                if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
                   const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
                   _.set(row, toStr, dictAttrValue);
                   isSetArray = true;
-
                 }
               }
             }
@@ -101,8 +98,6 @@ function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAt
   return isSetArray;
 }
 
-
-
 class CrudMixUtils {
   private readonly relatedType: RelatedType;
   constructor(relatedType: RelatedType) {
@@ -134,7 +129,7 @@ class CrudMixUtils {
         }
       }
     }
-    return _.uniqBy(relationResult,(obj: ColumnRelation)=> {
+    return _.uniqBy(relationResult, (obj: ColumnRelation) => {
       return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
     });
   }
@@ -191,7 +186,7 @@ class CrudMixUtils {
     }
 
     const sourceValue = _.get(row, sourceColumn);
-    if (typeof sourceValue ==='undefined' || sourceValue ===null) {
+    if (typeof sourceValue === 'undefined' || sourceValue === null) {
       return;
     }
 
@@ -216,7 +211,7 @@ class CrudMixUtils {
    * @param columnRelation
    */
   public copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
-    const {sourceColumn, targetColumns} = columnRelation;
+    const { sourceColumn, targetColumns } = columnRelation;
     if (!sourceColumn || !targetColumns) {
       return;
     }
@@ -243,6 +238,41 @@ class CrudMixUtils {
 
   }
 
+
+  /**
+  * 专门COPY用户信息到row上面。无relatedCode模式
+  * @param row
+  * @param map
+  * @param columnRelation
+  */
+  public copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
+    const { targetColumns } = columnRelation;
+    if (!targetColumns) {
+      return;
+    }
+
+    const tmpSourceColumn = '__fatcmsUserAccountId__';
+
+    const sourceValue = _.get(row, tmpSourceColumn);
+    if (!sourceValue) {
+      return;
+    }
+
+    const getValue = (code: string) => {
+      if (!map) {
+        return null;
+      }
+      if (typeof map.get === 'function') {
+        return map.get(`${code}`);
+      }
+      return map[code];
+    };
+
+    const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+    if (!isSetArray) {
+      copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+    }
+  }
 }
 
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };

package/src/service/curd/CurdProService.ts

@@ -82,9 +82,9 @@ class MyContextFunc extends BaseExecuteContextFunc {
       throw new CommonException(Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
     }
     const dataBaseName = sqlCfgModel.sqlDatabase;
-    const sqlDdType = sqlCfgModel.sqlDdType;
+    const sqlDbType = sqlCfgModel.sqlDbType;
 
-    if (sqlDdType === SqlDbType.postgres) {
+    if (sqlDbType === SqlDbType.postgres) {
       const dbConfig = _.get(this.postgres2Config, dataBaseName);
       if (!dbConfig) {
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
@@ -92,7 +92,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
       return getPostgresConnectionPool(dataBaseName, dbConfig);
     }
 
-    if (sqlDdType === SqlDbType.sqlserver) {
+    if (sqlDbType === SqlDbType.sqlserver) {
       const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
       if (!dbConfig) {
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
@@ -122,12 +122,12 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
 export class DBUtils {
   private readonly sqlDatabase: string;
-  private readonly sqlDdType: SqlDbType;
+  private readonly sqlDbType: SqlDbType;
   private readonly curdProService: CurdProService;
 
-  constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService) {
+  constructor(sqlDatabase: string, sqlDbType: SqlDbType, curdProService: CurdProService) {
     this.sqlDatabase = sqlDatabase;
-    this.sqlDdType = sqlDdType;
+    this.sqlDbType = sqlDbType;
     this.curdProService = curdProService;
   }
 
@@ -136,7 +136,7 @@ export class DBUtils {
       sqlTable,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
+      sqlDbType: this.sqlDbType,
       updateCfg: {},
     };
     const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -148,7 +148,7 @@ export class DBUtils {
       sqlTable,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
+      sqlDbType: this.sqlDbType,
       updateCfg: {},
     };
     const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -367,8 +367,8 @@ export class CurdProService extends BaseService {
 
 
 
-  getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils {
-    return new DBUtils(database, sqlDdType, this);
+  getBbUtil(database: string, sqlDbType: SqlDbType): DBUtils {
+    return new DBUtils(database, sqlDbType, this);
   }
 
   public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -5,7 +5,7 @@ import { BaseService } from '../base/BaseService';
 import { getRouteTrie, RouteTrie } from './RouteTrie';
 import { RouteHandler } from './RouteHandler';
 import { CurdProService } from '../curd/CurdProService';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { IProxyApiEntity, IUpstreamInfo } from '../../models/SystemEntities';
 import { parseJsonObject } from '../../libs/utils/functions';
@@ -15,6 +15,7 @@ import { WeightedRoundRobin } from './WeightedRoundRobin';
 import { IScheduleService } from '../../interface';
 import { WorkbenchService } from '../WorkbenchService';
 import { CommonException } from '../../libs/crud-pro/exceptions';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function toUpstreamInfo(config_content: any): IUpstreamInfo {
   const obj = parseJsonObject(config_content);
@@ -85,6 +86,9 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async buildUpstreamMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     //       biz_tag={'upstream'}
     const res = await this.curdProService.executeCrudByCfg(
       {
@@ -95,7 +99,7 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
       {
         sqlTable: SystemTables.sys_configs,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       }
     );
@@ -110,6 +114,10 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): Promise<IProxyApiEntity[]> {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const res = await this.curdProService.executeCrudByCfg(
       {
         condition: {},
@@ -117,7 +125,7 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
       {
         sqlTable: SystemTables.sys_proxyapi,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       }
     );