midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.51

package/dist/controller/manage/SuperAdminManageApi.js

@@ -18,11 +18,13 @@ const permission_middleware_1 = require("../../middleware/permission.middleware"
 const SystemPerm_1 = require("../../models/SystemPerm");
 const SystemTables_1 = require("../../models/SystemTables");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const global_config_1 = require("../../libs/global-config/global-config");
 let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.BaseApiController {
     /**
      * 预设系统内置功能点数据
      */
     async presetsFuncCode() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const funcCodeList = Object.keys(SystemPerm_1.SystemFuncCodeNameMap);
         for (let i = 0; i < funcCodeList.length; i++) {
             const funcCode = funcCodeList[i];
@@ -36,8 +38,8 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_perm_func,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
         }
         return common_dto_1.CommonResult.successRes();
@@ -46,6 +48,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
      * 预设系统内置角色数据
      */
     async presetsRoleCode() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const roleCodeList = [SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.DevOpsWriter];
         for (let i = 0; i < roleCodeList.length; i++) {
             const roleCode = roleCodeList[i];
@@ -59,8 +62,8 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_perm_role,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
         }
         return common_dto_1.CommonResult.successRes();
@@ -69,6 +72,7 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
      * 预设系统内置：角色和功能点的关系
      */
     async presetsRoleFuncList() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const funcCodeList = Object.keys(SystemPerm_1.SystemFuncCodeNameMap);
         for (let i = 0; i < funcCodeList.length; i++) {
             const funcCode = funcCodeList[i];
@@ -81,8 +85,8 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
         }
         for (let i = 0; i < funcCodeList.length; i++) {
@@ -97,8 +101,8 @@ let SuperAdminManageApi = class SuperAdminManageApi extends BaseApiController_1.
                 }, {
                     sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
                     sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                    sqlDatabase: SystemTables_1.SystemDbName,
-                    sqlDdType: SystemTables_1.SystemDbType,
+                    sqlDatabase: SystemDbName,
+                    sqlDbType: SystemDbType,
                 });
             }
         }

package/dist/controller/manage/SysConfigMangeApi.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import { CommonResult } from "../../libs/utils/common-dto";
+import { CommonResult } from '../../libs/utils/common-dto';
 export declare class SysConfigMangeApi extends BaseApiController {
     ctx: Context;
     getSysConfigList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/SysConfigMangeApi.js

@@ -18,6 +18,7 @@ const SystemPerm_1 = require("../../models/SystemPerm");
 const bizmodels_1 = require("../../models/bizmodels");
 const SystemTables_1 = require("../../models/SystemTables");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const global_config_1 = require("../../libs/global-config/global-config");
 let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.BaseApiController {
     async getSysConfigList() {
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -47,26 +48,27 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
         });
     }
     async updateSysConfig() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const body = this.ctx.request.body;
         const id = body.condition.id;
         if (!id) {
-            return common_dto_1.CommonResult.errorRes("id不能为空");
+            return common_dto_1.CommonResult.errorRes('id不能为空');
         }
-        const sysConfig = await this.curdMixService.getBbUtil(SystemTables_1.SystemDbName, SystemTables_1.SystemDbType).getOne({ condition: body.condition }, SystemTables_1.SystemTables.sys_configs);
+        const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getOne({ condition: body.condition }, SystemTables_1.SystemTables.sys_configs);
         if (!sysConfig) {
-            return common_dto_1.CommonResult.errorRes("配置项不存在");
+            return common_dto_1.CommonResult.errorRes('配置项不存在');
         }
         const { edit_auth_type, edit_auth_config } = sysConfig;
         if (edit_auth_type) {
             const isOK = this.ctx.userSession.isAuthPass(edit_auth_type, edit_auth_config);
             if (!isOK) {
-                return common_dto_1.CommonResult.errorRes("编辑权限校验不通过：" + JSON.stringify({ edit_auth_type, edit_auth_config }));
+                return common_dto_1.CommonResult.errorRes('编辑权限校验不通过：' + JSON.stringify({ edit_auth_type, edit_auth_config }));
             }
         }
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'data.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:1,64'],
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },
@@ -76,7 +78,7 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
     async deleteSysConfig() {
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/manage/SystemInfoManageApi.d.ts

@@ -1,7 +1,7 @@
 import { InfoService } from '@midwayjs/info';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import { CommonResult } from "../../libs/utils/common-dto";
+import { CommonResult } from '../../libs/utils/common-dto';
 export declare class SystemInfoManageApi extends BaseApiController {
     protected ctx: Context;
     protected infoService: InfoService;

package/dist/controller/manage/SystemInfoManageApi.js

@@ -42,7 +42,13 @@ let SystemInfoManageApi = class SystemInfoManageApi extends BaseApiController_1.
         // 网络信息
         const networkInfo = this.infoService.networkInfo();
         return common_dto_1.CommonResult.successRes({
-            projectInfo, systemInfo, resourceOccupationInfo, softwareInfo, timeInfo, envInfo, networkInfo
+            projectInfo,
+            systemInfo,
+            resourceOccupationInfo,
+            softwareInfo,
+            timeInfo,
+            envInfo,
+            networkInfo,
         });
     }
 };

package/dist/controller/manage/UserAccountManageApi.d.ts

@@ -1,7 +1,7 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 export declare class UserAccountManageApi extends BaseApiController {
-    ctx: Context;
+    protected ctx: Context;
     getUserAccountList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getUserAccountOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     updateUserAccount(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/UserAccountManageApi.js

@@ -18,6 +18,7 @@ const permission_middleware_1 = require("../../middleware/permission.middleware"
 const SystemPerm_1 = require("../../models/SystemPerm");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value) {
     if (!value) {
@@ -27,7 +28,7 @@ function checkAccountCreateBlacklist(value) {
         throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_EXCEPTION, '用户名或昵称不能使用具有管理员歧义的词语');
     }
 }
-const LOGIN_NAME_VALIDATE = [keys_1.KeysOfValidators.STRING, keys_1.KeysOfValidators.NAME, 'length:6,50', checkAccountCreateBlacklist];
+const LOGIN_NAME_VALIDATE = [keys_1.KeysOfValidators.STRING, keys_1.KeysOfValidators.NAME, 'length:5,50', checkAccountCreateBlacklist];
 let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_1.BaseApiController {
     async getUserAccountList() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -42,18 +43,22 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
     async updateUserAccount() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'data.login_name': LOGIN_NAME_VALIDATE,
                 'data.nick_name': [keys_1.KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
             },
             allowCfg: {
-                data: ['login_name', 'nick_name', 'avatar', 'status'],
+                data: ['login_name', 'nick_name', 'avatar', 'status', 'modified_at', 'created_at'],
             },
         });
     }
     async createUserAccount() {
         const body = this.ctx.request.body;
         body.data.account_id = (0, functions_1.createUniqueId)();
+        const { generateUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        if (typeof generateUserAccountId === 'function') {
+            body.data.account_id = await generateUserAccountId(body.data);
+        }
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.login_name': LOGIN_NAME_VALIDATE,
@@ -65,7 +70,7 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
     async deleteUserAccount() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/WorkbenchMangeApi.js

@@ -29,7 +29,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
         this.workbenchService.clearCache();
         const body = this.ctx.request.body;
         const dataObj = body.data || {};
-        dataObj.html_content = dataObj.html_content || "<html>hello</html>";
+        dataObj.html_content = dataObj.html_content || '<html>hello</html>';
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
@@ -43,7 +43,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
         this.workbenchService.clearCache();
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
@@ -53,7 +53,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
         this.workbenchService.clearCache();
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.INTEGER],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
                 'condition.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });

package/dist/controller/myinfo/AuthController.d.ts

@@ -14,10 +14,6 @@ export declare class AuthController extends BaseApiController {
      * 登录
      */
     login(): Promise<CommonResult>;
-    /**
-     * 使用https://medstatistic.com/账号登录
-     */
-    loginByMedStatistic(): Promise<CommonResult>;
     /**
      * 退出
      */

package/dist/controller/myinfo/AuthController.js

@@ -11,7 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthController = void 0;
 const core_1 = require("@midwayjs/core");
-const axios_1 = require("axios");
 const BaseApiController_1 = require("../base/BaseApiController");
 const AuthService_1 = require("../../service/AuthService");
 const userSession_1 = require("../../models/userSession");
@@ -51,52 +50,6 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
         this.ctx.cookies.set(userSession_1.SESSION_ID_KEY, userSessionInfo.sessionId, userSession_1.sessionCookieCfg);
         return common_dto_1.CommonResult.successMsg('登录成功', userSessionInfo);
     }
-    /**
-     * 使用https://medstatistic.com/账号登录
-     */
-    async loginByMedStatistic() {
-        var _a;
-        const { medStatisticToken } = this.ctx.request.body;
-        if (!medStatisticToken) {
-            return common_dto_1.CommonResult.errorRes("medStatisticToken is null");
-        }
-        const workbench = await this.workbenchService.getCurrentHostWorkbenchInfo();
-        if (!workbench) {
-            throw new exceptions_1.CommonException('WORKBENCH_IS_NOT_FOUND', '站点未找到');
-        }
-        // 先删除之前的cookie
-        const sessionId = this.ctx.cookies.get(userSession_1.SESSION_ID_KEY, userSession_1.sessionCookieCfg);
-        await this.authService.removeUserSession(sessionId);
-        let userInfoRes = null;
-        try {
-            userInfoRes = await axios_1.default.get("https://console.medstatistic.com/api/user/index?lang=zh-cn", {
-                headers: {
-                    host: "console.medstatistic.com",
-                    origin: "https://console.medstatistic.com",
-                    token: medStatisticToken
-                },
-                responseType: 'json'
-            });
-        }
-        catch (e) {
-            return common_dto_1.CommonResult.errorRes((e === null || e === void 0 ? void 0 : e.message) || '');
-        }
-        const userInfo = (_a = userInfoRes === null || userInfoRes === void 0 ? void 0 : userInfoRes.data) === null || _a === void 0 ? void 0 : _a.data;
-        if (!userInfo || !userInfo.id) {
-            return common_dto_1.CommonResult.errorRes("USER_NOT_EXIST");
-        }
-        const consumerUserInfo = {
-            workbenchCode: workbench.workbench_code,
-            accountType: 'medstatistic',
-            accountId: userInfo.id,
-            nickName: userInfo.nickname,
-            loginName: `${userInfo.id}_${userInfo.username}`,
-            avatar: userInfo.avatar,
-        };
-        const userSessionInfo = await this.authService.createUserSessionForConsumer(consumerUserInfo);
-        this.ctx.cookies.set(userSession_1.SESSION_ID_KEY, userSessionInfo.sessionId, userSession_1.sessionCookieCfg);
-        return common_dto_1.CommonResult.successMsg('登录成功', userSessionInfo);
-    }
     /**
      * 退出
      */
@@ -122,7 +75,7 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
         const { unsaltedPwd } = this.ctx.request.body;
         const loginName = this.ctx.userSession.getSessionInfo().loginName;
         if (loginName === 'devopsviewer') {
-            return common_dto_1.CommonResult.errorRes("开放体验账号不支持修改密码");
+            return common_dto_1.CommonResult.errorRes('开放体验账号不支持修改密码');
         }
         return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
     }
@@ -153,12 +106,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], AuthController.prototype, "login", null);
-__decorate([
-    (0, core_1.Post)('/loginByMedStatistic'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], AuthController.prototype, "loginByMedStatistic", null);
 __decorate([
     (0, core_1.Post)('/logout'),
     __metadata("design:type", Function),

package/dist/controller/render/AppRenderController.js

@@ -20,18 +20,20 @@ const SystemTables_1 = require("../../models/SystemTables");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const render_utils_1 = require("../../libs/utils/render-utils");
 const crypto_utils_1 = require("../../libs/utils/crypto-utils");
+const global_config_1 = require("../../libs/global-config/global-config");
 /**
  * 渲染独立外部应用
  */
 let AppRenderController = class AppRenderController extends BaseApiController_1.BaseApiController {
     async home(appPath) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const appPathArr = appPath.split('/');
         const appCode = appPathArr[0];
         const res = await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, {
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const { row: appInfo } = res.getResModel();
         if (!appInfo) {
@@ -50,12 +52,17 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
         const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
         const html_content = appInfo.html_content || '<b style="color: red">错误：未配置HTML模版，请检查!!</b>';
         const userInfo = this.getUserSessionInfo();
-        const fatcmscsrftoken = await crypto_utils_1.privateAES.time_encrypt_utf8_base64("" + Date.now());
+        const fatcmscsrftoken = await crypto_utils_1.privateAES.time_encrypt_utf8_base64('' + Date.now());
         const utils = (0, render_utils_1.createRenderUtils)({
             ctx: this.ctx,
-            appInfo, workbenchInfo, userInfo, package_assets: appInfo.package_assets, fatcmscsrftoken
+            appInfo,
+            workbenchInfo,
+            userInfo,
+            package_assets: appInfo.package_assets,
+            fatcmscsrftoken,
         });
-        return this.ctx.renderString(html_content, { appInfo, workbenchInfo, userInfo, utils }, { viewEngine: 'ejs' });
+        const query = this.ctx.query || {};
+        return this.ctx.renderString(html_content, { appInfo, workbenchInfo, userInfo, utils, query }, { viewEngine: 'ejs' });
     }
     async isSupportCurrentWorkbench(appInfo) {
         if (this.isLocalEnv()) {

package/dist/controller/test.controller.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../service/curd/CurdMixService';
-import { BaseApiController } from "./base/BaseApiController";
+import { BaseApiController } from './base/BaseApiController';
 export declare class TestApiController extends BaseApiController {
     protected ctx: Context;
     protected curdMixService: CurdMixService;

package/dist/controller/test.controller.js

@@ -18,16 +18,16 @@ const keys_1 = require("../libs/crud-pro/models/keys");
 let TestApiController = class TestApiController extends BaseApiController_1.BaseApiController {
     async testPgQuery() {
         const cfgModel = {
-            sqlTable: "test_table1",
+            sqlTable: 'test_table1',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: "postgres_test1",
-            sqlDdType: keys_1.SqlDbType.postgres,
+            sqlDatabase: 'postgres_test1',
+            sqlDbType: keys_1.SqlDbType.postgres,
             updateCfg: {},
         };
         return this.curdMixService.executeCrudByCfg({
             condition: {
-                int4: "222"
-            }
+                int4: '222',
+            },
         }, cfgModel);
     }
 };

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -40,6 +41,7 @@ export * from './middleware/forbidden.middleware';
 export * from './middleware/global.middleware';
 export * from './middleware/tx.middleware';
 export * from './middleware/permission.middleware';
+export * from './middleware/redislock.middleware';
 export * from './service/AuthService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
@@ -62,9 +64,13 @@ export * from './service/curd/CurdMixByLinkToCustomService';
 export * from './service/curd/CurdMixBySysConfigService';
 export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
+export * from './service/curd/CurdMixUtils';
 export * from './service/curd/CurdProService';
+export * from './service/curd/CrudProQuick';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
 export * from './models/userSession';
 export * from './models/bizmodels';
 export * from './models/SystemEntities';
@@ -72,6 +78,8 @@ export * from './models/SystemPerm';
 export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
+export * from './schedule/index';
 export * from './libs/utils/common-dto';
 export * from './libs/utils/crypto-utils';
 export * from './libs/utils/fatcms-request';
@@ -91,3 +99,5 @@ export * from './libs/crud-pro/models/keys';
 export * from './libs/crud-pro/models/ExecuteContextFunc';
 export * from './libs/crud-pro/models/RequestCfgModel';
 export * from './libs/crud-pro/models/SqlSegArg';
+export * from './libs/crud-pro/models/ResModel';
+export * from './libs/global-config/global-config';

package/dist/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./controller/gateway/FileController"), exports);
 __exportStar(require("./controller/gateway/ProxyApiGatewayController"), exports);
 __exportStar(require("./controller/gateway/PublicApiController"), exports);
 __exportStar(require("./controller/gateway/StaticController"), exports);
+__exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
@@ -58,6 +59,7 @@ __exportStar(require("./middleware/forbidden.middleware"), exports);
 __exportStar(require("./middleware/global.middleware"), exports);
 __exportStar(require("./middleware/tx.middleware"), exports);
 __exportStar(require("./middleware/permission.middleware"), exports);
+__exportStar(require("./middleware/redislock.middleware"), exports);
 __exportStar(require("./service/AuthService"), exports);
 __exportStar(require("./service/EnumInfoService"), exports);
 __exportStar(require("./service/FileCenterService"), exports);
@@ -80,9 +82,13 @@ __exportStar(require("./service/curd/CurdMixByLinkToCustomService"), exports);
 __exportStar(require("./service/curd/CurdMixBySysConfigService"), exports);
 __exportStar(require("./service/curd/CurdMixByWorkbenchService"), exports);
 __exportStar(require("./service/curd/CurdMixService"), exports);
+__exportStar(require("./service/curd/CurdMixUtils"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
+__exportStar(require("./service/curd/CrudProQuick"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiLoadService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskRunnerService"), exports);
 __exportStar(require("./models/userSession"), exports);
 __exportStar(require("./models/bizmodels"), exports);
 __exportStar(require("./models/SystemEntities"), exports);
@@ -90,6 +96,8 @@ __exportStar(require("./models/SystemPerm"), exports);
 __exportStar(require("./models/contextLogger"), exports);
 __exportStar(require("./models/devops"), exports);
 __exportStar(require("./models/SystemTables"), exports);
+__exportStar(require("./models/AsyncTaskModel"), exports);
+__exportStar(require("./schedule/index"), exports);
 __exportStar(require("./libs/utils/common-dto"), exports);
 __exportStar(require("./libs/utils/crypto-utils"), exports);
 __exportStar(require("./libs/utils/fatcms-request"), exports);
@@ -109,3 +117,5 @@ __exportStar(require("./libs/crud-pro/models/keys"), exports);
 __exportStar(require("./libs/crud-pro/models/ExecuteContextFunc"), exports);
 __exportStar(require("./libs/crud-pro/models/RequestCfgModel"), exports);
 __exportStar(require("./libs/crud-pro/models/SqlSegArg"), exports);
+__exportStar(require("./libs/crud-pro/models/ResModel"), exports);
+__exportStar(require("./libs/global-config/global-config"), exports);

package/dist/libs/crud-pro/CrudPro.d.ts

@@ -32,5 +32,6 @@ declare class CrudPro {
     private executeSQLList;
     private parseRunSqlException;
     private afterExecuteSQLList;
+    private beforeExecuteSQLList;
 }
 export { CrudPro };

package/dist/libs/crud-pro/CrudPro.js

@@ -75,6 +75,8 @@ class CrudPro {
     async executeCrudByCfg(reqJson, cfgJson) {
         const logger = this.executeContext.getLogger();
         logger.info('CurdPro executeCrudByCfg', cfgJson);
+        // 在执行之前可以根据业务需要修改需要执行的内容。
+        await this.beforeExecuteSQLList(reqJson, cfgJson);
         const exeCtx = this.executeContext;
         if (!cfgJson.method) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_METHOD_EMPTY, JSON.stringify(cfgJson));
@@ -127,5 +129,8 @@ class CrudPro {
     async afterExecuteSQLList() {
         return this.executeContext.contextFunc.afterExecuteSQLList();
     }
+    async beforeExecuteSQLList(reqJson, cfgJson) {
+        return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
+    }
 }
 exports.CrudPro = CrudPro;

package/dist/libs/crud-pro/defaultConfigs.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_LIMIT = exports.DEFAULT_MAX_LIMIT = exports.defaultCrudProCfg = void 0;
+const keys_1 = require("./models/keys");
 exports.defaultCrudProCfg = {
     sysDatabaseName: 'fatcms',
+    sysDatabaseDbType: keys_1.SqlDbType.mysql,
     sysConfigTableName: 'sys_configs',
     dictItemTableName: 'sys_data_dict_item',
     methodsTableName: 'sys_crud_methods',

package/dist/libs/crud-pro/interfaces.d.ts

@@ -1,6 +1,7 @@
 import { KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType } from './models/keys';
 export interface ICrudProCfg {
     sysDatabaseName?: string;
+    sysDatabaseDbType?: SqlDbType;
     methodsTableName?: string;
     methodsCacheTime?: number;
     dictItemTableName?: string;
@@ -86,7 +87,7 @@ export interface IBaseCfgModel {
     sqlTable?: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit?: number;
     columns?: string | string[];
     columnsRelation?: ColumnRelation[];
@@ -154,4 +155,9 @@ export interface ILogger {
     error(msg: any, ...args: any[]): void;
     warn(msg: any, ...args: any[]): void;
 }
+export interface IExecuteUnsafeQueryCtx {
+    sqlTable: string;
+    sqlDatabase: string;
+    sqlDbType: SqlDbType;
+}
 export {};

package/dist/libs/crud-pro/models/ExecuteContext.d.ts

@@ -2,8 +2,9 @@ import { RequestModel } from './RequestModel';
 import { RequestCfgModel } from './RequestCfgModel';
 import { SqlCfgModel } from './SqlCfgModel';
 import { Transaction } from './Transaction';
-import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
+import { ColumnRelation, ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
+import { ResModelFlexible } from './ResModel';
 declare class ExecuteContext {
     private transaction;
     private logger;
@@ -24,7 +25,7 @@ declare class ExecuteContext {
     getVisitor(): IVisitor;
     getReqModel(): RequestModel;
     setReqModel(reqModel: RequestModel): void;
-    getResModel(): Record<string, any>;
+    getResModel(): ResModelFlexible;
     getOneObj(): any;
     getResRows(): any[];
     setResModelItem(resName: string, data: any): void;
@@ -35,8 +36,14 @@ declare class ExecuteContext {
     getSqlCfgModels(): SqlCfgModel[];
     getResMessage(): string;
 }
+interface IExecuteContextCustom {
+    rows: any[];
+    columnsRelation?: ColumnRelation[];
+    isCustomContext?: boolean;
+}
+declare type HandleExecuteContextType = ExecuteContext | IExecuteContextCustom;
 interface IExecuteContextHandler {
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
 }
-export { ExecuteContext, IExecuteContextHandler };
+export { ExecuteContext, IExecuteContextHandler, HandleExecuteContextType, IExecuteContextCustom };

package/dist/libs/crud-pro/models/ExecuteContextFunc.d.ts

@@ -1,4 +1,4 @@
-import { IConnectionPool } from '../interfaces';
+import { IConnectionPool, IRequestCfgModel, IRequestModel } from '../interfaces';
 import { ExecuteContext } from './ExecuteContext';
 import { SqlCfgModel } from './SqlCfgModel';
 import { RequestCfgModel } from './RequestCfgModel';
@@ -10,6 +10,7 @@ export interface IExecuteContextFunc {
     getFunctionMap(): any;
     validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): Promise<any>;
     afterExecuteSQLList(): Promise<any>;
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
 }
 export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
     private executeContext;
@@ -26,6 +27,12 @@ export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
      * @param exeCtx
      */
     afterExecuteSQLList(): Promise<any>;
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
     getExecuteContext(): ExecuteContext;
     setExecuteContext(executeContext: ExecuteContext): void;
 }