midway-fatcms 0.0.1-beta.3 → 0.0.1-beta.31

package/dist/controller/manage/CrudStandardDesignApi.js

@@ -26,8 +26,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const postgresList = Object.keys(this.postgres2Config || {});
         const sqlServerList = Object.keys(this.sqlserver2Config || {});
         const toSelectList = (dbCfgNameList, dbType) => {
-            return dbCfgNameList.map(item => {
-                const dbName = item;
+            return dbCfgNameList.map(dbName => {
                 const value = (0, DatabaseName_1.toDatabaseNameStr)(dbType, dbName);
                 return { value, label: value, dbName, dbType };
             });
@@ -35,7 +34,10 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const mysqlObjList = toSelectList(mysqlList, keys_1.SqlDbType.mysql);
         const postgresObjList = toSelectList(postgresList, keys_1.SqlDbType.postgres);
         const sqlserverObjList = toSelectList(sqlServerList, keys_1.SqlDbType.sqlserver);
-        const databaseList = [...mysqlObjList, ...postgresObjList, ...sqlserverObjList];
+        const databaseList = [...mysqlObjList, ...postgresObjList, ...sqlserverObjList].filter((obj) => {
+            const value = '' + obj.value;
+            return !value.endsWith('_fatcms_inner_demo_config');
+        });
         return {
             success: true,
             data: databaseList,
@@ -53,7 +55,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const res = await this.curdMixService.executeSQL({
             executeSql: 'SHOW TABLES',
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const arr = JSON.parse(JSON.stringify(res));
@@ -65,7 +67,7 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 label: tableName,
                 dbName,
                 dbType,
-                tableName
+                tableName,
             };
         });
         return common_dto_1.CommonResult.successRes(tableNames);
@@ -82,13 +84,13 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
         const tableDescribe = await this.curdMixService.executeSQL({
             executeSql: 'describe ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreate = await this.curdMixService.executeSQL({
             executeSql: 'show create table ' + tableName,
             sqlDatabase: dbName,
-            sqlDdType: keys_1.SqlDbType.mysql,
+            sqlDbType: keys_1.SqlDbType.mysql,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
         });
         const tableCreateStr = tableCreate[0]['Create Table'];
@@ -131,17 +133,14 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableListOfSqlserver(dbName) {
         const dbConfig = this.sqlserver2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
         const dbType = keys_1.SqlDbType.sqlserver;
-        const sql = "" +
-            "SELECT name as tablename \n" +
-            "FROM sys.tables" +
-            "";
+        const sql = 'SELECT name as tablename FROM sys.tables';
         const arr = await this.curdMixService.executeSQL({
             executeSql: sql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -150,8 +149,9 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
             return {
                 value: tableName,
                 label: tableName,
-                dbName, dbType,
-                tableName
+                dbName,
+                dbType,
+                tableName,
             };
         });
         return common_dto_1.CommonResult.successRes(tableNames);
@@ -159,70 +159,73 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableListOfPostgreSQL(dbName) {
         const dbConfig = this.postgres2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const schemaname = "public";
-        const sql = "" +
-            "SELECT tablename\n" +
-            "FROM pg_tables\n" +
-            `WHERE schemaname = '${schemaname}' \n` +
-            "ORDER BY tablename;";
         const dbType = keys_1.SqlDbType.postgres;
-        const arr = await this.curdMixService.executeSQL({
-            executeSql: sql,
-            sqlDatabase: dbName,
-            sqlDdType: dbType,
-            crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
-            executeSqlArgs: [],
-        });
-        const tableNames = arr.map(v => {
-            const tableName = v.tablename;
-            return {
-                value: tableName,
-                label: tableName,
-                dbName, dbType,
-                tableName
-            };
-        });
-        return common_dto_1.CommonResult.successRes(tableNames);
+        const schemaname = 'public';
+        const tableListSql = '' + 'SELECT tablename\n' + 'FROM pg_tables\n' + `WHERE schemaname = '${schemaname}' \n` + 'ORDER BY tablename;';
+        const viewListSql = '' + 'SELECT viewname as tablename\n' + 'FROM pg_views\n' + `WHERE schemaname = '${schemaname}' \n` + 'ORDER BY viewname;';
+        const toSelectOptions = async (executeSql, tableType) => {
+            const arr = await this.curdMixService.executeSQL({
+                executeSql: executeSql,
+                sqlDatabase: dbName,
+                sqlDbType: dbType,
+                crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
+                executeSqlArgs: [],
+            });
+            return arr.map(v => {
+                const tableName = v.tablename;
+                return {
+                    value: tableName,
+                    label: tableName,
+                    dbName,
+                    dbType,
+                    tableName,
+                    tableType,
+                };
+            });
+        };
+        const tableNames = await toSelectOptions(tableListSql, 'table');
+        const viewNames = await toSelectOptions(viewListSql, 'view');
+        const tableNameMerge = [...tableNames, ...viewNames];
+        return common_dto_1.CommonResult.successRes(tableNameMerge);
     }
     async getTableFieldsOfSqlServer(dbName, tableName) {
         const dbConfig = this.sqlserver2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const columnArraySql = "" +
-            "\n" +
-            "SELECT\n" +
-            "    c.name AS column_name,\n" +
-            "    t.name AS data_type,\n" +
-            "    c.max_length AS max_length,\n" +
-            "    c.precision,\n" +
-            "    c.scale,\n" +
-            "    c.is_nullable,\n" +
-            "    c.is_identity,\n" +
-            "    dc.definition AS column_default,  \n" +
-            "    ep.value AS column_description  \n" +
-            "FROM\n" +
-            "    sys.columns c\n" +
-            "        JOIN\n" +
-            "    sys.types t ON c.user_type_id = t.user_type_id\n" +
-            "        LEFT JOIN\n" +
-            "    sys.default_constraints dc\n" +
-            "    ON c.default_object_id = dc.object_id  \n" +
-            "        LEFT JOIN\n" +
-            "    sys.extended_properties ep\n" +
-            "    ON c.object_id = ep.major_id\n" +
-            "        AND c.column_id = ep.minor_id\n" +
-            "WHERE\n" +
+        const columnArraySql = '' +
+            'SELECT\n' +
+            '    c.name AS column_name,\n' +
+            '    t.name AS data_type,\n' +
+            '    c.max_length AS max_length,\n' +
+            '    c.precision,\n' +
+            '    c.scale,\n' +
+            '    c.is_nullable,\n' +
+            '    c.is_identity,\n' +
+            '    dc.definition AS column_default,  \n' +
+            '    ep.value AS column_description  \n' +
+            'FROM\n' +
+            '    sys.columns c\n' +
+            '        JOIN\n' +
+            '    sys.types t ON c.user_type_id = t.user_type_id\n' +
+            '        LEFT JOIN\n' +
+            '    sys.default_constraints dc\n' +
+            '    ON c.default_object_id = dc.object_id  \n' +
+            '        LEFT JOIN\n' +
+            '    sys.extended_properties ep\n' +
+            '    ON c.object_id = ep.major_id\n' +
+            '        AND c.column_id = ep.minor_id\n' +
+            'WHERE\n' +
             `    c.object_id = OBJECT_ID('${tableName}')  \n` +
-            " ORDER BY\n" +
-            "    c.column_id;";
+            ' ORDER BY\n' +
+            '    c.column_id;';
         const dbType = keys_1.SqlDbType.sqlserver;
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [],
         });
@@ -232,11 +235,11 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 fieldIndex: column_name || '',
                 fieldTitle: column_description || column_name || '',
                 isNullable: is_nullable,
-                defaultValue: column_default || "",
+                defaultValue: column_default || '',
                 extra: others,
                 // key: column_name, // 索引
                 type: data_type,
-                is_identity: is_identity
+                is_identity: is_identity,
             };
         });
         return common_dto_1.CommonResult.successRes({
@@ -248,23 +251,23 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
     async getTableFieldsOfPostgreSQL(dbName, tableName) {
         const dbConfig = this.postgres2Config[dbName];
         if (!dbConfig) {
-            throw new exceptions_1.CommonException("DB_NOT_FOUND", "数据库配置没有找到：" + dbName);
+            throw new exceptions_1.CommonException('DB_NOT_FOUND', '数据库配置没有找到：' + dbName);
         }
-        const schemaname = "public";
-        const columnArraySql = `
-
-    SELECT
-      *
-      FROM information_schema.columns
-      WHERE table_schema = $1 and table_name = $2
-      ORDER BY ordinal_position;
-
-`.trim();
+        const schemaname = 'public';
+        const columnArraySql = `
+
+    SELECT
+      *
+      FROM information_schema.columns
+      WHERE table_schema = $1 and table_name = $2
+      ORDER BY ordinal_position;
+
+    `.trim();
         const dbType = keys_1.SqlDbType.postgres;
         const columnArray = await this.curdMixService.executeSQL({
             executeSql: columnArraySql,
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             crudType: keys_1.KeyOfCrudTypes.SYS_QUERY,
             executeSqlArgs: [schemaname, tableName],
         });
@@ -274,11 +277,11 @@ let CrudStandardDesignApi = class CrudStandardDesignApi extends BaseApiControlle
                 fieldIndex: column_name || '',
                 fieldTitle: column_name || '',
                 isNullable: is_nullable,
-                defaultValue: column_default || "",
+                defaultValue: column_default || '',
                 extra: others,
                 // key: column_name, // 索引
                 type: data_type,
-                is_identity: is_identity
+                is_identity: is_identity,
             };
         });
         return {

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

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

package/dist/controller/manage/DataDictManageApi.js

@@ -32,7 +32,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
     async updateDataDict() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
             },
         });
     }

package/dist/controller/manage/DeployManageApi.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 DeployManageApi extends BaseApiController {
     protected ctx: Context;
     private fileCenterService;

package/dist/controller/manage/DeployManageApi.js

@@ -24,47 +24,50 @@ const FileCenterService_1 = require("../../service/FileCenterService");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
+const global_config_1 = require("../../libs/global-config/global-config");
 function toAssetsSchema(fileList) {
     for (let i = 0; i < fileList.length; i++) {
         const fileListElement = fileList[i];
-        fileListElement.settingKey = "assets" + i;
+        fileListElement.settingKey = 'assets' + i;
     }
     return {
-        "schema": [{
-                "title": "资源配置",
-                "name": "fileList",
-                "type": "array",
-                "properties": {
-                    "fileUrl": { "label": "文件URL", "component": "Input", "xProps": { "hasClear": true }, "width": 500 },
-                    "fileType": {
-                        "label": "文件类型",
-                        "component": "Select",
+        schema: [
+            {
+                title: '资源配置',
+                name: 'fileList',
+                type: 'array',
+                properties: {
+                    fileUrl: { label: '文件URL', component: 'Input', xProps: { hasClear: true }, width: 500 },
+                    fileType: {
+                        label: '文件类型',
+                        component: 'Select',
                         enums: [
                             { label: 'js', value: 'js' },
                             { label: 'css', value: 'css' },
                         ],
-                        "xProps": {
-                            "hasClear": true
+                        xProps: {
+                            hasClear: true,
                         },
-                        width: 500
+                        width: 500,
                     },
-                    "isModule": {
-                        "label": "isModule",
-                        "component": "Select",
+                    isModule: {
+                        label: 'isModule',
+                        component: 'Select',
                         enums: [
                             { label: 'true', value: true },
                             { label: 'false', value: false },
                         ],
-                        "xProps": {
-                            "hasClear": true
+                        xProps: {
+                            hasClear: true,
                         },
-                        width: 500
+                        width: 500,
                     },
-                }
-            }],
-        "data": {
-            "fileList": fileList
-        }
+                },
+            },
+        ],
+        data: {
+            fileList: fileList,
+        },
     };
 }
 let DeployManageApi = class DeployManageApi extends BaseApiController_1.BaseApiController {
@@ -109,31 +112,32 @@ let DeployManageApi = class DeployManageApi extends BaseApiController_1.BaseApiC
         if (!Array.isArray(cdnResources) || cdnResources.length === 0) {
             throw new devops_1.BizException('cdnResources参数不存在');
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const workbench = await this.curdMixService.executeCrudByCfg({
             data: {
                 package_assets: JSON.stringify(toAssetsSchema(cdnResources)),
             },
             condition: {
-                package_name: params.packageName
-            }
+                package_name: params.packageName,
+            },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_workbench,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
         });
         const app = await this.curdMixService.executeCrudByCfg({
             data: {
                 package_assets: JSON.stringify(toAssetsSchema(cdnResources)),
             },
             condition: {
-                package_name: params.packageName
-            }
+                package_name: params.packageName,
+            },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_app,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
         });
         this.workbenchService.clearCache();
         const workbenchAffected = workbench.getResModelItem('affected') || {};

package/dist/controller/manage/DocLibManageApi.js

@@ -45,7 +45,7 @@ let DocLibManageApi = class DocLibManageApi extends BaseApiController_1.BaseApiC
     async updateDocLib() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_doc_lib, 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.title': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
             updateCfg: {
@@ -56,7 +56,7 @@ let DocLibManageApi = class DocLibManageApi extends BaseApiController_1.BaseApiC
     async deleteDocLib() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_doc_lib, 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/DocManageApi.js

@@ -71,7 +71,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         const updateCfg = isPublish ? publishUpdateCfg : {};
         return this.executeSysSimpleSQL('sys_doc', 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],
             },
             updateCfg: {
                 ...updateCfg,
@@ -82,7 +82,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
     async deleteDoc() {
         return this.executeSysSimpleSQL('sys_doc', 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/FileManageApi.js

@@ -30,7 +30,7 @@ let FileMangeApi = class FileMangeApi extends BaseApiController_1.BaseApiControl
     async updateFile() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_file, 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],
             },
         });
     }

package/dist/controller/manage/LowCodeTplManageApi.js

@@ -34,14 +34,14 @@ let LowCodeTplManageApi = class LowCodeTplManageApi extends BaseApiController_1.
     async updateLowCodeTpl() {
         return this.executeSysSimpleSQL(tableName, 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],
             },
         });
     }
     async deleteLowCodeTpl() {
         return this.executeSysSimpleSQL(tableName, 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/MenuManageApi.js

@@ -39,7 +39,7 @@ let MenuManageApi = class MenuManageApi extends BaseApiController_1.BaseApiContr
     async updateMenu() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_menus, 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],
             },
             updateCfg: {},
         });
@@ -47,7 +47,7 @@ let MenuManageApi = class MenuManageApi extends BaseApiController_1.BaseApiContr
     async deleteMenu() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_menus, 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: {},
         });

package/dist/controller/manage/ProxyApiMangeApi.js

@@ -35,14 +35,14 @@ let ProxyApiMangeApi = class ProxyApiMangeApi extends BaseApiController_1.BaseAp
     async updateProxyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, 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],
             },
         });
     }
     async deleteProxyApi() {
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_proxyapi, 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/SuperAdminManageApi.d.ts

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

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>;