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

package/src/controller/manage/SuperAdminManageApi.ts

@@ -1,12 +1,12 @@
 import { Controller, Inject, Post, Get } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { VisitStatService } from "../../service/VisitStatService";
+import { VisitStatService } from '../../service/VisitStatService';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
 import { checkRole } from '../../middleware/permission.middleware';
 import { SystemFuncCodeNameMap, SystemRoleCode, SystemRoleCodeNameMap } from '../../models/SystemPerm';
 import { SystemTables } from '../../models/SystemTables';
-import { CommonResult } from "../../libs/utils/common-dto";
+import { CommonResult } from '../../libs/utils/common-dto';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Controller('/ns/api/manage/superAdmin', { middleware: [checkRole(SystemRoleCode.SuperAdmin)] })
@@ -17,7 +17,6 @@ export class SuperAdminManageApi extends BaseApiController {
   @Inject()
   protected visitStatService: VisitStatService;
 
-
   /**
    * 预设系统内置功能点数据
    */
@@ -46,7 +45,6 @@ export class SuperAdminManageApi extends BaseApiController {
       );
     }
 
-
     return CommonResult.successRes();
   }
 
@@ -55,7 +53,6 @@ export class SuperAdminManageApi extends BaseApiController {
    */
   @Post('/presetsRoleCode')
   async presetsRoleCode() {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const roleCodeList = [SystemRoleCode.DevOpsViewer, SystemRoleCode.DevOpsWriter];
@@ -88,7 +85,6 @@ export class SuperAdminManageApi extends BaseApiController {
    */
   @Post('/presetsRoleFuncList')
   async presetsRoleFuncList() {
-
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const funcCodeList = Object.keys(SystemFuncCodeNameMap);
@@ -133,7 +129,6 @@ export class SuperAdminManageApi extends BaseApiController {
     return CommonResult.successRes();
   }
 
-
   /**
    * 将每天的访问数据，更新到数据库中
    */
@@ -141,7 +136,4 @@ export class SuperAdminManageApi extends BaseApiController {
   async flushVisitStatToDB() {
     return this.visitStatService.flushVisitStatToDB();
   }
-
-
-
 }

package/src/controller/manage/SysConfigMangeApi.ts

@@ -5,8 +5,8 @@ import { BaseApiController } from '../base/BaseApiController';
 import { checkPermission } from '../../middleware/permission.middleware';
 import { SystemFuncCode } from '../../models/SystemPerm';
 import { CTX_WORKBENCH_CODE } from '../../models/bizmodels';
-import {SystemTables} from "../../models/SystemTables";
-import {CommonResult} from "../../libs/utils/common-dto";
+import { SystemTables } from '../../models/SystemTables';
+import { CommonResult } from '../../libs/utils/common-dto';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Controller('/ns/api/manage/sysconfig', { middleware: [checkPermission(SystemFuncCode.SysConfigMangeRead)] })
@@ -49,30 +49,27 @@ export class SysConfigMangeApi extends BaseApiController {
 
   @Post('/updateSysConfig', { middleware: [checkPermission(SystemFuncCode.SysConfigMangeWrite)] })
   async updateSysConfig() {
-    
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const body = this.ctx.request.body as any;
     const id = body.condition.id;
     if (!id) {
-      return CommonResult.errorRes("id不能为空")
+      return CommonResult.errorRes('id不能为空');
     }
 
-    const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getOne({condition: body.condition}, SystemTables.sys_configs)
+    const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getOne({ condition: body.condition }, SystemTables.sys_configs);
     if (!sysConfig) {
-      return CommonResult.errorRes("配置项不存在")
+      return CommonResult.errorRes('配置项不存在');
     }
 
-    const {edit_auth_type, edit_auth_config} = sysConfig;
+    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 CommonResult.errorRes("编辑权限校验不通过：" + JSON.stringify({edit_auth_type, edit_auth_config}));
+        return CommonResult.errorRes('编辑权限校验不通过：' + JSON.stringify({ edit_auth_type, edit_auth_config }));
       }
     }
 
-
-
     return this.executeSysSimpleSQL('sys_configs', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'data.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING, 'length:1,64'],

package/src/controller/manage/SystemInfoManageApi.ts

@@ -2,9 +2,9 @@ import { Controller, Inject, Get } from '@midwayjs/core';
 import { InfoService } from '@midwayjs/info';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import {checkPermission} from '../../middleware/permission.middleware';
-import {SystemFuncCode} from '../../models/SystemPerm';
-import {CommonResult} from "../../libs/utils/common-dto";
+import { checkPermission } from '../../middleware/permission.middleware';
+import { SystemFuncCode } from '../../models/SystemPerm';
+import { CommonResult } from '../../libs/utils/common-dto';
 
 @Controller('/ns/api/manage/systemInfo', { middleware: [checkPermission(SystemFuncCode.SystemInfoManageApiRead)] })
 export class SystemInfoManageApi extends BaseApiController {
@@ -41,8 +41,13 @@ export class SystemInfoManageApi extends BaseApiController {
     const networkInfo = this.infoService.networkInfo();
 
     return CommonResult.successRes({
-      projectInfo,systemInfo,resourceOccupationInfo,softwareInfo,timeInfo,envInfo,networkInfo
-    })
+      projectInfo,
+      systemInfo,
+      resourceOccupationInfo,
+      softwareInfo,
+      timeInfo,
+      envInfo,
+      networkInfo,
+    });
   }
-
 }

package/src/controller/manage/UserAccountManageApi.ts

@@ -19,12 +19,12 @@ function checkAccountCreateBlacklist(value: string) {
   }
 }
 
-const LOGIN_NAME_VALIDATE =  [KeysOfValidators.STRING, KeysOfValidators.NAME, 'length:6,50', checkAccountCreateBlacklist]
+const LOGIN_NAME_VALIDATE = [KeysOfValidators.STRING, KeysOfValidators.NAME, 'length:6,50', checkAccountCreateBlacklist];
 
 @Controller('/ns/api/manage/userAccount', { middleware: [checkPermission(SystemFuncCode.UserAccountMangeRead)] })
 export class UserAccountManageApi extends BaseApiController {
   @Inject()
-  ctx: Context;
+  protected ctx: Context;
 
   @Post('/getUserAccountList')
   async getUserAccountList() {

package/src/controller/manage/WorkbenchMangeApi.ts

@@ -1,11 +1,11 @@
 import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
+import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
-import { checkPermission } from '../../middleware/permission.middleware';
-import { SystemFuncCode } from '../../models/SystemPerm';
-import { SystemTables } from '../../models/SystemTables';
-import { WorkbenchService } from '../../service/WorkbenchService';
+import { checkPermission } from '@/middleware/permission.middleware';
+import { SystemFuncCode } from '@/models/SystemPerm';
+import { SystemTables } from '@/models/SystemTables';
+import { WorkbenchService } from '@/service/WorkbenchService';
 
 @Controller('/ns/api/manage/workbench', { middleware: [checkPermission(SystemFuncCode.WorkbenchMangeRead)] })
 export class WorkbenchMangeApi extends BaseApiController {
@@ -33,7 +33,7 @@ export class WorkbenchMangeApi extends BaseApiController {
     const body = this.ctx.request.body as any;
     const dataObj: any = body.data || {};
 
-    dataObj.html_content = dataObj.html_content || "<html>hello</html>";
+    dataObj.html_content = dataObj.html_content || '<html>hello</html>';
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {

package/src/controller/myinfo/AuthController.ts

@@ -5,9 +5,9 @@ import { AuthService } from '../../service/AuthService';
 import { ISessionInfo, SESSION_ID_KEY, sessionCookieCfg } from '../../models/userSession';
 import { CommonResult } from '../../libs/utils/common-dto';
 import { checkLogin } from '../../middleware/permission.middleware';
-import { assertCsrfToken } from "../../libs/utils/fatcms-request";
-import { WorkbenchService } from "../../service/WorkbenchService";
-import { CommonException } from "../../libs/crud-pro/exceptions";
+import { assertCsrfToken } from '../../libs/utils/fatcms-request';
+import { WorkbenchService } from '../../service/WorkbenchService';
+import { CommonException } from '../../libs/crud-pro/exceptions';
 
 /**
  * 支持使用明文密码和Hash后密码登录。
@@ -22,7 +22,6 @@ export class AuthController extends BaseApiController {
   @Inject()
   private authService: AuthService;
 
-
   @Inject()
   private workbenchService: WorkbenchService;
 
@@ -53,7 +52,6 @@ export class AuthController extends BaseApiController {
       throw new CommonException('WORKBENCH_IS_NOT_FOUND', '站点未找到');
     }
 
-
     const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
 
     this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
@@ -72,7 +70,6 @@ export class AuthController extends BaseApiController {
     return CommonResult.successMsg('退出成功');
   }
 
-
   /**
    * 避免Session过期，前端需要定时调用此接口刷新
    */
@@ -84,7 +81,6 @@ export class AuthController extends BaseApiController {
     return CommonResult.successRes(newSessionInfo);
   }
 
-
   /**
    * 修改我自己的密码
    */
@@ -94,7 +90,7 @@ export class AuthController extends BaseApiController {
     const loginName = this.ctx.userSession.getSessionInfo().loginName;
 
     if (loginName === 'devopsviewer') {
-      return CommonResult.errorRes("开放体验账号不支持修改密码")
+      return CommonResult.errorRes('开放体验账号不支持修改密码');
     }
 
     return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);

package/src/controller/render/AppRenderController.ts

@@ -4,11 +4,10 @@ import { BaseApiController } from '../base/BaseApiController';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { SystemTables } from '../../models/SystemTables';
 import { WorkbenchService } from '../../service/WorkbenchService';
-import { createRenderUtils } from "../../libs/utils/render-utils";
-import { privateAES } from "../../libs/utils/crypto-utils";
+import { createRenderUtils } from '../../libs/utils/render-utils';
+import { privateAES } from '../../libs/utils/crypto-utils';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
-
 /**
  * 渲染独立外部应用
  */
@@ -58,18 +57,19 @@ export class AppRenderController extends BaseApiController {
 
     const html_content = appInfo.html_content || '<b style="color: red">错误：未配置HTML模版，请检查!!</b>';
     const userInfo = this.getUserSessionInfo();
-    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64("" + Date.now());
+    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64('' + Date.now());
 
     const utils = createRenderUtils({
       ctx: this.ctx,
-      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' });
   }
 
-
-
-
   private async isSupportCurrentWorkbench(appInfo: any): Promise<boolean> {
     if (this.isLocalEnv()) {
       return true;

package/src/controller/test.controller.ts

@@ -1,15 +1,14 @@
-import {Controller, Get, Inject} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {CurdMixService} from '../service/curd/CurdMixService';
-import {BaseApiController} from "./base/BaseApiController";
-import {IRequestCfgModel} from "../libs/crud-pro/interfaces";
-import {KeysOfSimpleSQL, SqlDbType} from "../libs/crud-pro/models/keys";
-
+import { Controller, Get, Inject } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { CurdMixService } from '../service/curd/CurdMixService';
+import { BaseApiController } from './base/BaseApiController';
+import { IRequestCfgModel } from '../libs/crud-pro/interfaces';
+import { KeysOfSimpleSQL, SqlDbType } from '../libs/crud-pro/models/keys';
 
 // http://127.0.0.1:7002/ns/api/test/testPgQuery
 
 @Controller('/ns/api/test')
-export class TestApiController extends BaseApiController{
+export class TestApiController extends BaseApiController {
   @Inject()
   protected ctx: Context;
 
@@ -19,19 +18,20 @@ export class TestApiController extends BaseApiController{
   @Get('/testPgQuery')
   async testPgQuery() {
     const cfgModel: IRequestCfgModel = {
-      sqlTable: "test_table1",
+      sqlTable: 'test_table1',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: "postgres_test1",
+      sqlDatabase: 'postgres_test1',
       sqlDbType: SqlDbType.postgres,
       updateCfg: {},
     };
 
-    return this.curdMixService.executeCrudByCfg({
-      condition: {
-        int4: "222"
-      }
-    },cfgModel)
-
+    return this.curdMixService.executeCrudByCfg(
+      {
+        condition: {
+          int4: '222',
+        },
+      },
+      cfgModel
+    );
   }
-
 }

package/src/index.ts

@@ -79,7 +79,6 @@ 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';

package/src/libs/crud-pro/CrudPro.ts

@@ -160,7 +160,6 @@ class CrudPro {
   private async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel) {
     return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
   }
-
 }
 
 export { CrudPro };

package/src/libs/crud-pro/interfaces.ts

@@ -1,6 +1,6 @@
 // import { Pool as MysqlPool } from 'mysql2/promise';
 // import { Pool as PostgresPool } from 'pg';
-import {KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType} from './models/keys';
+import { KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType } from './models/keys';
 
 export interface ICrudProCfg {
   sysDatabaseName?: string; // 默认系统数据库名称，默认 fatcms
@@ -183,8 +183,6 @@ export interface ILogger {
   warn(msg: any, ...args: any[]): void;
 }
 
-
-
 export interface IExecuteUnsafeQueryCtx {
   sqlTable: string;
   sqlDatabase: string;

package/src/libs/crud-pro/models/ExecuteContext.ts

@@ -7,8 +7,7 @@ import { Transaction } from './Transaction';
 import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
 import { defaultCrudProCfg } from '../defaultConfigs';
-import { ResModelFlexible } from "./ResModel";
-
+import { ResModelFlexible } from './ResModel';
 
 class ExecuteContext {
   // 运行前设置的
@@ -109,6 +108,4 @@ interface IExecuteContextHandler {
   handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
 }
 
-
-
 export { ExecuteContext, IExecuteContextHandler };

package/src/libs/crud-pro/models/ExecuteContextFunc.ts

@@ -1,4 +1,4 @@
-import {IConnectionPool, IRequestCfgModel, IRequestModel} from '../interfaces';
+import { IConnectionPool, IRequestCfgModel, IRequestModel } from '../interfaces';
 import { ExecuteContext } from './ExecuteContext';
 import { SqlCfgModel } from './SqlCfgModel';
 import { RequestCfgModel } from './RequestCfgModel';
@@ -77,7 +77,6 @@ export class BaseExecuteContextFunc implements IExecuteContextFunc {
     return null;
   }
 
-
   /**
    * 在执行之前可以根据业务需要修改需要执行的内容
    * @param reqJson

package/src/libs/crud-pro/models/RequestModel.ts

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { ILimitOffset, IOrderByItem, IRequestModel, IVisitor } from '../interfaces';
 import { MixinUtils } from '../utils/MixinUtils';
 import { CommonException, Exceptions } from '../exceptions';
-import {DEFAULT_LIMIT} from "../defaultConfigs";
+import { DEFAULT_LIMIT } from '../defaultConfigs';
 
 class RequestModel {
   visitor: IVisitor;

package/src/libs/crud-pro/models/ResModel.ts

@@ -1,24 +1,19 @@
-
 interface ResModelAffected {
   insertId?: string | number;
   affectedRows: number;
 }
 
 interface ResModelStandard {
-  row?: any,
-  rows?: any[],
-  total_count?: number,
-  affected?: ResModelAffected,
-  insert_affected?: ResModelAffected,
-  update_affected?: ResModelAffected,
+  row?: any;
+  rows?: any[];
+  total_count?: number;
+  affected?: ResModelAffected;
+  insert_affected?: ResModelAffected;
+  update_affected?: ResModelAffected;
 }
 
 type ResModelFlexible = ResModelStandard & {
   [key: string]: any;
 };
 
-export {
-  ResModelAffected,
-  ResModelStandard,
-  ResModelFlexible
-}
+export { ResModelAffected, ResModelStandard, ResModelFlexible };

package/src/libs/crud-pro/models/SqlCfgModel.ts

@@ -1,6 +1,6 @@
 import { ColumnRelation, IFuncCfgModel, ISqlCfgModel } from '../interfaces';
 import { MixinUtils } from '../utils/MixinUtils';
-import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType} from './keys';
+import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType } from './keys';
 import { parseJsonObject } from '../../utils/functions';
 
 const { isEmpty } = MixinUtils;

package/src/libs/crud-pro/models/Transaction.ts

@@ -1,14 +1,13 @@
-import {IConnectionPool, IPoolConnectionClient} from '../interfaces';
-import {SqlDbType} from "./keys";
-import {TransactionMySQL} from "./TransactionMySQL";
-import {TransactionPostgres} from "./TransactionPostgres";
-import {TransactionSqlServer} from "./TransactionSqlServer";
+import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
+import { SqlDbType } from './keys';
+import { TransactionMySQL } from './TransactionMySQL';
+import { TransactionPostgres } from './TransactionPostgres';
+import { TransactionSqlServer } from './TransactionSqlServer';
 
 class Transaction {
-
-  private transactionMySQL : TransactionMySQL = new TransactionMySQL();
-  private transactionPostgres : TransactionPostgres  = new TransactionPostgres();
-  private transactionSqlServer : TransactionSqlServer  = new TransactionSqlServer();
+  private transactionMySQL: TransactionMySQL = new TransactionMySQL();
+  private transactionPostgres: TransactionPostgres = new TransactionPostgres();
+  private transactionSqlServer: TransactionSqlServer = new TransactionSqlServer();
 
   private getTxObj(pool: IConnectionPool): TransactionMySQL | TransactionPostgres | TransactionSqlServer {
     if (pool.dbType === SqlDbType.postgres) {

package/src/libs/crud-pro/models/TransactionPostgres.ts

@@ -9,7 +9,7 @@ async function commit(connection: PoolClient) {
   return await connection.query('COMMIT');
 }
 
-async function rollback(connection:PoolClient ) {
+async function rollback(connection: PoolClient) {
   return await connection.query('ROLLBACK');
 }
 

package/src/libs/crud-pro/models/TransactionSqlServer.ts

@@ -1,13 +1,10 @@
 import { ConnectionPool, Request, Transaction } from 'mssql';
 import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
 
-
 interface ISqlServerConnection extends IPoolConnectionClient {
-  originConnection: ConnectionPool
+  originConnection: ConnectionPool;
 }
 
-
-
 class TransactionSqlServer {
   private isBeginTransaction = false;
   private connectionMap: Record<string, ISqlServerConnection> = {};
@@ -31,23 +28,23 @@ class TransactionSqlServer {
     return connection;
   }
 
-  private async connectAndCreateConnection(pool: IConnectionPool) : Promise<ISqlServerConnection> {
+  private async connectAndCreateConnection(pool: IConnectionPool): Promise<ISqlServerConnection> {
     const poolInstance: ConnectionPool = pool.poolInstance as any;
     const originConnection = await poolInstance.connect();
     return {
       originConnection,
-      query: (sql:string, values: any) : Promise<any> =>{
+      query: (sql: string, values: any): Promise<any> => {
         const request = new Request(originConnection);
         if (Array.isArray(values)) {
           for (let i = 0; i < values.length; i++) {
-            const index = i+1;
+            const index = i + 1;
             const value = values[i];
             request.input(`fatcms_ms${index}`, value);
           }
         }
         return request.query(sql);
-      }
-    }
+      },
+    };
   }
 
   /**
@@ -93,15 +90,13 @@ class TransactionSqlServer {
     this.transactionMap = {};
   }
 
-
   private async beginTransaction(poolName: string) {
     const connection = this.connectionMap[poolName];
     const originConnection: ConnectionPool = connection.originConnection;
-    const tmpTx =  new Transaction(originConnection);
+    const tmpTx = new Transaction(originConnection);
     this.transactionMap[poolName] = tmpTx;
-    return await tmpTx.begin()
+    return await tmpTx.begin();
   }
-
 }
 
 export { TransactionSqlServer };

package/src/libs/crud-pro/services/CrudProCachedCfgService.ts

@@ -63,15 +63,13 @@ class CrudProCachedCfgService extends CrudProServiceBase {
     return null;
   }
 
-
-
   private async loadMethodInfoList(): Promise<any[]> {
     const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
     const sql = `select * from ${methodsTableName}`; // 全部加载到内存
     const baseInfo = {
       sqlTable: methodsTableName,
       sqlDatabase: sysDatabaseName,
-      sqlDbType: sysDatabaseDbType
+      sqlDbType: sysDatabaseDbType,
     };
     const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
     const rows2: any[] = rows as object[];