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

package/src/config/config.default.ts

@@ -3,24 +3,25 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 
-
-
 export default (appInfo: any) => {
   return {
-
     siteFile: {
       favicon: readFileSync(join(__dirname, '../views/static/favicon.ico')),
     },
 
-    encryptedFieldList: [
-
-    ],
+    encryptedFieldList: [],
 
     /**
      * 内置超级管理员用户
      * 可以使用这个工具生成：http://127.0.0.1:7002/ns/api/helpers/generateDatabasePassword?loginName=xxxx&pw0=xxxx
      */
-    superAdminList: [{ pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88', pwd_md5: 'e334410fca1fd49972f63bf91f3be1be', login_name: 'superadmin' }],
+    superAdminList: [
+      {
+        pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88',
+        pwd_md5: 'e334410fca1fd49972f63bf91f3be1be',
+        login_name: 'superadmin',
+      },
+    ],
 
     // use for cookie sign key, should change to your own and keep security
     keys: '1715169944707_323',
@@ -40,7 +41,11 @@ export default (appInfo: any) => {
       jsonLimit: '1mb',
       textLimit: '1mb',
       xmlLimit: '1mb',
-      ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+      ignore: [
+        '/ns/gw/proxy/*',
+        '/ns/gw/file/uploadFile',
+        '/ns/api/manage/deploy/uploadAssets',
+      ], // 忽略代理路径的 body 解析
     },
 
     mysql2: {
@@ -57,7 +62,7 @@ export default (appInfo: any) => {
       },
     },
     postgres2: {
-      postgres_test1: {
+      postgres_test_fatcms_inner_demo_config: {
         user: 'postgres',
         host: '127.0.0.1',
         database: 'postgres',
@@ -66,12 +71,11 @@ export default (appInfo: any) => {
         max: 20, // 连接池最大连接数
         idleTimeoutMillis: 30000, // 空闲连接超时时间（毫秒）
         connectionTimeoutMillis: 2000, // 连接超时时间（毫秒）
-      }
+      },
     },
 
-
     sqlserver2: {
-      sqlserver_master: {
+      sqlserver_master_fatcms_inner_demo_config: {
         user: 'sa',
         password: '123456', // 你的SA密码
         server: '127.0.0.1',
@@ -79,20 +83,20 @@ export default (appInfo: any) => {
         database: 'master', // 默认数据库
         options: {
           encrypt: false, // Docker容器内通常不需要加密
-          trustServerCertificate: true // 信任自签名证书
+          trustServerCertificate: true, // 信任自签名证书
         },
         pool: {
-          max: 30,          // 最大连接数
-          min: 1,           // 最小连接数
-          idleTimeoutMillis: 30000  // 连接空闲超时时间（毫秒）
-        }
-      }
+          max: 30, // 最大连接数
+          min: 1, // 最小连接数
+          idleTimeoutMillis: 30000, // 连接空闲超时时间（毫秒）
+        },
+      },
     },
 
     redis: {
       client: {
         port: 6379, // Redis port
-        host: "127.0.0.1", // Redis host
+        host: '127.0.0.1', // Redis host
       },
     },
 
@@ -122,7 +126,34 @@ export default (appInfo: any) => {
       fileSize: '20mb',
       limit: '20mb',
       // whitelist: string[]，文件扩展名白名单
-      whitelist: ['.jpg', '.jpeg', '.png', '.gif', '.pdf', '.zip', '.xlsx', '.docx', '.pptx', '.txt', '.md', '.json', '.js', '.cjs', '.ejs', '.jsx', '.css', '.java', '.ts', '.tsx', '.less', '.scss', '.html', '.ttf', '.map', '.svg'],
+      whitelist: [
+        '.jpg',
+        '.jpeg',
+        '.png',
+        '.gif',
+        '.pdf',
+        '.zip',
+        '.xlsx',
+        '.docx',
+        '.pptx',
+        '.txt',
+        '.md',
+        '.json',
+        '.js',
+        '.cjs',
+        '.ejs',
+        '.jsx',
+        '.css',
+        '.java',
+        '.ts',
+        '.tsx',
+        '.less',
+        '.scss',
+        '.html',
+        '.ttf',
+        '.map',
+        '.svg',
+      ],
       // tmpdir: string，上传的文件临时存储路径
       tmpdir: join(tmpdir(), 'fatcms-upload-files'),
       // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟
@@ -148,25 +179,25 @@ export default (appInfo: any) => {
     ejs: {},
 
     info: {
-      infoPath: `/_my_info_${Date.now()}_${Math.floor(Math.random() * 1000000)}`, // 实际上隐藏了info路径
+      infoPath: `/_my_info_${Date.now()}_${Math.floor(
+        Math.random() * 1000000
+      )}`, // 实际上隐藏了info路径
     },
 
     // 使用浏览器插件配置header信息：插件名：ModHeader - Modify HTTP headers
     // 默认值：配置key：fatcmsdebug, 配置value: headerSecret的值
     fatcmsDebug: {
-      headerKey: 'euhvfvv5sDt19dNoerVFamhNYlLJ8ZDDYcRZhMJWNRxALxtrxLPqJSks9sRZEpKY',
-      headerSecret: 'IlddQO1fO8X7KSwnF3KazNaNHK05Y0kYaD+1z3yGlfZpz0+aAF5hDzf7KQk2dyx0',
+      headerKey: 'fatcmsDebug',
+      headerSecret: '111',
     },
 
     // 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
     fatcmsSAEnable: {
-      headerKey: 'WyuX2jf8hehgXAjV5Bf22hvbK/KTEiHCM8eiQeI0FETm/UFXkcLnn3GSTUfwVrrE',
-      headerSecret: 'lzt19Ef6HxSqg2rp6Q1M3YT+uMrTecmAm3cX1mwFZGqoXknwWdj5fTJil1Vr9AeHDIUFuOOxrU1kSSVa6h/Ppw==',
+      headerKey: 'fatcmsSAEnable',
+      headerSecret: '222',
     },
 
     // 是否启用内置的定时任务
     fatcmsScheduleService: true,
-
-
   } as MidwayConfig;
 };

package/src/controller/base/BaseApiController.ts

@@ -2,8 +2,8 @@ import { Controller, Inject } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../../service/curd/CurdMixService';
 import { IFuncCfgModel, IRequestCfgModel, IValidatorCfgItem } from '../../libs/crud-pro/interfaces';
-import {KeyOfCrudTypes, KeysOfSimpleSQL} from '../../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType} from '../../models/SystemTables';
+import { KeyOfCrudTypes, KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { UserAccountService } from '../../service/UserAccountService';
 import { RelatedType } from '../../service/curd/CurdMixUtils';
 import { BaseService } from '../../service/base/BaseService';
@@ -27,7 +27,6 @@ export class BaseApiController extends BaseService {
   @Inject()
   protected userAccountService: UserAccountService;
 
-
   protected getUserSessionInfo() {
     if (!this.ctx.userSession) {
       return null;
@@ -35,16 +34,15 @@ export class BaseApiController extends BaseService {
     return this.ctx.userSession.getSessionInfo();
   }
 
-  async executeSysSQL(executeSql:string, executeSqlArgs: any[]){
-    return await this.curdMixService.executeSQL(
-      {
-        executeSql: executeSql,
-        executeSqlArgs:executeSqlArgs,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-        crudType: KeyOfCrudTypes.SYS_QUERY,
-      }
-    );
+  async executeSysSQL(executeSql: string, executeSqlArgs: any[]) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return await this.curdMixService.executeSQL({
+      executeSql: executeSql,
+      executeSqlArgs: executeSqlArgs,
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      crudType: KeyOfCrudTypes.SYS_QUERY,
+    });
   }
 
   /**
@@ -55,6 +53,7 @@ export class BaseApiController extends BaseService {
    * @protected
    */
   protected async executeSysSimpleSQL(sqlTable: string, sqlSimpleName: KeysOfSimpleSQL, params?: IExecuteSimpleSqlParams) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const body = this.ctx.request.body as any;
     const req = this.ctx.req;
     const cfgModel: IRequestCfgModel = {
@@ -62,7 +61,7 @@ export class BaseApiController extends BaseService {
       sqlTable,
       sqlSimpleName,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       updateCfg: {},
     };
 
@@ -80,6 +79,7 @@ export class BaseApiController extends BaseService {
   }
 
   protected get sysDBUtil() {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     return this.curdMixService.getBbUtil(SystemDbName, SystemDbType);
   }
 

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -8,7 +8,8 @@ import { API_BASE_TYPE, ApiBaseService } from '../../service/base/ApiBaseService
 import { CurdProService } from '../../service/curd/CurdProService';
 import { CurdMixService } from '../../service/curd/CurdMixService';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
-import {parseDatabaseName} from "../../libs/crud-pro/utils/DatabaseName";
+import { parseDatabaseName } from "../../libs/crud-pro/utils/DatabaseName";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const QUERY_AS_LIST = ['condition', 'data'];
 
@@ -100,7 +101,10 @@ export class CrudMtdGatewayController extends ApiBaseService {
     const cfgModel = methodInfo as IRequestCfgModel2;
     const { dbType, dbName } = parseDatabaseName(cfgModel.sqlDatabase);
     cfgModel.sqlDatabase = dbName;
-    cfgModel.sqlDdType = dbType;
+    cfgModel.sqlDbType = dbType;
+
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
 
     return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
   }

package/src/controller/gateway/DocGatewayController.ts

@@ -1,7 +1,8 @@
 import {Get, Controller, Inject, Query} from '@midwayjs/core';
 import {Context} from '@midwayjs/koa';
 import {BaseApiController} from '../base/BaseApiController';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import {KeysOfSimpleSQL} from '../../libs/crud-pro/models/keys';
 import {WorkbenchService} from '../../service/WorkbenchService';
 import {CommonResult} from '../../libs/utils/common-dto';
@@ -37,6 +38,8 @@ export class DocGatewayController extends BaseApiController {
       return;
     }
 
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     await this.curdMixService.executeCrudByCfg({
         data: {
           pv: pv + 1
@@ -50,7 +53,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
   }
 
@@ -69,6 +72,7 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const res = await this.curdMixService.executeCrudByCfg(
       {
@@ -81,7 +85,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 
@@ -107,6 +111,8 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     return this.curdMixService.executeCrudByCfg(
       {
         columns: 'id,title,doc_category_code,sort_index',
@@ -122,7 +128,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
   }
@@ -135,6 +141,8 @@ export class DocGatewayController extends BaseApiController {
   async getDocLibInfo(@Query('docLibId') docLibId: string) {
     checkIsNumber(docLibId, 'docLibId');
 
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const s = await this.curdMixService.executeCrudByCfg(
       {
         condition: {
@@ -145,7 +153,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc_lib,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const docLibInfo = s.getOneObj();

package/src/controller/gateway/StaticController.ts

@@ -1,6 +1,7 @@
 import { All, Controller, Inject, Param } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
+import * as _ from 'lodash';
 import * as fs from 'fs/promises';
 import * as fs2 from 'fs';
 import * as path from 'path';
@@ -15,19 +16,18 @@ interface HttpGetRes {
 }
 
 
-const localDir = path.join(__dirname, '../../../public/static'); // 本地文件存储目录
-const notFoundListFile = path.join(localDir, '__404__list.json') // 404列表文件
-
 
 function getPathConfig(ossName: string) {
     const remoteBaseUrlMap = {
         "cdnjsx": 'https://cdnjsx.oss-cn-shanghai.aliyuncs.com',
-        "i.alicdn.com":"https://i.alicdn.com",
-        "img.alicdn.com":"https://img.alicdn.com",
+        "i.alicdn.com": "https://i.alicdn.com",
+        "img.alicdn.com": "https://img.alicdn.com",
+        "at.alicdn.com": "https://at.alicdn.com",
     };
-    const remoteBaseUrl = remoteBaseUrlMap[ossName];
+    let remoteBaseUrl = remoteBaseUrlMap[ossName];
     if (!remoteBaseUrl) {
-        throw new Error(`ossName: ${ossName} 未配置`);
+        console.error(`getPathConfig ossName: ${ossName} 未配置`);
+        remoteBaseUrl = `https://${ossName}`
     }
     return {
         remoteBaseUrl,
@@ -35,28 +35,13 @@ function getPathConfig(ossName: string) {
 }
 
 
-// 404列表缓存
-let notFoundList = new Set();
-
 
-// 初始化：加载404列表
-async function init() {
-    try {
-        // 确保本地存储目录存在
-        await fs.mkdir(localDir, { recursive: true });
-        const data = await fs.readFile(notFoundListFile, 'utf8');
 
-        notFoundList = new Set(JSON.parse(data));
-        console.log(`已加载${notFoundList.size}个404记录`);
-    } catch (error) {
-        if (error.code !== 'ENOENT') {
-            console.error('读取404列表失败:', error);
-        }
-    }
-}
+// 404列表缓存
+let notFoundList = new Set();
+let notFoundListIsInit = false;
 
 
-init();
 
 /**
  * 静态文件代理功能
@@ -66,6 +51,44 @@ export class StaticController extends BaseApiController {
     @Inject()
     protected ctx: Context;
 
+    constructor() {
+        super();
+        this.initNotFoundList();
+    }
+
+
+    private getLocalPaths(): any {
+        const appDir = this.app.getAppDir();
+        const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
+        const notFoundListFile = path.join(localDir, '__404__list.json') // 404列表文件
+        return {
+            localDir,
+            notFoundListFile
+        }
+    }
+
+
+    private async initNotFoundList() {
+        if (notFoundListIsInit) {
+            return;
+        }
+        notFoundListIsInit = true;
+
+        const { localDir, notFoundListFile } = this.getLocalPaths();
+        try {
+            // 确保本地存储目录存在
+            await fs.mkdir(localDir, { recursive: true });
+            const data = await fs.readFile(notFoundListFile, 'utf8');
+
+            notFoundList = new Set(JSON.parse(data));
+            console.log(`已加载${notFoundList.size}个404记录`);
+        } catch (error) {
+            if (error.code !== 'ENOENT') {
+                console.error('读取404列表失败:', error);
+            }
+        }
+    }
+
     private async responseLocalFile(localFilePath: string, localHeaderPath: string, relativePath: string): Promise<boolean> {
 
         const headers = {
@@ -128,6 +151,7 @@ export class StaticController extends BaseApiController {
     @All('/:ossName/:relativePath+')
     async proxyStaticFile(@Param('ossName') ossName: string, @Param('relativePath') relativePath: string) {
 
+        const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
 
 
@@ -195,6 +219,7 @@ export class StaticController extends BaseApiController {
 
     // 保存404列表
     async saveNotFoundList() {
+        const { notFoundListFile } = this.getLocalPaths();
         try {
             // 确保存储404列表的目录存在
             const dir = path.dirname(notFoundListFile);

package/src/controller/home.controller.ts

@@ -1,11 +1,9 @@
-import {Controller, Get, Inject} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from './base/BaseApiController';
-import {WorkbenchService} from '../service/WorkbenchService';
-import {createRenderUtils} from "../libs/utils/render-utils";
-import {privateAES} from "../libs/utils/crypto-utils";
-
-
+import { Controller, Get, Inject } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from './base/BaseApiController';
+import { WorkbenchService } from '../service/WorkbenchService';
+import { createRenderUtils } from '../libs/utils/render-utils';
+import { privateAES } from '../libs/utils/crypto-utils';
 
 @Controller('/')
 export class HomeController extends BaseApiController {
@@ -36,14 +34,14 @@ export class HomeController extends BaseApiController {
 
     const userInfo = this.getUserSessionInfo();
 
-    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64("" + Date.now());
+    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64('' + Date.now());
 
     const utils = createRenderUtils({
       ctx: this.ctx,
       userInfo,
       workbenchInfo,
       package_assets: workbenchInfo.package_assets,
-      fatcmscsrftoken
+      fatcmscsrftoken,
     });
 
     return this.ctx.renderString(html_content, { workbenchInfo, userInfo, utils }, { viewEngine: 'ejs' });