midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.71

package/src/controller/myinfo/MyInfoController.ts

@@ -1,32 +1,32 @@
-import * as _ from 'lodash';
-import { Controller, Inject, Post } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { BaseApiController } from '../base/BaseApiController';
-import { CommonResult } from '../../libs/utils/common-dto';
-import { SystemTables } from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { checkLogin } from '../../middleware/permission.middleware';
-
-/**
- * 用户个人数据查询
- */
-@Controller('/ns/api/myinfo', { middleware: [checkLogin()] })
-export class MyInfoController extends BaseApiController {
-  @Inject()
-  protected ctx: Context;
-
-  /**
-   * 我的角色列表：getMyRoleList
-   */
-  @Post('/getMyRoleList')
-  async getMyRoleList() {
-    // eslint-disable-next-line prefer-const
-    const body = this.ctx.request.body as any;
-    const roleCodes = this.ctx.userSession.getSessionInfo().roleCodes;
-    if (!roleCodes || !roleCodes.length) {
-      return CommonResult.successRes([]);
-    }
-    _.set(body, 'condition.role_code', { $in: roleCodes });
-    return this.executeSysSimpleSQL(SystemTables.sys_perm_role, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
-  }
-}
+import * as _ from 'lodash';
+import { Controller, Inject, Post } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+import { CommonResult } from '@/libs/utils/common-dto';
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { checkLogin } from '@/middleware/permission.middleware';
+
+/**
+ * 用户个人数据查询
+ */
+@Controller('/ns/api/myinfo', { middleware: [checkLogin()] })
+export class MyInfoController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  /**
+   * 我的角色列表：getMyRoleList
+   */
+  @Post('/getMyRoleList')
+  async getMyRoleList() {
+    // eslint-disable-next-line prefer-const
+    const body = this.ctx.request.body as any;
+    const roleCodes = this.ctx.userSession.getSessionInfo().roleCodes;
+    if (!roleCodes || !roleCodes.length) {
+      return CommonResult.successRes([]);
+    }
+    _.set(body, 'condition.role_code', { $in: roleCodes });
+    return this.executeSysSimpleSQL(SystemTables.sys_perm_role, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+  }
+}

package/src/controller/render/AppRenderController.ts

@@ -1,79 +1,72 @@
-import { Inject, Controller, Get, Param } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-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 { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-
-/**
- * 渲染独立外部应用
- */
-@Controller('/ns/app')
-export class AppRenderController extends BaseApiController {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private workbenchService: WorkbenchService;
-
-  @Get('/:appPath+')
-  async home(@Param('appPath') appPath: string): Promise<string> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const appPathArr = appPath.split('/');
-    const appCode = appPathArr[0];
-
-    const res = await this.curdMixService.executeCrudByCfg(
-      { condition: { app_code: appCode } },
-      {
-        sqlTable: SystemTables.sys_app,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-
-    const { row: appInfo } = res.getResModel();
-    if (!appInfo) {
-      this.ctx.status = 404;
-      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
-    }
-
-    if (appInfo.status !== 1) {
-      this.ctx.status = 404;
-      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
-    }
-
-    const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
-    if (!isSupportWorkbench) {
-      this.ctx.status = 404;
-      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
-    }
-
-    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 privateAES.time_encrypt_utf8_base64("" + Date.now());
-
-    const utils = createRenderUtils({
-      ctx: this.ctx,
-      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;
-    }
-    return this.workbenchService.isSupportCurrentWorkbench(appInfo.workbench_code_array);
-  }
-}
+import { Inject, Controller, Get, Param } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { createRenderUtils } from '@/libs/utils/render-utils';
+import { privateAES } from '@/libs/utils/crypto-utils';
+import { SysAppService } from "@/service/SysAppService";
+
+/**
+ * 渲染独立外部应用
+ */
+@Controller('/ns/app')
+export class AppRenderController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private workbenchService: WorkbenchService;
+
+  @Inject()
+  private sysAppService: SysAppService
+
+  @Get('/:appPath+')
+  async home(@Param('appPath') appPath: string): Promise<string> {
+
+    const appPathArr = appPath.split('/');
+    const appCode = appPathArr[0];
+
+    const appInfo = await this.sysAppService.getSysAppOne(appCode);
+
+    if (!appInfo) {
+      this.ctx.status = 404;
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
+    }
+
+    if (appInfo.status !== 1) {
+      this.ctx.status = 404;
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
+    }
+
+    const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
+    if (!isSupportWorkbench) {
+      this.ctx.status = 404;
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
+    }
+
+    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 privateAES.time_encrypt_utf8_base64('' + Date.now());
+
+    const utils = createRenderUtils({
+      ctx: this.ctx,
+      appInfo,
+      workbenchInfo,
+      userInfo,
+      package_assets: appInfo.package_assets,
+      fatcmscsrftoken,
+    });
+
+    const query = this.ctx.query || {};
+    return this.ctx.renderString(html_content, { appInfo, workbenchInfo, userInfo, utils, query }, { viewEngine: 'ejs' });
+  }
+
+  private async isSupportCurrentWorkbench(appInfo: any): Promise<boolean> {
+    if (this.isLocalEnv()) {
+      return true;
+    }
+    return this.workbenchService.isSupportCurrentWorkbench(appInfo.workbench_code_array);
+  }
+}

package/src/controller/test.controller.ts

@@ -1,37 +1,37 @@
-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{
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  protected curdMixService: CurdMixService;
-
-  @Get('/testPgQuery')
-  async testPgQuery() {
-    const cfgModel: IRequestCfgModel = {
-      sqlTable: "test_table1",
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: "postgres_test1",
-      sqlDdType: SqlDbType.postgres,
-      updateCfg: {},
-    };
-
-    return this.curdMixService.executeCrudByCfg({
-      condition: {
-        int4: "222"
-      }
-    },cfgModel)
-
-  }
-
-}
+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 {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  protected curdMixService: CurdMixService;
+
+  @Get('/testPgQuery')
+  async testPgQuery() {
+    const cfgModel: IRequestCfgModel = {
+      sqlTable: 'test_table1',
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+      sqlDatabase: 'postgres_test1',
+      sqlDbType: SqlDbType.postgres,
+      updateCfg: {},
+    };
+
+    return this.curdMixService.executeCrudByCfg(
+      {
+        condition: {
+          int4: '222',
+        },
+      },
+      cfgModel
+    );
+  }
+}

package/src/filter/default.filter.ts

@@ -1,13 +1,13 @@
-import { Catch } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-
-@Catch()
-export class DefaultErrorFilter {
-  async catch(err: Error, ctx: Context) {
-    // 所有的未分类错误会到这里
-    return {
-      success: false,
-      message: err.message,
-    };
-  }
-}
+import { Catch } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+
+@Catch()
+export class DefaultErrorFilter {
+  async catch(err: Error, ctx: Context) {
+    // 所有的未分类错误会到这里
+    return {
+      success: false,
+      message: err.message,
+    };
+  }
+}

package/src/filter/notfound.filter.ts

@@ -1,10 +1,10 @@
-import { Catch, httpError, MidwayHttpError } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-
-@Catch(httpError.NotFoundError)
-export class NotFoundFilter {
-  async catch(err: MidwayHttpError, ctx: Context) {
-    // 404 错误会到这里
-    ctx.redirect('/404.html');
-  }
-}
+import { Catch, httpError, MidwayHttpError } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+
+@Catch(httpError.NotFoundError)
+export class NotFoundFilter {
+  async catch(err: MidwayHttpError, ctx: Context) {
+    // 404 错误会到这里
+    ctx.redirect('/404.html');
+  }
+}

package/src/index.ts

@@ -1,99 +1,108 @@
-export { ContainerLifeCycle as Configuration } from './configuration';
-export * from './controller/base/BaseApiController';
-export * from './controller/gateway/AnyApiGatewayController';
-export * from './controller/gateway/CrudMtdGatewayController';
-export * from './controller/gateway/CrudStdGatewayController';
-export * from './controller/gateway/DocGatewayController';
-export * from './controller/gateway/FileController';
-export * from './controller/gateway/ProxyApiGatewayController';
-export * from './controller/gateway/PublicApiController';
-export * from './controller/gateway/StaticController';
-export * from './controller/helpers.controller';
-export * from './controller/home.controller';
-export * from './controller/manage/AnyApiMangeApi';
-export * from './controller/manage/AppLogMangeApi';
-export * from './controller/manage/AppMangeApi';
-export * from './controller/manage/AppPageMangeApi';
-export * from './controller/manage/AppSchemaHistoryApi';
-export * from './controller/manage/CrudMethodsMangeApi';
-export * from './controller/manage/CrudStandardDesignApi';
-export * from './controller/manage/DataDictManageApi';
-export * from './controller/manage/DeployManageApi';
-export * from './controller/manage/DocLibManageApi';
-export * from './controller/manage/DocManageApi';
-export * from './controller/manage/FileManageApi';
-export * from './controller/manage/LowCodeTplManageApi';
-export * from './controller/manage/MenuManageApi';
-export * from './controller/manage/ProxyApiMangeApi';
-export * from './controller/manage/SuperAdminManageApi';
-export * from './controller/manage/SysConfigMangeApi';
-export * from './controller/manage/SystemInfoManageApi';
-export * from './controller/manage/UserAccountManageApi';
-export * from './controller/manage/WorkbenchMangeApi';
-export * from './controller/myinfo/AuthController';
-export * from './controller/myinfo/MyInfoController';
-export * from './controller/render/AppRenderController';
-export * from './controller/test.controller';
-export * from './filter/default.filter';
-export * from './filter/notfound.filter';
-export * from './middleware/forbidden.middleware';
-export * from './middleware/global.middleware';
-export * from './middleware/tx.middleware';
-export * from './middleware/permission.middleware';
-export * from './service/AuthService';
-export * from './service/EnumInfoService';
-export * from './service/FileCenterService';
-export * from './service/SysConfigService';
-export * from './service/UserAccountService';
-export * from './service/UserSessionService';
-export * from './service/VisitStatService';
-export * from './service/WorkbenchService';
-export * from './service/anyapi/AnyApiSandboxService';
-export * from './service/anyapi/AnyApiService';
-export * from './service/base/ApiBaseService';
-export * from './service/base/BaseService';
-export * from './service/base/RedisCacheService';
-export * from './service/crudstd/CrudStdActionService';
-export * from './service/crudstd/CrudStdRelationService';
-export * from './service/crudstd/CrudStdService';
-export * from './service/curd/CurdMixByAccountService';
-export * from './service/curd/CurdMixByDictService';
-export * from './service/curd/CurdMixByLinkToCustomService';
-export * from './service/curd/CurdMixBySysConfigService';
-export * from './service/curd/CurdMixByWorkbenchService';
-export * from './service/curd/CurdMixService';
-export * from './service/curd/CurdProService';
-export * from './service/proxyapi/ProxyApiLoadService';
-export * from './service/proxyapi/ProxyApiService';
-export * from './models/userSession';
-export * from './models/bizmodels';
-export * from './models/SystemEntities';
-export * from './models/SystemPerm';
-export * from './models/contextLogger';
-export * from './models/devops';
-export * from './models/SystemTables';
-
-
-export * from './libs/utils/common-dto';
-export * from './libs/utils/crypto-utils';
-export * from './libs/utils/fatcms-request';
-export * from './libs/utils/functions';
-export * from './libs/utils/ordernum-utils';
-export * from './libs/utils/parseConfig';
-
-export * from './libs/crud-pro/CrudPro';
-export * from './libs/crud-pro/defaultConfigs';
-export * from './libs/crud-pro/exceptions';
-export * from './libs/crud-pro/interfaces';
-
-export * from './libs/crud-pro/models/ExecuteContext';
-export * from './libs/crud-pro/models/FuncContext';
-export * from './libs/crud-pro/models/RequestModel';
-export * from './libs/crud-pro/models/SqlCfgModel';
-export * from './libs/crud-pro/models/Transaction';
-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/global-config/global-config';
+export { ContainerLifeCycle as Configuration } from './configuration';
+export * from './controller/base/BaseApiController';
+export * from './controller/gateway/AnyApiGatewayController';
+export * from './controller/gateway/CrudMtdGatewayController';
+export * from './controller/gateway/CrudStdGatewayController';
+export * from './controller/gateway/DocGatewayController';
+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';
+export * from './controller/manage/AppLogMangeApi';
+export * from './controller/manage/AppMangeApi';
+export * from './controller/manage/AppPageMangeApi';
+export * from './controller/manage/AppSchemaHistoryApi';
+export * from './controller/manage/CrudMethodsMangeApi';
+export * from './controller/manage/CrudStandardDesignApi';
+export * from './controller/manage/DataDictManageApi';
+export * from './controller/manage/DeployManageApi';
+export * from './controller/manage/DocLibManageApi';
+export * from './controller/manage/DocManageApi';
+export * from './controller/manage/FileManageApi';
+export * from './controller/manage/LowCodeTplManageApi';
+export * from './controller/manage/MenuManageApi';
+export * from './controller/manage/ProxyApiMangeApi';
+export * from './controller/manage/SuperAdminManageApi';
+export * from './controller/manage/SysConfigMangeApi';
+export * from './controller/manage/SystemInfoManageApi';
+export * from './controller/manage/UserAccountManageApi';
+export * from './controller/manage/WorkbenchMangeApi';
+export * from './controller/myinfo/AuthController';
+export * from './controller/myinfo/MyInfoController';
+export * from './controller/render/AppRenderController';
+export * from './controller/test.controller';
+export * from './filter/default.filter';
+export * from './filter/notfound.filter';
+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';
+export * from './service/SysConfigService';
+export * from './service/SysAppService';
+export * from './service/UserAccountService';
+export * from './service/UserSessionService';
+export * from './service/VisitStatService';
+export * from './service/WorkbenchService';
+export * from './service/anyapi/AnyApiSandboxService';
+export * from './service/anyapi/AnyApiService';
+export * from './service/base/ApiBaseService';
+export * from './service/base/BaseService';
+export * from './service/base/cache/CacheServiceFactory';
+export * from './service/crudstd/CrudStdActionService';
+export * from './service/crudstd/CrudStdRelationService';
+export * from './service/crudstd/CrudStdService';
+export * from './service/curd/CurdMixByAccountService';
+export * from './service/curd/CurdMixByDictService';
+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';
+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';
+export * from './libs/utils/functions';
+export * from './libs/utils/ordernum-utils';
+export * from './libs/utils/parseConfig';
+
+export * from './libs/crud-pro/CrudPro';
+export * from './libs/crud-pro/defaultConfigs';
+export * from './libs/crud-pro/exceptions';
+export * from './libs/crud-pro/interfaces';
+
+export * from './libs/crud-pro/models/ExecuteContext';
+export * from './libs/crud-pro/models/FuncContext';
+export * from './libs/crud-pro/models/RequestModel';
+export * from './libs/crud-pro/models/SqlCfgModel';
+export * from './libs/crud-pro/models/Transaction';
+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/src/interface.ts

@@ -1,31 +1,33 @@
-import '@midwayjs/core';
-import { Transaction } from './libs/crud-pro/models/Transaction';
-import { UserSessionInfo } from './models/userSession';
-import { ContextLogger } from './models/contextLogger';
-import { IWorkbenchEntity } from './models/SystemEntities';
-
-declare module '@midwayjs/core' {
-  interface Context {
-    transaction: Transaction;
-    userSession: UserSessionInfo;
-    workbenchInfo: IWorkbenchEntity;
-    contextLogger: ContextLogger;
-  }
-}
-
-export interface ICacheService {
-  get: (key: string) => Promise<any>;
-  save: (key: string, value: any) => Promise<any>;
-  del: (key: string) => Promise<any>;
-  init: () => Promise<any>;
-}
-
-export interface IGetCacheParams {
-  namespace: string;
-  dirname: string;
-  keepMs?: number;
-}
-
-export interface IScheduleService {
-  runBySchedule: () => Promise<any>;
-}
+import '@midwayjs/core';
+import { Transaction } from './libs/crud-pro/models/Transaction';
+import { UserSessionInfo } from './models/userSession';
+import { ContextLogger } from './models/contextLogger';
+import { IWorkbenchEntity } from './models/SystemEntities';
+import { WorkbenchInfoTools } from './models/WorkbenchInfoTools';
+
+declare module '@midwayjs/core' {
+  interface Context {
+    transaction: Transaction;
+    userSession: UserSessionInfo;
+    workbenchInfo: IWorkbenchEntity;
+    workbenchInfoTools: WorkbenchInfoTools;
+    contextLogger: ContextLogger;
+  }
+}
+
+export interface ICacheService {
+  get: (key: string) => Promise<any>;
+  save: (key: string, value: any) => Promise<any>;
+  del: (key: string) => Promise<any>;
+  init: () => Promise<any>;
+}
+
+export interface IGetCacheParams {
+  namespace: string;
+  dirname: string;
+  keepMs?: number;
+}
+
+export interface IScheduleService {
+  runBySchedule: () => Promise<any>;
+}