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

package/.eslintrc.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./node_modules/mwts/",
+  "ignorePatterns": ["node_modules", "dist", "test", "jest.config.js", "typings"],
+  "env": {
+    "jest": true
+  },
+  "rules": {
+    "max-len":"off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "node/no-unpublished-import": "off"
+  }
+}

package/.prettierrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  ...require('mwts/.prettierrc.json'),
+  printWidth: 500, // 与ESLint的max-len保持一致
+}

package/README.md

@@ -1 +1,8 @@
 #midway-fatcms
+
+
+
+* 加密字段：
+http://127.0.0.1:7002/ns/api/helpers/cryptoAes128CBC?input=123
+
+

package/dist/config/config.default.js

@@ -13,7 +13,13 @@ exports.default = (appInfo) => {
          * 内置超级管理员用户
          * 可以使用这个工具生成：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',
         koa: {
@@ -29,7 +35,11 @@ exports.default = (appInfo) => {
             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: {
             fatcms: {
@@ -45,7 +55,7 @@ exports.default = (appInfo) => {
             },
         },
         postgres2: {
-            postgres_test1: {
+            postgres_test_fatcms_inner_demo_config: {
                 user: 'postgres',
                 host: '127.0.0.1',
                 database: 'postgres',
@@ -54,10 +64,10 @@ exports.default = (appInfo) => {
                 max: 20,
                 idleTimeoutMillis: 30000,
                 connectionTimeoutMillis: 2000, // 连接超时时间（毫秒）
-            }
+            },
         },
         sqlserver2: {
-            sqlserver_master: {
+            sqlserver_master_fatcms_inner_demo_config: {
                 user: 'sa',
                 password: '123456',
                 server: '127.0.0.1',
@@ -65,19 +75,19 @@ exports.default = (appInfo) => {
                 database: 'master',
                 options: {
                     encrypt: false,
-                    trustServerCertificate: true // 信任自签名证书
+                    trustServerCertificate: true, // 信任自签名证书
                 },
                 pool: {
                     max: 30,
                     min: 1,
-                    idleTimeoutMillis: 30000 // 连接空闲超时时间（毫秒）
-                }
-            }
+                    idleTimeoutMillis: 30000, // 连接空闲超时时间（毫秒）
+                },
+            },
         },
         redis: {
             client: {
                 port: 6379,
-                host: "127.0.0.1", // Redis host
+                host: '127.0.0.1', // Redis host
             },
         },
         oss: {
@@ -105,7 +115,34 @@ exports.default = (appInfo) => {
             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: (0, path_1.join)((0, os_1.tmpdir)(), 'fatcms-upload-files'),
             // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟
@@ -134,13 +171,13 @@ exports.default = (appInfo) => {
         // 使用浏览器插件配置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,

package/dist/configuration.d.ts

@@ -3,4 +3,5 @@ export declare class ContainerLifeCycle {
     app: koa.Application;
     onConfigLoad(): Promise<any>;
     onReady(): Promise<void>;
+    private startScheduleOnReady;
 }

package/dist/configuration.js

@@ -50,20 +50,44 @@ let ContainerLifeCycle = class ContainerLifeCycle {
         return newConfig;
     }
     async onReady() {
-        const logger = this.app.getLogger();
-        const config = this.app.getConfig();
-        if (config.fatcmsScheduleService) {
-            // 启动定时任务
-            const scheduleServiceList = ['proxyApiLoadService', 'workbenchService', 'visitStatService'];
-            await (0, schedule_1.startSchedule)(this.app, scheduleServiceList);
-            logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ');
-        }
+        /**
+         * 让ANONYMOUS_CONTEXT获取app对象
+         */
+        schedule_1.ANONYMOUS_CONTEXT.setApp(this.app);
+        /**
+         * 启动定时任务
+         */
+        await this.startScheduleOnReady();
         // add middleware
         this.app.useMiddleware(forbidden_middleware_1.ForbiddenMiddleware);
         this.app.useMiddleware(global_middleware_1.GlobalMiddleware);
         // add filter
         // this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
     }
+    async startScheduleOnReady() {
+        const logger = this.app.getLogger();
+        const config = this.app.getConfig();
+        const fatcmsScheduleService = config.fatcmsScheduleService;
+        // 关闭定时任务
+        if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
+            return;
+        }
+        let scheduleIntervalCfg = schedule_1.INNER_SCHEDULE_INTERVAL;
+        if (typeof fatcmsScheduleService === "object") {
+            scheduleIntervalCfg = fatcmsScheduleService;
+        }
+        const keys = Object.keys(scheduleIntervalCfg);
+        for (let i = 0; i < keys.length; i++) {
+            const service = keys[i];
+            const interval = scheduleIntervalCfg[service];
+            if (typeof interval !== "number") {
+                throw new Error('Invalid scheduleIntervalCfg ' + service + ",  interval must be a number");
+            }
+            schedule_1.SCHEDULE_QUEUE.setScheduleTask(service, interval);
+        }
+        await schedule_1.SCHEDULE_QUEUE.startScheduleLoop();
+        logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ： ' + JSON.stringify(scheduleIntervalCfg));
+    }
 };
 __decorate([
     (0, core_1.App)(),
@@ -71,6 +95,7 @@ __decorate([
 ], ContainerLifeCycle.prototype, "app", void 0);
 ContainerLifeCycle = __decorate([
     (0, core_1.Configuration)({
+        // namespace: 'fatcms',
         imports: [
             koa,
             validate,

package/dist/controller/base/BaseApiController.d.ts

@@ -25,7 +25,7 @@ export declare class BaseApiController extends BaseService {
      * @protected
      */
     protected executeSysSimpleSQL(sqlTable: string, sqlSimpleName: KeysOfSimpleSQL, params?: IExecuteSimpleSqlParams): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    protected get sysDBUtil(): import("../..").DBUtils;
+    protected get sysDBUtil(): import("../..").CrudProQuick;
     private addAccountBasicInfoCfgModel;
     private addWorkbenchBasicInfoCfgModel;
 }

package/dist/controller/base/BaseApiController.js

@@ -13,10 +13,11 @@ exports.BaseApiController = void 0;
 const core_1 = require("@midwayjs/core");
 const CurdMixService_1 = require("../../service/curd/CurdMixService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
 const UserAccountService_1 = require("../../service/UserAccountService");
 const CurdMixUtils_1 = require("../../service/curd/CurdMixUtils");
 const BaseService_1 = require("../../service/base/BaseService");
+const moment = require("moment");
 let BaseApiController = class BaseApiController extends BaseService_1.BaseService {
     getUserSessionInfo() {
         if (!this.ctx.userSession) {
@@ -25,11 +26,12 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
         return this.ctx.userSession.getSessionInfo();
     }
     async executeSysSQL(executeSql, executeSqlArgs) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         return await this.curdMixService.executeSQL({
             executeSql: executeSql,
             executeSqlArgs: executeSqlArgs,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
     }
@@ -41,14 +43,15 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
      * @protected
      */
     async executeSysSimpleSQL(sqlTable, sqlSimpleName, params) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const body = this.ctx.request.body;
         const req = this.ctx.req;
         const cfgModel = {
             method: `${req.method}:${req.url}`,
             sqlTable,
             sqlSimpleName,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             updateCfg: {},
         };
         if (params && typeof params === 'object') {
@@ -58,10 +61,15 @@ let BaseApiController = class BaseApiController extends BaseService_1.BaseServic
         this.addAccountBasicInfoCfgModel(cfgModel);
         //自动关联工作台基本信息
         this.addWorkbenchBasicInfoCfgModel(cfgModel);
+        //sys系统表都是标准的，都有modified_at字段。
+        if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE && body.data) {
+            body.data['modified_at'] = moment(Date.now()).format('YYYY-MM-DD HH:mm:ss.SSS');
+        }
         return await this.curdMixService.executeCrudByCfg(body, cfgModel);
     }
     get sysDBUtil() {
-        return this.curdMixService.getBbUtil(SystemTables_1.SystemDbName, SystemTables_1.SystemDbType);
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        return this.curdMixService.getBbUtil(SystemDbName, SystemDbType);
     }
     addAccountBasicInfoCfgModel(cfgModel) {
         let columnsRelation = cfgModel.columnsRelation;

package/dist/controller/gateway/AsyncTaskController.d.ts

@@ -0,0 +1,14 @@
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+/**
+ * 异步任务框架
+ */
+export declare class AsyncTaskController extends BaseApiController {
+    protected ctx: Context;
+    private asyncTaskService;
+    getMyTasks(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    createTask(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    cancelTask(id: number): Promise<{
+        success: boolean;
+    }>;
+}

package/dist/controller/gateway/AsyncTaskController.js

@@ -0,0 +1,108 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncTaskController = void 0;
+const core_1 = require("@midwayjs/core");
+const BaseApiController_1 = require("../base/BaseApiController");
+const AsyncTaskService_1 = require("../../service/asyncTask/AsyncTaskService");
+const AsyncTaskModel_1 = require("../../models/AsyncTaskModel");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const SystemTables_1 = require("../../models/SystemTables");
+const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const permission_middleware_1 = require("../../middleware/permission.middleware");
+function fixMyTasksCondition(body, ctx) {
+    if (!body.condition) {
+        throw new exceptions_1.CommonException('参数不正确');
+    }
+    body.condition.created_by = ctx.userSession.getSessionInfo().accountId;
+}
+function fixCancelBodyData(body, id) {
+    if (!body.data || !body.condition) {
+        throw new exceptions_1.CommonException('参数不正确');
+    }
+    // fix condition
+    const conditionObj = (body.condition || {});
+    conditionObj.id = id;
+    body.condition = conditionObj;
+    // fix data
+    const dataObj = (body.data || {});
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.CANCELLED;
+    body.data = dataObj;
+}
+function fixCreateBodyData(body, ctx) {
+    if (!body.data) {
+        throw new exceptions_1.CommonException('参数不正确');
+    }
+    const sessionInfo = ctx.userSession.getSessionInfo();
+    // fix data
+    const dataObj = (body.data || {});
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.PENDING;
+    dataObj.created_by = sessionInfo.accountId;
+    dataObj.created_user_session = JSON.stringify(sessionInfo); // 创建人的session信息。用于执行时的鉴权。
+}
+/**
+ * 异步任务框架
+ */
+let AsyncTaskController = class AsyncTaskController extends BaseApiController_1.BaseApiController {
+    // 获取任务列表
+    async getMyTasks() {
+        fixMyTasksCondition(this.ctx.request.body, this.ctx);
+        return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_async_tasks, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+    }
+    // 创建任务
+    async createTask() {
+        fixCreateBodyData(this.ctx.request.body, this.ctx);
+        const res = await this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_async_tasks, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT);
+        await this.asyncTaskService.startTask();
+        return res;
+    }
+    // 取消任务
+    async cancelTask(id) {
+        fixCancelBodyData(this.ctx.request.body, id);
+        await this.asyncTaskService.cancelTask(id);
+        await this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_async_tasks, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE);
+        return { success: true };
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], AsyncTaskController.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", AsyncTaskService_1.AsyncTaskService)
+], AsyncTaskController.prototype, "asyncTaskService", void 0);
+__decorate([
+    (0, core_1.Post)('/getMyTasks'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], AsyncTaskController.prototype, "getMyTasks", null);
+__decorate([
+    (0, core_1.Post)('/createTask'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], AsyncTaskController.prototype, "createTask", null);
+__decorate([
+    (0, core_1.Post)('/cancelTask'),
+    __param(0, (0, core_1.Query)('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Promise)
+], AsyncTaskController.prototype, "cancelTask", null);
+AsyncTaskController = __decorate([
+    (0, core_1.Controller)('/ns/gw/AsyncTask', { middleware: [(0, permission_middleware_1.checkLogin)()] })
+], AsyncTaskController);
+exports.AsyncTaskController = AsyncTaskController;

package/dist/controller/gateway/CrudMtdGatewayController.d.ts

@@ -3,9 +3,9 @@ import { CommonResult } from '../../libs/utils/common-dto';
 import { WorkbenchService } from '../../service/WorkbenchService';
 import { ApiBaseService } from '../../service/base/ApiBaseService';
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */

package/dist/controller/gateway/CrudMtdGatewayController.js

@@ -22,6 +22,7 @@ const ApiBaseService_1 = require("../../service/base/ApiBaseService");
 const CurdProService_1 = require("../../service/curd/CurdProService");
 const CurdMixService_1 = require("../../service/curd/CurdMixService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
 const QUERY_AS_LIST = ['condition', 'data'];
 function pickAsQuery(query_as_pick, query) {
     if (query_as_pick && typeof query_as_pick === 'string') {
@@ -30,11 +31,11 @@ function pickAsQuery(query_as_pick, query) {
     }
     return query;
 }
-// /ns/gw/api/crudMtd/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
+// /ns/gw/crudApi/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */
@@ -50,7 +51,7 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
         if (!methodInfo || methodInfo.status !== 1) {
             return common_dto_1.CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
         }
-        this.logInfo("methodInfo=== ", methodInfo);
+        this.logInfo('methodInfo=== ', methodInfo);
         const workbench_code_array = methodInfo.workbench_code_array || methodInfo.workbenchCodeArray;
         const isSupport = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);
         if (!isSupport) {
@@ -83,7 +84,9 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
         const cfgModel = methodInfo;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(cfgModel.sqlDatabase);
         cfgModel.sqlDatabase = dbName;
-        cfgModel.sqlDdType = dbType;
+        cfgModel.sqlDbType = dbType;
+        // 业务系统自定义的修改cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
         return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
     }
 };

package/dist/controller/gateway/CrudStdGatewayController.d.ts

@@ -14,23 +14,23 @@ export declare class CrudStdGatewayController extends BaseApiController {
     /**
      * 列表查询: 分页查询
      */
-    getObjectList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    getObjectList(): Promise<any>;
     /**
      * 单个查询
      */
-    getObjectOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    getObjectOne(): Promise<any>;
     /**
      * 单个删除
      */
-    deleteObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    deleteObject(): Promise<any>;
     /**
      * 单个创建
      */
-    createObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    createObject(): Promise<any>;
     /**
      * 单个更新
      */
-    updateObject(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    updateObject(): Promise<any>;
     /**
      * 执行操作
      */

package/dist/controller/gateway/DocGatewayController.js

@@ -16,6 +16,7 @@ exports.DocGatewayController = void 0;
 const core_1 = require("@midwayjs/core");
 const BaseApiController_1 = require("../base/BaseApiController");
 const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const common_dto_1 = require("../../libs/utils/common-dto");
@@ -40,9 +41,10 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (nxRes !== 'OK') {
             return;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         await this.curdMixService.executeCrudByCfg({
             data: {
-                pv: pv + 1
+                pv: pv + 1,
             },
             condition: {
                 id: parseInt(docId),
@@ -51,8 +53,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
     }
     /**
@@ -66,6 +68,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (!docLibInfoRes.success) {
             return docLibInfoRes;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({
             condition: {
                 id: parseInt(docId),
@@ -74,8 +77,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         // 更新PV数据
         const docObj = res.getOneObj();
@@ -94,6 +97,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         if (!docLibInfoRes.success) {
             return docLibInfoRes;
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         return this.curdMixService.executeCrudByCfg({
             columns: 'id,title,doc_category_code,sort_index',
             orderBy: 'sort_index+,id-',
@@ -106,8 +110,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
     }
     /**
@@ -116,6 +120,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
      */
     async getDocLibInfo(docLibId) {
         checkIsNumber(docLibId, 'docLibId');
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const s = await this.curdMixService.executeCrudByCfg({
             condition: {
                 id: parseInt(docLibId),
@@ -123,8 +128,8 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_doc_lib,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const docLibInfo = s.getOneObj();
         if (!docLibInfo) {

package/dist/controller/gateway/PublicApiController.js

@@ -48,11 +48,11 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         if (!workbenchMenuCode) {
             return common_dto_1.CommonResult.errorRes('param workbenchMenuCode is null');
         }
-        const workbenchMenuCodeStr = "" + workbenchMenuCode;
+        const workbenchMenuCodeStr = '' + workbenchMenuCode;
         const workbenchMenuCodeArray = workbenchMenuCodeStr.split(',');
         const condition = {
             menu_code: {
-                "$in": workbenchMenuCodeArray
+                $in: workbenchMenuCodeArray,
             },
         };
         const rows = await this.sysDBUtil.getList({ condition }, SystemTables_1.SystemTables.sys_menus);
@@ -74,9 +74,7 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         // 特殊的devops菜单
         map['devops'] = {
             menu_list: [],
-            hasPermission: this.ctx.userSession.isAuthPass(keys_1.KeysOfAuthType.byRoleCode, [
-                SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin
-            ])
+            hasPermission: this.ctx.userSession.isAuthPass(keys_1.KeysOfAuthType.byRoleCode, [SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin]),
         };
         return common_dto_1.CommonResult.successRes(map);
     }
@@ -109,7 +107,7 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         const body = this.ctx.request.body;
         const query = this.ctx.query || {};
         let codeList = _.get(body, 'codeList');
-        let refreshCache = `${_.get(body, 'refreshCache')}` === 'true' || query.refreshCache === 'true';
+        const refreshCache = `${_.get(body, 'refreshCache')}` === 'true' || query.refreshCache === 'true';
         if (query.codeList) {
             //codeList=dict@@SexEnum,sysCfgEnum@@EntityStatusEnum
             const codeListStr = query.codeList;

package/dist/controller/gateway/StaticController.d.ts

@@ -11,6 +11,8 @@ interface HttpGetRes {
  */
 export declare class StaticController extends BaseApiController {
     protected ctx: Context;
+    private getLocalPaths;
+    private initNotFoundList;
     private responseLocalFile;
     proxyStaticFile(ossName: string, relativePath: string): Promise<string>;
     saveNotFoundList(): Promise<void>;