midway-fatcms 0.0.13 → 0.0.15

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

@@ -5,6 +5,7 @@ import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { UserAccountService } from '../../service/UserAccountService';
 import { BaseService } from '../../service/base/BaseService';
 import { ConfigChangelogService } from '../../service/ConfigChangelogService';
+import { ActionLogService } from '../../service/ActionLogService';
 export interface IExecuteSimpleSqlParams {
     updateCfg?: Record<string, IFuncCfgModel>;
     allowCfg?: Record<string, string[]>;
@@ -28,6 +29,7 @@ export declare class BaseApiController extends BaseService {
     protected ctx: Context;
     protected curdMixService: CurdMixService;
     protected userAccountService: UserAccountService;
+    protected actionLogService: ActionLogService;
     protected configChangelogService: ConfigChangelogService;
     /**
      * 检查用户是否在指定时间内重复执行了某个操作

package/dist/controller/base/BaseApiController.js

@@ -24,6 +24,7 @@ const aes_128_cbc_1 = require("aes-128-cbc");
 const md5 = require("md5");
 const AsymmetricCrypto_1 = require("../../libs/utils/AsymmetricCrypto");
 const ConfigChangelogService_1 = require("../../service/ConfigChangelogService");
+const ActionLogService_1 = require("../../service/ActionLogService");
 let BaseApiController = class BaseApiController extends BaseService_1.BaseService {
     /**
      * 检查用户是否在指定时间内重复执行了某个操作
@@ -310,6 +311,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", UserAccountService_1.UserAccountService)
 ], BaseApiController.prototype, "userAccountService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", ActionLogService_1.ActionLogService)
+], BaseApiController.prototype, "actionLogService", void 0);
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", ConfigChangelogService_1.ConfigChangelogService)

package/dist/controller/helpers.controller.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
 import { Context } from '@midwayjs/koa';
 import { CommonResult } from '../libs/utils/common-dto';
+import { ActionLogService } from '../service/ActionLogService';
 export declare class HelpersApi {
     protected ctx: Context;
     private midwayWebRouterService;
+    protected actionLogService: ActionLogService;
     getApiEnv(): Promise<{
         env: string;
         href: string;

package/dist/controller/helpers.controller.js

@@ -24,6 +24,7 @@ const SystemPerm_1 = require("../models/SystemPerm");
 const permission_middleware_1 = require("../middleware/permission.middleware");
 const CacheRefreshRedisSubscriber_1 = require("../service/base/cache-refresh/CacheRefreshRedisSubscriber");
 const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
+const ActionLogService_1 = require("../service/ActionLogService");
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript?prefix=/ns/api/manage
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript
 // http://127.0.0.1:7002/ns/api/helpers/getApiEnv
@@ -141,6 +142,12 @@ let HelpersApi = class HelpersApi {
             const cacheName = cacheNameParam;
             const cacheServiceFactory = await this.ctx.requestContext.getAsync(CacheServiceFactory_1.CacheServiceFactory);
             await cacheServiceFactory.refreshByCacheName(cacheName, this.ctx);
+            await this.actionLogService.insertActionLogTable({
+                actionModule: '系统工具',
+                actionName: '刷新缓存',
+                actionMessage: '刷新缓存成功',
+                actionTarget: cacheNameParam
+            });
             return common_dto_1.CommonResult.successRes({
                 message: `业务缓存 ${cacheName} 已刷新`,
                 cacheName,
@@ -148,6 +155,12 @@ let HelpersApi = class HelpersApi {
         }
         const category = categoryParam ? categoryParam : undefined;
         await (0, CacheRefreshRedisSubscriber_1.refreshCacheWithBroadcast)(this.ctx, category);
+        await this.actionLogService.insertActionLogTable({
+            actionModule: '系统工具',
+            actionName: '刷新缓存',
+            actionMessage: '刷新缓存成功',
+            actionTarget: cacheNameParam
+        });
         return common_dto_1.CommonResult.successRes({
             message: `缓存已刷新${category ? '(' + category + ')' : '(全部)'}（已广播集群）`,
             category: category || 'ALL',
@@ -184,6 +197,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayWebRouterService)
 ], HelpersApi.prototype, "midwayWebRouterService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", ActionLogService_1.ActionLogService)
+], HelpersApi.prototype, "actionLogService", void 0);
 __decorate([
     (0, core_1.Get)('/getApiEnv'),
     __metadata("design:type", Function),

package/dist/controller/myinfo/AuthController.js

@@ -53,6 +53,12 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
         }
         const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
         this.ctx.cookies.set(userSession_1.SESSION_ID_KEY, userSessionInfo.sessionId, userSession_1.sessionCookieCfg);
+        await this.actionLogService.insertActionLogTable({
+            actionModule: '用户账号',
+            actionName: '登录',
+            actionMessage: '登录成功',
+            actionTarget: `${userSessionInfo === null || userSessionInfo === void 0 ? void 0 : userSessionInfo.nickName}(${userSessionInfo === null || userSessionInfo === void 0 ? void 0 : userSessionInfo.accountId})`
+        });
         return common_dto_1.CommonResult.successMsg('登录成功', removePrivateField(userSessionInfo));
     }
     /**
@@ -87,12 +93,22 @@ let AuthController = class AuthController extends BaseApiController_1.BaseApiCon
      * 修改我自己的密码
      */
     async changeMyPassword() {
+        var _a;
         const { unsaltedPwd } = this.ctx.request.body;
         const loginName = this.ctx.userSession.getSessionInfo().loginName;
         if (loginName === 'devopsviewer') {
             return common_dto_1.CommonResult.errorRes('开放体验账号不支持修改密码');
         }
-        return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+        const res = await this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+        if (res.success) {
+            await this.actionLogService.insertActionLogTable({
+                actionModule: '用户账号',
+                actionName: '修改密码',
+                actionMessage: '修改密码成功',
+                actionTarget: (_a = this.ctx.userSession.getSessionInfo()) === null || _a === void 0 ? void 0 : _a.nickName
+            });
+        }
+        return res;
     }
     /**
      * 校验权限接口，给前端用的。用于界面按钮级权限控制

package/dist/index.d.ts

@@ -12,7 +12,6 @@ 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';
@@ -48,6 +47,7 @@ export * from './middleware/tx.middleware';
 export * from './middleware/permission.middleware';
 export * from './middleware/redislock.middleware';
 export * from './service/AuthService';
+export * from './service/ActionLogService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';

package/dist/index.js

@@ -30,7 +30,6 @@ __exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
-__exportStar(require("./controller/manage/AppLogMangeApi"), exports);
 __exportStar(require("./controller/manage/AppMangeApi"), exports);
 __exportStar(require("./controller/manage/AppPageMangeApi"), exports);
 __exportStar(require("./controller/manage/AppSchemaHistoryApi"), exports);
@@ -66,6 +65,7 @@ __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/ActionLogService"), exports);
 __exportStar(require("./service/EnumInfoService"), exports);
 __exportStar(require("./service/FileCenterService"), exports);
 __exportStar(require("./service/SysConfigService"), exports);

package/dist/models/SystemTables.d.ts

@@ -22,5 +22,6 @@ export declare const SystemTables: {
     sys_visit_stats: string;
     sys_async_tasks: string;
     sys_config_changelog: string;
+    sys_action_log: string;
 };
 export declare const SystemDevOpsWorkbench = "devops";

package/dist/models/SystemTables.js

@@ -25,5 +25,6 @@ exports.SystemTables = {
     sys_visit_stats: 'sys_visit_stats',
     sys_async_tasks: 'sys_async_tasks',
     sys_config_changelog: 'sys_config_changelog',
+    sys_action_log: 'sys_action_log',
 };
 exports.SystemDevOpsWorkbench = 'devops';

package/dist/service/ActionLogService.d.ts

@@ -0,0 +1,14 @@
+import { BaseService } from "../service/base/BaseService";
+import { CrudWriteResult } from '../libs/crud-pro/models/CrudResult';
+export interface IActionLoginInfo {
+    actionModule: string;
+    actionName: string;
+    actionMessage: string;
+    actionTarget: string;
+    createdBy?: string;
+    modifiedBy?: string;
+}
+export declare class ActionLogService extends BaseService {
+    private curdMixService;
+    insertActionLogTable(logInfo: IActionLoginInfo): Promise<CrudWriteResult>;
+}

package/dist/service/ActionLogService.js

@@ -0,0 +1,50 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionLogService = void 0;
+const core_1 = require("@midwayjs/core");
+const CurdMixService_1 = require("./curd/CurdMixService");
+const SystemTables_1 = require("../models/SystemTables");
+const global_config_1 = require("../libs/global-config/global-config");
+const BaseService_1 = require("../service/base/BaseService");
+const DateTimeUtils_1 = require("../libs/crud-pro/utils/DateTimeUtils");
+let ActionLogService = class ActionLogService extends BaseService_1.BaseService {
+    async insertActionLogTable(logInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const actionTable = this.curdMixService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_action_log,
+        });
+        const sessionInfo = this.ctx.userSession.getSessionInfo();
+        return actionTable.insert({
+            data: {
+                action_module: logInfo.actionModule,
+                action_name: logInfo.actionName,
+                action_message: logInfo.actionMessage,
+                created_by: logInfo.createdBy || (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || '',
+                created_at: DateTimeUtils_1.DateTimeUtils.getCurrentTimeString(),
+                modified_at: DateTimeUtils_1.DateTimeUtils.getCurrentTimeString(),
+                modified_by: logInfo.modifiedBy || (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || '',
+                status: 1,
+                action_target: logInfo.actionTarget
+            }
+        });
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdMixService_1.CurdMixService)
+], ActionLogService.prototype, "curdMixService", void 0);
+ActionLogService = __decorate([
+    (0, core_1.Provide)()
+], ActionLogService);
+exports.ActionLogService = ActionLogService;

package/dist/service/crudstd/CrudStdService.d.ts

@@ -35,8 +35,7 @@ export declare class CrudStdService extends ApiBaseService {
     private handleResultDataPermissionBySettingKey;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      */
     getParsedCrudStdAppForSettingKey(stdAction: ICrudStdActionParams): Promise<ICrudStdAppInfoForSettingKey>;
     /**

package/dist/service/crudstd/CrudStdService.js

@@ -155,8 +155,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
     }
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      */
     async getParsedCrudStdAppForSettingKey(stdAction) {
         const { appCode, settingKey, buttonSettingKey } = stdAction || {};

package/dist/service/curd/CurdMixByDictService.js

@@ -59,6 +59,7 @@ let CurdMixByDictService = class CurdMixByDictService {
         let selectedRows = [];
         if (noCacheCodes.length > 0) {
             const res1 = await this.curdProService.executeCrudByCfg({
+                columns: ['dict_code', 'label', 'value', 'style', 'code'],
                 condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0, status: 1 },
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/base/BaseApiController.ts

@@ -15,6 +15,7 @@ import * as md5 from 'md5';
 import { AsymmetricCrypto } from '@/libs/utils/AsymmetricCrypto';
 import { IRequestCfgModel2 } from "@/models/bizmodels";
 import { ConfigChangelogService, isChangelogTable, ChangelogAction } from '@/service/ConfigChangelogService';
+import { ActionLogService } from '@/service/ActionLogService'
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;
@@ -49,7 +50,8 @@ export class BaseApiController extends BaseService {
   @Inject()
   protected userAccountService: UserAccountService;
 
-  
+  @Inject()
+  protected actionLogService: ActionLogService;
 
   @Inject()
   protected configChangelogService: ConfigChangelogService;

package/src/controller/helpers.controller.ts

@@ -6,12 +6,13 @@ import { CommonException, Exceptions } from '@/libs/crud-pro/exceptions';
 import { createUniqueId } from '@/libs/utils/functions';
 import { privateAES } from '@/libs/utils/crypto-utils';
 import { CommonResult } from '@/libs/utils/common-dto';
-import {SystemFuncCode, SystemRoleCode} from "@/models/SystemPerm";
+import { SystemFuncCode, SystemRoleCode } from "@/models/SystemPerm";
 import { checkPermission } from '@/middleware/permission.middleware';
 import { refreshCacheWithBroadcast } from '@/service/base/cache-refresh/CacheRefreshRedisSubscriber';
 import { CacheRefreshCategory } from '@/models/CacheRefreshCategory';
 import { CacheNameEnum } from '@/models/bizmodels';
 import { CacheServiceFactory } from '@/service/base/cache/CacheServiceFactory';
+import { ActionLogService } from '@/service/ActionLogService';
 
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript?prefix=/ns/api/manage
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript
@@ -26,6 +27,9 @@ export class HelpersApi {
   @Inject()
   private midwayWebRouterService: MidwayWebRouterService;
 
+  @Inject()
+  protected actionLogService: ActionLogService;
+
 
   @Get('/getApiEnv')
   async getApiEnv() {
@@ -166,6 +170,15 @@ export class HelpersApi {
       const cacheName = cacheNameParam as CacheNameEnum;
       const cacheServiceFactory = await this.ctx.requestContext.getAsync(CacheServiceFactory);
       await cacheServiceFactory.refreshByCacheName(cacheName, this.ctx as any);
+
+
+      await this.actionLogService.insertActionLogTable({
+        actionModule: '系统工具',
+        actionName: '刷新缓存',
+        actionMessage: '刷新缓存成功',
+        actionTarget: cacheNameParam
+      });
+
       return CommonResult.successRes({
         message: `业务缓存 ${cacheName} 已刷新`,
         cacheName,
@@ -174,6 +187,15 @@ export class HelpersApi {
 
     const category = categoryParam ? categoryParam as CacheRefreshCategory : undefined;
     await refreshCacheWithBroadcast(this.ctx, category);
+
+
+    await this.actionLogService.insertActionLogTable({
+      actionModule: '系统工具',
+      actionName: '刷新缓存',
+      actionMessage: '刷新缓存成功',
+      actionTarget: cacheNameParam
+    });
+
     return CommonResult.successRes({
       message: `缓存已刷新${category ? '(' + category + ')' : '(全部)'}（已广播集群）`,
       category: category || 'ALL',
@@ -183,7 +205,7 @@ export class HelpersApi {
   private checkLocalPermissionEnv() {
 
     //是否是开发者
-   const isDevelopUser = (): boolean=> {
+    const isDevelopUser = (): boolean => {
       const isDevOpsWriter = this.ctx.userSession?.hasRole(SystemRoleCode.DevOpsWriter);
       const isSuperAdmin = this.ctx.userSession?.hasRole(SystemRoleCode.SuperAdmin);
       const isHelpersTools = this.ctx.userSession?.hasPermission(SystemFuncCode.HelpersTools);

package/src/controller/myinfo/AuthController.ts

@@ -60,6 +60,15 @@ export class AuthController extends BaseApiController {
 
     const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
     this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
+
+
+    await this.actionLogService.insertActionLogTable({
+      actionModule: '用户账号',
+      actionName: '登录',
+      actionMessage: '登录成功',
+      actionTarget: `${userSessionInfo?.nickName}(${userSessionInfo?.accountId})`
+    });
+
     return CommonResult.successMsg('登录成功', removePrivateField(userSessionInfo));
   }
 
@@ -112,7 +121,20 @@ export class AuthController extends BaseApiController {
       return CommonResult.errorRes('开放体验账号不支持修改密码');
     }
 
-    return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+
+
+    const res = await this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+
+    if (res.success) {
+      await this.actionLogService.insertActionLogTable({
+        actionModule: '用户账号',
+        actionName: '修改密码',
+        actionMessage: '修改密码成功',
+        actionTarget: this.ctx.userSession.getSessionInfo()?.nickName
+      });
+    }
+
+    return res;
   }
 
   /**

package/src/index.ts

@@ -12,7 +12,6 @@ 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';
@@ -49,6 +48,7 @@ export * from './middleware/tx.middleware';
 export * from './middleware/permission.middleware';
 export * from './middleware/redislock.middleware';
 export * from './service/AuthService';
+export * from './service/ActionLogService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';

package/src/models/SystemTables.ts

@@ -22,8 +22,7 @@ export const SystemTables = {
   sys_visit_stats: 'sys_visit_stats',
   sys_async_tasks: 'sys_async_tasks',
   sys_config_changelog: 'sys_config_changelog',
-
-
+  sys_action_log: 'sys_action_log',
 };
 
 export const SystemDevOpsWorkbench = 'devops';

package/src/service/ActionLogService.ts

@@ -0,0 +1,52 @@
+import { Inject, Provide } from '@midwayjs/core';
+import { CurdMixService } from './curd/CurdMixService';
+import { SystemTables } from '@/models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { BaseService } from "@/service/base/BaseService";
+import { DateTimeUtils } from '@/libs/crud-pro/utils/DateTimeUtils';
+import { CrudWriteResult } from '@/libs/crud-pro/models/CrudResult';
+
+
+export interface IActionLoginInfo {
+  actionModule: string;
+  actionName: string;
+  actionMessage: string;
+  actionTarget: string;
+  createdBy?: string;
+  modifiedBy?: string;
+}
+
+@Provide()
+export class ActionLogService extends BaseService {
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  public async insertActionLogTable(logInfo: IActionLoginInfo): Promise<CrudWriteResult> {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const actionTable = this.curdMixService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: SystemTables.sys_action_log,
+    });
+
+    const sessionInfo = this.ctx.userSession.getSessionInfo();
+    return actionTable.insert({
+      data: {
+        action_module: logInfo.actionModule,
+        action_name: logInfo.actionName,
+        action_message: logInfo.actionMessage,
+        created_by: logInfo.createdBy || sessionInfo?.accountId || '',
+        created_at: DateTimeUtils.getCurrentTimeString(),
+        modified_at: DateTimeUtils.getCurrentTimeString(),
+        modified_by: logInfo.modifiedBy || sessionInfo?.accountId || '',
+        status: 1,
+        action_target: logInfo.actionTarget
+      }
+    });
+  }
+
+
+
+}

package/src/service/crudstd/CrudStdService.ts

@@ -219,8 +219,7 @@ export class CrudStdService extends ApiBaseService {
 
   /**
    * 获取appInfo 并且拿到当前settingKey相关的信息
-   * @param appCode
-   * @param settingKey
+   * @param stdAction
    */
   public async getParsedCrudStdAppForSettingKey(stdAction: ICrudStdActionParams): Promise<ICrudStdAppInfoForSettingKey> {
     const { appCode, settingKey, buttonSettingKey } = stdAction || {};

package/src/service/curd/CurdMixByDictService.ts

@@ -68,6 +68,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
     if (noCacheCodes.length > 0) {
       const res1 = await this.curdProService.executeCrudByCfg(
         {
+          columns: ['dict_code', 'label', 'value', 'style', 'code'],
           condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0, status: 1 },
         },
         {