midway-fatcms 0.0.1-beta.22 → 0.0.1-beta.24

package/src/service/FileCenterService.ts

@@ -71,7 +71,6 @@ function getAssetsContentType(filename: string): string {
   return 'application/octet-stream';
 }
 
-
 // JPG、PNG、BMP、GIF、WebP、TIFF
 export function isImageFile(fileKey: string) {
   const fileKey1 = fileKey.toLowerCase();
@@ -175,8 +174,6 @@ interface IUploadFileToOSSOptions {
   uploadPath: string;
 }
 
-
-
 export const PATH_PREFIX = '/ns/gw/file';
 
 export function toDownloadPaths(origin: string, fileKey: string) {
@@ -194,7 +191,6 @@ export function toDownloadPaths(origin: string, fileKey: string) {
   };
 }
 
-
 function toUploadOriginByReferer(referer: string): string {
   try {
     if (!referer || !referer.startsWith('http')) {
@@ -214,7 +210,6 @@ function toUploadOriginByReferer(referer: string): string {
   return '';
 }
 
-
 @Provide()
 export class FileCenterService extends BaseService {
   @Inject()

package/src/service/SysConfigService.ts

@@ -1,9 +1,9 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from "../libs/crud-pro/models/keys";
-import { SystemTables } from "../models/SystemTables";
-import { BaseService } from "./base/BaseService";
-import { CurdProService } from "./curd/CurdProService";
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { SystemTables } from '@/models/SystemTables';
+import { BaseService } from './base/BaseService';
+import { CurdProService } from './curd/CurdProService';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
@@ -34,5 +34,4 @@ export class SysConfigService extends BaseService {
     );
     return res1.getOneObj();
   }
-
 }

package/src/service/UserAccountService.ts

@@ -1,110 +1,107 @@
-import * as md5 from 'md5';
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
-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 {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 {
-  @Inject()
-  ctx: Context;
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  /**
-   * 查询用户: 根据loginName查询
-   * @param loginName
-   */
-  public async queryUserAccountByLoginName(loginName: string) {
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const query = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: { login_name: loginName },
-      },
-      {
-        method: 'UserAccountService.queryUserAccountByLoginName',
-        sqlTable: SystemTables.sys_user_account,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    const { row } = query.getResModel();
-    return row;
-  }
-
-  /**
-   * 查询基本信息：根据accountId数组
-   * @param accountIdList
-   * @param columns
-   */
-  public async queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]> {
-    if (!accountIdList || accountIdList.length === 0) {
-      return [];
-    }
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-
-    const accountIds = accountIdList.map(userId => {
-      return `${userId}`;
-    });
-
-    const cfgModel: IRequestCfgModel = {
-      method: 'UserAccountService.queryAccountBasicInfoByIds',
-      sqlTable: SystemTables.sys_user_account,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: SystemDbName,
-      sqlDbType: SystemDbType,
-    };
-
-    const reqJson: IRequestModel = {
-      columns: columns,
-      condition: {
-        account_id: {
-          $in: accountIds,
-        },
-      },
-    };
-
-    const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getResRows();
-  }
-
-  /**
-   * 修改密码
-   * @param loginName
-   * @param unsaltedPwd
-   */
-  public async chgUserPassword(loginName: any, unsaltedPwd: any) {
-    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(
-      {
-        data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
-        condition: { login_name: loginName },
-      },
-      {
-        sqlTable: SystemTables.sys_user_account,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    return CommonResult.successRes(res1.getResModel());
-  }
-}
+import * as md5 from 'md5';
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+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 { 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 {
+  @Inject()
+  ctx: Context;
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  /**
+   * 查询用户: 根据loginName查询
+   * @param loginName
+   */
+  public async queryUserAccountByLoginName(loginName: string) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const query = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: { login_name: loginName },
+      },
+      {
+        method: 'UserAccountService.queryUserAccountByLoginName',
+        sqlTable: SystemTables.sys_user_account,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const { row } = query.getResModel();
+    return row;
+  }
+
+  /**
+   * 查询基本信息：根据accountId数组
+   * @param accountIdList
+   * @param columns
+   */
+  public async queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]> {
+    if (!accountIdList || accountIdList.length === 0) {
+      return [];
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const accountIds = accountIdList.map(userId => {
+      return `${userId}`;
+    });
+
+    const cfgModel: IRequestCfgModel = {
+      method: 'UserAccountService.queryAccountBasicInfoByIds',
+      sqlTable: SystemTables.sys_user_account,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+    };
+
+    const reqJson: IRequestModel = {
+      columns: columns,
+      condition: {
+        account_id: {
+          $in: accountIds,
+        },
+      },
+    };
+
+    const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResRows();
+  }
+
+  /**
+   * 修改密码
+   * @param loginName
+   * @param unsaltedPwd
+   */
+  public async chgUserPassword(loginName: any, unsaltedPwd: any) {
+    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(
+      {
+        data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
+        condition: { login_name: loginName },
+      },
+      {
+        sqlTable: SystemTables.sys_user_account,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    return CommonResult.successRes(res1.getResModel());
+  }
+}

package/src/service/UserSessionService.ts

@@ -1,10 +1,9 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {parseJsonObject} from '@/libs/utils/functions';
-import {ISessionInfo, SESSION_ID_KEY, sessionCookieCfg} from '@/models/userSession';
-import {RedisCacheService} from "./base/RedisCacheService";
-import {RedisKeys} from "@/models/RedisKeys";
-
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { ISessionInfo, SESSION_ID_KEY, sessionCookieCfg } from '@/models/userSession';
+import { RedisCacheService } from './base/RedisCacheService';
+import { RedisKeys } from '@/models/RedisKeys';
 
 function pickUserAvatar(avatar: any): string {
   if (!avatar) {
@@ -33,12 +32,11 @@ function pickUserAvatar(avatar: any): string {
   return null;
 }
 
-
 const SESSION_KEEP_TIME_SECOND: number = 3600 * 24 * 30;
 
-const toCacheKey = (sessionId: string): string =>{
+const toCacheKey = (sessionId: string): string => {
   return `${RedisKeys.USER_SESSION_PREFIX}${sessionId}`;
-}
+};
 
 @Provide()
 export class UserSessionService {
@@ -46,13 +44,12 @@ export class UserSessionService {
   private ctx: Context;
 
   @Inject()
-  private redisCacheService: RedisCacheService
-
+  private redisCacheService: RedisCacheService;
 
   public async saveUserSession(sessionInfo: ISessionInfo) {
     sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
     const sessionId = sessionInfo.sessionId;
-    await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, SESSION_KEEP_TIME_SECOND)
+    await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, SESSION_KEEP_TIME_SECOND);
   }
 
   /**
@@ -60,14 +57,14 @@ export class UserSessionService {
    * @param sessionId
    */
   public async removeUserSession(sessionId: string) {
-    return await this.redisCacheService.removeItem(toCacheKey(sessionId))
+    return await this.redisCacheService.removeItem(toCacheKey(sessionId));
   }
 
   private async getCurrentUserSessionForMiddleware1(sessionId: string): Promise<ISessionInfo> {
     if (!sessionId) {
       return null;
     }
-    return await this.redisCacheService.getJsonObject(toCacheKey(sessionId))
+    return await this.redisCacheService.getJsonObject(toCacheKey(sessionId));
   }
 
   /**
@@ -78,5 +75,4 @@ export class UserSessionService {
     const sessionId = cookies.get(SESSION_ID_KEY, sessionCookieCfg);
     return this.getCurrentUserSessionForMiddleware1(sessionId);
   }
-
 }

package/src/service/WorkbenchService.ts

@@ -1,16 +1,16 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
-import { SystemTables} from '../models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { SystemTables } from '@/models/SystemTables';
 import { BaseService } from './base/BaseService';
 // import { LRUCache } from 'lru-cache';
 import { CurdProService } from './curd/CurdProService';
-import { CommonException } from '../libs/crud-pro/exceptions';
-import { parseJsonObject } from '../libs/utils/functions';
-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 { CommonException } from '@/libs/crud-pro/exceptions';
+import { parseJsonObject } from '@/libs/utils/functions';
+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>({
@@ -24,7 +24,6 @@ const lruCache = new Map<string, any>();
 const CACHE_KEY_WORKBENCH_LIST = 'CACHE_KEY_WORKBENCH_LIST';
 const CACHE_KEY_DOMAIN_MAP = 'CACHE_KEY_DOMAIN_MAP';
 
-
 @Provide()
 export class WorkbenchService extends BaseService implements IScheduleService {
   @Inject()
@@ -43,10 +42,8 @@ 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 };
@@ -70,7 +67,7 @@ export class WorkbenchService extends BaseService implements IScheduleService {
       const domainMap1 = MixinUtils.toMap(listData, (e: any) => e.workbench_domain); // 主域名。其他两个域名。
       const domainMap2 = MixinUtils.toMap(listData, (e: any) => e.workbench_domain2);
       const domainMap3 = MixinUtils.toMap(listData, (e: any) => e.workbench_domain3);
-      domainMap = {...domainMap1, ...domainMap2, ...domainMap3};
+      domainMap = { ...domainMap1, ...domainMap2, ...domainMap3 };
       lruCache.set(CACHE_KEY_DOMAIN_MAP, domainMap);
     }
     return domainMap;
@@ -110,18 +107,21 @@ export class WorkbenchService extends BaseService implements IScheduleService {
     //正式环境： 根据域名获取站点配置
     const host = this.getCurrentHost();
     const domainMap = await this.getAllWorkbenchInfoMap();
-    return domainMap[host];
+    const workbenchInfo = domainMap[host];
+    if (workbenchInfo) {
+      return workbenchInfo;
+    }
+    return domainMap['*']; // 最后兜底
   }
 
   private getCurrentHost(): string {
     const host = this.ctx.request.host;
     if (!host) {
-      throw new CommonException('GET_CURRENT_HOST_ERROR','获取当前域名失败');
+      throw new CommonException('GET_CURRENT_HOST_ERROR', '获取当前域名失败');
     }
     return host;
   }
 
-
   public async isSupportCurrentWorkbench(workbench_code_array: string | string[]): Promise<boolean> {
     // 本地调试模式
     if (this.isEnableDebug() && this.isLocalEnv()) {

package/src/service/anyapi/AnyApiSandboxService.ts

@@ -1,121 +1,121 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import * as vm from 'node:vm';
-import { LRUCache } from 'lru-cache';
-import { BaseService } from '../base/BaseService';
-import { CurdMixService } from '../curd/CurdMixService';
-import { ISysAnyApiEntity } from '../../models/SystemEntities';
-import axios from 'axios';
-import * as _ from 'lodash';
-import * as moment from 'moment';
-import * as nodemailer from 'nodemailer';
-
-const scriptCacheOptions = {
-  max: 500,
-  ttl: 1000 * 60 * 5,
-  allowStale: false,
-  updateAgeOnGet: true,
-  updateAgeOnHas: true,
-};
-
-const scriptCache = new LRUCache<string, vm.Script>(scriptCacheOptions);
-
-function getCompiledScript(anyApi: ISysAnyApiEntity, code: string): vm.Script {
-  const { id, func_code_md5 } = anyApi;
-  const cacheKey = id + '_' + func_code_md5;
-  const oldScript = scriptCache.get(cacheKey);
-  if (oldScript) {
-    return oldScript;
-  }
-  const script = new vm.Script(code);
-  scriptCache.set(cacheKey, script);
-  return script;
-}
-
-export interface IRunInSandboxParams {
-  body: any;
-  query: any;
-  headers: any;
-  params?: any;
-}
-
-@Provide()
-export class AnyApiSandboxService extends BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  public async runInSandbox(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams) {
-    const { func_code, method } = anyApi;
-
-    return new Promise((resolve, reject) => {
-      const logger = this.getPrefixContextLogger(`[AnyApiSandboxService][method=${method}]`);
-      // 创建一个沙盒上下文
-      const proc = process;
-      const newContext = {
-        sandbox: {
-          allParams,
-          logger,
-          moment,
-          axios,
-          nodemailer,
-          _,
-          userSession: this.ctx.userSession,
-          ctx: this.ctx,
-          curdMixService: this.curdMixService,
-          redisService: this.redisService,
-          publicOSSService: this.getPublicOSSService(),
-          privateOSSService: this.getPrivateOSSService(),
-          returnSuccess: resolve,
-          returnError: reject,
-          processInfo: {
-            version: proc.version,
-            versions: proc.versions,
-            env: process.env,
-            argv: process.argv,
-            cwd: process.cwd(),
-          },
-        },
-        console: logger,
-        JSON: JSON,
-      };
-
-      const nextLine100 = new Array(10).fill('\n').join('');
-      const bindCode = this.toBindCodeString('httpController', newContext, 'sandbox');
-      const code = `
-      (async () => {
-        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
-        ${nextLine100}
-        try {
-          const httpController = new HttpController();
-          ${bindCode}
-          const res = await httpController.handleRequest(sandbox.allParams.params);
-          sandbox.returnSuccess(res);
-        } catch (e) {
-          sandbox.returnError(e)
-        }
-      })(); `;
-
-      try {
-        const script = getCompiledScript(anyApi, code);
-        script.runInNewContext(newContext, {
-          filename: 'method',
-          timeout: anyApi.timeout_ms || 1000 * 60 * 5,
-        });
-      } catch (e) {
-        reject(e);
-      }
-    });
-  }
-
-  private toBindCodeString(toName: string, newContext: any, fromName: any): string {
-    const keys = Object.keys(newContext[fromName]);
-    return keys
-      .map(key => {
-        return `${toName}.${key} = ${fromName}.${key};\n`;
-      })
-      .join('');
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import * as vm from 'node:vm';
+import { LRUCache } from 'lru-cache';
+import { BaseService } from '../base/BaseService';
+import { CurdMixService } from '../curd/CurdMixService';
+import { ISysAnyApiEntity } from '../../models/SystemEntities';
+import axios from 'axios';
+import * as _ from 'lodash';
+import * as moment from 'moment';
+import * as nodemailer from 'nodemailer';
+
+const scriptCacheOptions = {
+  max: 500,
+  ttl: 1000 * 60 * 5,
+  allowStale: false,
+  updateAgeOnGet: true,
+  updateAgeOnHas: true,
+};
+
+const scriptCache = new LRUCache<string, vm.Script>(scriptCacheOptions);
+
+function getCompiledScript(anyApi: ISysAnyApiEntity, code: string): vm.Script {
+  const { id, func_code_md5 } = anyApi;
+  const cacheKey = id + '_' + func_code_md5;
+  const oldScript = scriptCache.get(cacheKey);
+  if (oldScript) {
+    return oldScript;
+  }
+  const script = new vm.Script(code);
+  scriptCache.set(cacheKey, script);
+  return script;
+}
+
+export interface IRunInSandboxParams {
+  body: any;
+  query: any;
+  headers: any;
+  params?: any;
+}
+
+@Provide()
+export class AnyApiSandboxService extends BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  public async runInSandbox(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams) {
+    const { func_code, method } = anyApi;
+
+    return new Promise((resolve, reject) => {
+      const logger = this.getPrefixContextLogger(`[AnyApiSandboxService][method=${method}]`);
+      // 创建一个沙盒上下文
+      const proc = process;
+      const newContext = {
+        sandbox: {
+          allParams,
+          logger,
+          moment,
+          axios,
+          nodemailer,
+          _,
+          userSession: this.ctx.userSession,
+          ctx: this.ctx,
+          curdMixService: this.curdMixService,
+          redisService: this.redisService,
+          publicOSSService: this.getPublicOSSService(),
+          privateOSSService: this.getPrivateOSSService(),
+          returnSuccess: resolve,
+          returnError: reject,
+          processInfo: {
+            version: proc.version,
+            versions: proc.versions,
+            env: process.env,
+            argv: process.argv,
+            cwd: process.cwd(),
+          },
+        },
+        console: logger,
+        JSON: JSON,
+      };
+
+      const nextLine100 = new Array(10).fill('\n').join('');
+      const bindCode = this.toBindCodeString('httpController', newContext, 'sandbox');
+      const code = `
+      (async () => {
+        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
+        ${nextLine100}
+        try {
+          const httpController = new HttpController();
+          ${bindCode}
+          const res = await httpController.handleRequest(sandbox.allParams.params);
+          sandbox.returnSuccess(res);
+        } catch (e) {
+          sandbox.returnError(e)
+        }
+      })(); `;
+
+      try {
+        const script = getCompiledScript(anyApi, code);
+        script.runInNewContext(newContext, {
+          filename: 'method',
+          timeout: anyApi.timeout_ms || 1000 * 60 * 5,
+        });
+      } catch (e) {
+        reject(e);
+      }
+    });
+  }
+
+  private toBindCodeString(toName: string, newContext: any, fromName: any): string {
+    const keys = Object.keys(newContext[fromName]);
+    return keys
+      .map(key => {
+        return `${toName}.${key} = ${fromName}.${key};\n`;
+      })
+      .join('');
+  }
+}