midway-fatcms 0.0.1-beta.18 → 0.0.1-beta.19

package/src/libs/utils/crypto-utils.ts

@@ -15,7 +15,7 @@ function hashUtf8Hex(data: string): string {
   return hash.digest('hex');
 }
 
-function readSeed1()  {
+function readSeed1() {
   // 这个文件肯定存在
   const t = path.join(__dirname, '../../config/seed/aeskey.txt');
   return fs.readFileSync(t, 'utf-8');
@@ -29,8 +29,7 @@ function readSeed2(): string {
   return fs.readFileSync(filePath, 'utf-8');
 }
 
-
-function createAes128BySeedContent(seedContent:string){
+function createAes128BySeedContent(seedContent: string) {
   const hash1 = hashUtf8Hex(seedContent.trim());
   const key = md5(hash1);
   const iv = md5(key + hash1);
@@ -46,7 +45,6 @@ function createAes128BySeedFile() {
   return createAes128BySeedContent(seed1);
 }
 
-
 const privateAES = createAes128BySeedFile();
 
 export { privateAES };

package/src/libs/utils/errorToString.ts

@@ -1,4 +1,4 @@
-function errorToString(error:any): string {
+function errorToString(error: any): string {
   // 处理非错误对象的情况
   if (typeof error === 'undefined') {
     return 'Error: undefined was thrown';
@@ -32,9 +32,7 @@ function errorToString(error:any): string {
       }
     });
 
-    const customProps = Object.keys(error).filter(
-      key => !['name', 'message', 'stack', ...extraProperties].includes(key)
-    );
+    const customProps = Object.keys(error).filter(key => !['name', 'message', 'stack', ...extraProperties].includes(key));
 
     if (customProps.length > 0) {
       errorDetails.push('Custom Properties:');
@@ -60,7 +58,4 @@ function errorToString(error:any): string {
   }
 }
 
-
-export {
-  errorToString
-}
+export { errorToString };

package/src/libs/utils/fatcms-request.ts

@@ -1,9 +1,9 @@
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
-import {privateAES} from "./crypto-utils";
-import {CommonException} from "../crud-pro/exceptions";
+import { privateAES } from './crypto-utils';
+import { CommonException } from '../crud-pro/exceptions';
 
-function isEnableByHeaderKey(ctx: Context, configName: string){
+function isEnableByHeaderKey(ctx: Context, configName: string) {
   const fatcmsDebug = ctx.app.getConfig(configName);
   const headerKey = _.get(fatcmsDebug, 'headerKey');
   const headerSecret = _.get(fatcmsDebug, 'headerSecret');
@@ -14,7 +14,6 @@ function isEnableByHeaderKey(ctx: Context, configName: string){
   return headers[headerKey] === headerSecret;
 }
 
-
 /**
  * 是否开启调试能力
  * @param ctx
@@ -23,7 +22,6 @@ export function isEnableDebug(ctx: Context): boolean {
   return isEnableByHeaderKey(ctx, 'fatcmsDebug');
 }
 
-
 /**
  * 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
  * @param ctx
@@ -32,7 +30,6 @@ export function isEnableSuperAdmin(ctx: Context): boolean {
   return isEnableByHeaderKey(ctx, 'fatcmsSAEnable');
 }
 
-
 export function isLocalEnv(ctx: Context): boolean {
   // 系统内部调用。如定时任务，没有request对象。
   if (!ctx.request) {
@@ -42,8 +39,6 @@ export function isLocalEnv(ctx: Context): boolean {
   return host.startsWith('127.0.0.1') || host.startsWith('localhost:');
 }
 
-
-
 /**
  * 获取调试时专用的站点code
  * @param ctx
@@ -62,32 +57,26 @@ export function getDebugProxyTarget(ctx: Context): string {
   return headers['fatcmsdebugproxytarget'];
 }
 
-
-export function getCsrfToken(ctx: Context): string{
+export function getCsrfToken(ctx: Context): string {
   const headers = _.get(ctx, 'request.headers') || {};
   return headers['fatcmscsrftoken'];
 }
 
-
 /**
  * 扩展的源码应用：本地开发调试时加载本地的js脚本
  * @param ctx
  */
-export function getExtLocalLoaderPort(ctx: Context) : string {
+export function getExtLocalLoaderPort(ctx: Context): string {
   const headers = _.get(ctx, 'request.headers') || {};
   return headers['fatcmsextlocalloaderport'];
 }
 
-
-
 export async function isCsrfTokenValid(ctx: Context): Promise<boolean> {
-
   // 本地开发，不需要校验
   if (isLocalEnv(ctx) || isEnableDebug(ctx)) {
     return true;
   }
 
-
   const fatcmscsrftoken = getCsrfToken(ctx);
   if (!fatcmscsrftoken) {
     return false;
@@ -96,20 +85,19 @@ export async function isCsrfTokenValid(ctx: Context): Promise<boolean> {
     const depryptToken = await privateAES.time_decrypt_base64_utf8(fatcmscsrftoken);
     if (depryptToken) {
       const num = Number(depryptToken);
-      if (num && ((num + 6 * 3600 * 1000) > Date.now())) {
+      if (num && num + 6 * 3600 * 1000 > Date.now()) {
         return true;
       }
     }
   } catch (e) {
-    console.info('isCsrfTokenValid验证失败')
+    console.info('isCsrfTokenValid验证失败');
   }
   return false;
 }
 
-
 export async function assertCsrfToken(ctx: Context) {
-  const isOK =  await isCsrfTokenValid(ctx);
+  const isOK = await isCsrfTokenValid(ctx);
   if (!isOK) {
-    throw new CommonException("ASSERT_CSRF_TOKEN_ERROR", "CSRF_TOKEN 验证失败")
+    throw new CommonException('ASSERT_CSRF_TOKEN_ERROR', 'CSRF_TOKEN 验证失败');
   }
 }

package/src/libs/utils/ordernum-utils.ts

@@ -1,7 +1,6 @@
 import * as moment from 'moment';
 
-
-function generateOrderNumber(prefix:string = 'NO'): string {
+function generateOrderNumber(prefix = 'NO'): string {
   // 获取当前时间并格式化为YYYYMMDDHHmmss
   const timestamp = moment().format('YYYYMMDDHHmmss');
 
@@ -12,7 +11,4 @@ function generateOrderNumber(prefix:string = 'NO'): string {
   return prefix + timestamp + randomDigits;
 }
 
-
-export {
-  generateOrderNumber
-}
+export { generateOrderNumber };

package/src/libs/utils/parseConfig.ts

@@ -1,7 +1,5 @@
 import * as _ from 'lodash';
-import {parseJsonObject} from "./functions";
-
-
+import { parseJsonObject } from './functions';
 
 interface IEnumInfo {
   label: string;
@@ -9,14 +7,14 @@ interface IEnumInfo {
   children?: IEnumInfo[];
 }
 
-function parseTreeTableToIEnumInfo(dataSource:any[]): IEnumInfo[]{
+function parseTreeTableToIEnumInfo(dataSource: any[]): IEnumInfo[] {
   if (!dataSource || !Array.isArray(dataSource)) {
     return undefined;
   }
-  return  dataSource.map((item: any) => {
-    const {key, nodeName, value, label } = item;
+  return dataSource.map((item: any) => {
+    const { key, nodeName, value, label } = item;
     const children = parseTreeTableToIEnumInfo(item.children);
-    const enumInfo: IEnumInfo =  {
+    const enumInfo: IEnumInfo = {
       label: label || nodeName,
       value: value || key,
     };
@@ -27,9 +25,7 @@ function parseTreeTableToIEnumInfo(dataSource:any[]): IEnumInfo[]{
   });
 }
 
-
 function parseConfigContentToEnumInfo(configEntity: any): IEnumInfo[] {
-
   const { config_content, config_type } = configEntity;
 
   const configObj = parseJsonObject(config_content);
@@ -52,11 +48,7 @@ function parseConfigContentToEnumInfo(configEntity: any): IEnumInfo[] {
   if (Array.isArray(configObj)) {
     return configObj;
   }
-  return []
+  return [];
 }
 
-
-export {
-  parseConfigContentToEnumInfo,
-  IEnumInfo
-}
+export { parseConfigContentToEnumInfo, IEnumInfo };

package/src/middleware/forbidden.middleware.ts

@@ -1,36 +1,18 @@
 import { Middleware, IMiddleware } from '@midwayjs/core';
 import { NextFunction, Context } from '@midwayjs/koa';
 
-
 // 一些爬虫/漏洞分析工具会来请求这玩意。
-const blackEqualList = [
-  '/config.json',
-  '/backend/.env',
-  '/application.yml',
-  '/db.ini',
-  '/.well-known/security.txt',
-];
+const blackEqualList = ['/config.json', '/backend/.env', '/application.yml', '/db.ini', '/.well-known/security.txt'];
 
-const blackPrefixList = [
-  '/.aws/',
-  '/.git/',
-  '/.svn/',
-  '/.env/',
-  '/src/',
-  '/var/logs/',
-  '/var/log/',
-  '/cgi-bin/',
-  '/php-cgi/',
-];
+const blackPrefixList = ['/.aws/', '/.git/', '/.svn/', '/.env/', '/src/', '/var/logs/', '/var/log/', '/cgi-bin/', '/php-cgi/'];
 
 /**
  * 针对一些路径禁止访问。避免一些爬虫抓取网站内容，实际上这里枚举的路径，本身就是不存在的。只是为了提前拦截，为了服务器性能考虑。
  */
 @Middleware()
 export class ForbiddenMiddleware implements IMiddleware<Context, NextFunction> {
-
   match(ctx: Context): boolean {
-    const path = ctx.path ;
+    const path = ctx.path;
     if (path === '/') {
       return false;
     }
@@ -53,15 +35,14 @@ export class ForbiddenMiddleware implements IMiddleware<Context, NextFunction> {
       }
     }
 
-    return !!(path.includes('/wp-includes/') || path.endsWith('.php') ||  path.endsWith('/.git/config'));
+    return !!(path.includes('/wp-includes/') || path.endsWith('.php') || path.endsWith('/.git/config'));
   }
 
-
   resolve() {
     return async (ctx: Context, next: NextFunction) => {
-      ctx.set({"content-type": "text/html; charset=utf-8"});
+      ctx.set({ 'content-type': 'text/html; charset=utf-8' });
       ctx.status = 404;
-      ctx.body = "404！404！404！重要的事情说三遍！"
+      ctx.body = '404！404！404！重要的事情说三遍！';
     };
   }
 

package/src/middleware/global.middleware.ts

@@ -1,15 +1,15 @@
 import { Middleware, IMiddleware } from '@midwayjs/core';
 import { NextFunction, Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
-import { Transaction } from '../libs/crud-pro/models/Transaction';
-import { UserSessionService } from '../service/UserSessionService';
-import { WorkbenchService } from '../service/WorkbenchService';
-import { ISessionInfo, UserSessionInfo } from '../models/userSession';
-import { ICommonResult, CommonResult } from '../libs/utils/common-dto';
-import {isEnableDebug, isEnableSuperAdmin} from '../libs/utils/fatcms-request';
-import { ContextLogger } from '../models/contextLogger';
+import { Transaction } from '@/libs/crud-pro/models/Transaction';
+import { UserSessionService } from '@/service/UserSessionService';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { ISessionInfo, UserSessionInfo } from '@/models/userSession';
+import { ICommonResult, CommonResult } from '@/libs/utils/common-dto';
+import { isEnableDebug, isEnableSuperAdmin } from '@/libs/utils/fatcms-request';
+import { ContextLogger } from '@/models/contextLogger';
 import { Stream } from 'node:stream';
-import {VisitStatService} from "../service/VisitStatService";
+import { VisitStatService } from '@/service/VisitStatService';
 
 function isFunction(fun: any): boolean {
   return typeof fun === 'function';
@@ -141,8 +141,6 @@ async function getVisitStatService(ctx: Context): Promise<VisitStatService> {
   return ctx.requestContext.getAsync(VisitStatService);
 }
 
-
-
 /**
  * 检查是否是超级管理员
  * @param ctx
@@ -199,7 +197,6 @@ function handleDebugError(e: any, ctx: Context): ICommonResult {
   return res;
 }
 
-
 async function trackRequest(ctx: Context) {
   try {
     const visitStatService = await getVisitStatService(ctx);
@@ -209,19 +206,13 @@ async function trackRequest(ctx: Context) {
   }
 }
 
-
-const excludePathPrefix = [
-  '/ns/static/',
-  '/ns/api/helpers'
-];
-
+const excludePathPrefix = ['/ns/static/', '/ns/api/helpers'];
 
 /**
  * 全局中间件
  */
 @Middleware()
 export class GlobalMiddleware implements IMiddleware<Context, NextFunction> {
-
   match(ctx: Context): boolean {
     const path: string = ctx.path;
     for (let i = 0; i < excludePathPrefix.length; i++) {
@@ -239,7 +230,6 @@ export class GlobalMiddleware implements IMiddleware<Context, NextFunction> {
       ctx.transaction = new Transaction();
 
       try {
-
         // 支持的站点
         const workbenchService = await getWorkbenchService(ctx);
         const isSupportTheHost = await workbenchService.isSupportCurrentHostForForMiddleware();
@@ -255,7 +245,7 @@ export class GlobalMiddleware implements IMiddleware<Context, NextFunction> {
         ctx.workbenchInfo = await workbenchService.getCurrentHostWorkbenchInfo();
 
         // 数据埋点
-        await trackRequest(ctx)
+        await trackRequest(ctx);
 
         const res0 = await next();
 
@@ -269,7 +259,6 @@ export class GlobalMiddleware implements IMiddleware<Context, NextFunction> {
           return res0;
         }
 
-
         // 其他：普通的JSON数据
         let res = handleExecuteSqlContext(res0);
         res = handleNullRes(res);

package/src/models/AsyncTaskModel.ts

@@ -36,6 +36,8 @@ export interface SysAsyncTaskEntity {
   created_user_session: string;
 }
 
+export type SysAsyncTaskPartial = Partial<SysAsyncTaskEntity>;
+
 export enum SysAsyncTaskStatus {
   PENDING = 'PENDING', // 等待中，还未进入排队
   RUNNING = 'RUNNING', // 运行中
@@ -58,14 +60,13 @@ export enum SysAsyncFileFormat {
   JPG = 'jpg',
 }
 
-
 export interface ISysAsyncTaskHandler {
   execute(asyncTaskContext: SysAsyncTaskContext): Promise<void>;
 }
 
 export interface SysAsyncTaskContext {
   task: SysAsyncTaskEntity;
-  updateTaskStatus: ()=>any;
+  updateTaskStatus: (sysAsyncTaskPartial: SysAsyncTaskPartial) => any;
 }
 
 export interface SysAsyncTaskHandlerConfig {

package/src/models/RedisKeys.ts

@@ -0,0 +1,13 @@
+
+
+const RedisKeys = {
+  ASYNC_TASK_LOCK : "FatAsyncTaskLock",
+  ASYNC_TASK_UPDATE_TIME : "FatAsyncTaskUpdateTime",
+  USER_SESSION_PREFIX : "FatUserSession_",
+  VISIT_STAT_LOCK_PREFIX : "FatVsLock_",
+  VISIT_STAT_DATE_PREFIX : "FatVsDate_",
+}
+
+export {
+  RedisKeys
+}

package/src/models/bizmodels.ts

@@ -85,5 +85,4 @@ export interface IVisitorExt extends IVisitor {
   accountType: string;
 }
 
-
-export const FILE_GET_TYPES = ['thumbnail','preview', 'download'];
+export const FILE_GET_TYPES = ['thumbnail', 'preview', 'download'];

package/src/schedule/runSchedule.ts

@@ -9,8 +9,8 @@ const lastExecuteTimeMap = {};
 const DEFAULT_SCHEDULE_INTERVAL = 2 * 60 * 1000;
 
 
-
 async function runScheduleTaskOnce(serviceName: string) {
+
   return await ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx: koa.IMidwayKoaContext) => {
     const serviceObject: IScheduleService = await ctx.requestContext.getAsync(serviceName);
     if (serviceObject && serviceObject.runBySchedule) {
@@ -21,12 +21,15 @@ async function runScheduleTaskOnce(serviceName: string) {
   });
 }
 
+
 class ScheduleQueue {
   private scheduleIntervalMap: Map<string, number> = new Map();
-  public setScheduleTask(serviceName: string, intervalTime: number){
+
+  public setScheduleTask(serviceName: string, intervalTime: number) {
     this.scheduleIntervalMap.set(serviceName, intervalTime);
   }
-  public removeScheduleTask(serviceName: string){
+
+  public removeScheduleTask(serviceName: string) {
     this.scheduleIntervalMap.delete(serviceName);
   }
 
@@ -41,20 +44,22 @@ class ScheduleQueue {
   }
 
 
+  private async runScheduleTaskOnceCheckTime(serviceName: string) {
+    // 还没有到可以执行时间
+    if (!this.isAlreadyTimeToExecute(serviceName)) {
+      return;
+    }
+    lastExecuteTimeMap[serviceName] = Date.now();
+    await runScheduleTaskOnce(serviceName);
+  }
+
   private async runScheduleServiceList() {
     const serviceListKeys = this.scheduleIntervalMap.keys();
     const serviceList = [...serviceListKeys];
     for (let i = 0; i < serviceList.length; i++) {
       const serviceName = serviceList[i];
-
-      // 还没有到可以执行时间
-      if (!this.isAlreadyTimeToExecute(serviceName)) {
-        return;
-      }
-      lastExecuteTimeMap[serviceName] = Date.now();
-
       try {
-        await runScheduleTaskOnce(serviceName);
+        await this.runScheduleTaskOnceCheckTime(serviceName);
       } catch (e) {
         ANONYMOUS_CONTEXT.getApp().getCoreLogger().error(`runSchedule error , serviceName = ${serviceName}`, e);
       }

package/src/service/UserSessionService.ts

@@ -1,8 +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 {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 {
@@ -35,8 +36,8 @@ function pickUserAvatar(avatar: any): string {
 
 const SESSION_KEEP_TIME_SECOND: number = 3600 * 24 * 30;
 
-const toCacheKey = (sessionId: string)=>{
-  return `UserSession@@${sessionId}`;
+const toCacheKey = (sessionId: string): string =>{
+  return `${RedisKeys.USER_SESSION_PREFIX}${sessionId}`;
 }
 
 @Provide()