midway-fatcms 0.0.1-beta.6 → 0.0.1-beta.60

package/dist/service/SysConfigService.d.ts

@@ -1,7 +1,7 @@
-import { Context } from '@midwayjs/koa';
-import { BaseService } from "./base/BaseService";
-export declare class SysConfigService extends BaseService {
-    ctx: Context;
-    private curdProService;
-    getSysConfigOne(config_code: string): Promise<any>;
-}
+import { Context } from '@midwayjs/koa';
+import { BaseService } from './base/BaseService';
+export declare class SysConfigService extends BaseService {
+    ctx: Context;
+    private curdProService;
+    getSysConfigOne(config_code: string): Promise<any>;
+}

package/dist/service/SysConfigService.js

@@ -1,45 +1,47 @@
-"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.SysConfigService = void 0;
-const core_1 = require("@midwayjs/core");
-const keys_1 = require("../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../models/SystemTables");
-const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
-let SysConfigService = class SysConfigService extends BaseService_1.BaseService {
-    async getSysConfigOne(config_code) {
-        if (!config_code) {
-            throw new Error('[getSysConfigOne] config_code required');
-        }
-        const res1 = await this.curdProService.executeCrudByCfg({
-            condition: { config_code },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-        });
-        return res1.getOneObj();
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], SysConfigService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], SysConfigService.prototype, "curdProService", void 0);
-SysConfigService = __decorate([
-    (0, core_1.Provide)()
-], SysConfigService);
-exports.SysConfigService = SysConfigService;
+"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.SysConfigService = void 0;
+const core_1 = require("@midwayjs/core");
+const keys_1 = require("../libs/crud-pro/models/keys");
+const SystemTables_1 = require("../models/SystemTables");
+const BaseService_1 = require("./base/BaseService");
+const CurdProService_1 = require("./curd/CurdProService");
+const global_config_1 = require("../libs/global-config/global-config");
+let SysConfigService = class SysConfigService extends BaseService_1.BaseService {
+    async getSysConfigOne(config_code) {
+        if (!config_code) {
+            throw new Error('[getSysConfigOne] config_code required');
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const res1 = await this.curdProService.executeCrudByCfg({
+            condition: { config_code },
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_configs,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        return res1.getOneObj();
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], SysConfigService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], SysConfigService.prototype, "curdProService", void 0);
+SysConfigService = __decorate([
+    (0, core_1.Provide)()
+], SysConfigService);
+exports.SysConfigService = SysConfigService;

package/dist/service/UserAccountService.d.ts

@@ -1,23 +1,23 @@
-import { Context } from '@midwayjs/koa';
-import { CommonResult } from '../libs/utils/common-dto';
-export declare class UserAccountService {
-    ctx: Context;
-    private curdMixService;
-    /**
-     * 查询用户: 根据loginName查询
-     * @param loginName
-     */
-    queryUserAccountByLoginName(loginName: string): Promise<any>;
-    /**
-     * 查询基本信息：根据accountId数组
-     * @param accountIdList
-     * @param columns
-     */
-    queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]>;
-    /**
-     * 修改密码
-     * @param loginName
-     * @param unsaltedPwd
-     */
-    chgUserPassword(loginName: any, unsaltedPwd: any): Promise<CommonResult>;
-}
+import { Context } from '@midwayjs/koa';
+import { CommonResult } from '../libs/utils/common-dto';
+export declare class UserAccountService {
+    ctx: Context;
+    private curdMixService;
+    /**
+     * 查询用户: 根据loginName查询
+     * @param loginName
+     */
+    queryUserAccountByLoginName(loginName: string): Promise<any>;
+    /**
+     * 查询基本信息：根据accountId数组
+     * @param accountIdList
+     * @param columns
+     */
+    queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]>;
+    /**
+     * 修改密码
+     * @param loginName
+     * @param unsaltedPwd
+     */
+    chgUserPassword(loginName: any, unsaltedPwd: any): Promise<CommonResult>;
+}

package/dist/service/UserAccountService.js

@@ -1,103 +1,107 @@
-"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.UserAccountService = void 0;
-const md5 = require("md5");
-const core_1 = require("@midwayjs/core");
-const keys_1 = require("../libs/crud-pro/models/keys");
-const CurdMixService_1 = require("./curd/CurdMixService");
-const functions_1 = require("../libs/utils/functions");
-const exceptions_1 = require("../libs/crud-pro/exceptions");
-const SystemTables_1 = require("../models/SystemTables");
-const common_dto_1 = require("../libs/utils/common-dto");
-let UserAccountService = class UserAccountService {
-    /**
-     * 查询用户: 根据loginName查询
-     * @param loginName
-     */
-    async queryUserAccountByLoginName(loginName) {
-        const query = await this.curdMixService.executeCrudByCfg({
-            condition: { login_name: loginName },
-        }, {
-            method: 'UserAccountService.queryUserAccountByLoginName',
-            sqlTable: SystemTables_1.SystemTables.sys_user_account,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-        });
-        const { row } = query.getResModel();
-        return row;
-    }
-    /**
-     * 查询基本信息：根据accountId数组
-     * @param accountIdList
-     * @param columns
-     */
-    async queryAccountBasicInfoByIds(accountIdList, columns) {
-        if (!accountIdList || accountIdList.length === 0) {
-            return [];
-        }
-        const accountIds = accountIdList.map(userId => {
-            return `${userId}`;
-        });
-        const cfgModel = {
-            method: 'UserAccountService.queryAccountBasicInfoByIds',
-            sqlTable: SystemTables_1.SystemTables.sys_user_account,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-        };
-        const reqJson = {
-            columns: columns,
-            condition: {
-                account_id: {
-                    $in: accountIds,
-                },
-            },
-        };
-        const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
-        return res.getResRows();
-    }
-    /**
-     * 修改密码
-     * @param loginName
-     * @param unsaltedPwd
-     */
-    async chgUserPassword(loginName, unsaltedPwd) {
-        if (!loginName) {
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.OTHER_EXCEPTION, 'loginName不存在');
-        }
-        const pwd_salt = (0, functions_1.createUniqueId)();
-        const pwd_md5 = md5(unsaltedPwd + pwd_salt);
-        const res1 = await this.curdMixService.executeCrudByCfg({
-            data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
-            condition: { login_name: loginName },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_user_account,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
-        });
-        return common_dto_1.CommonResult.successRes(res1.getResModel());
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], UserAccountService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdMixService_1.CurdMixService)
-], UserAccountService.prototype, "curdMixService", void 0);
-UserAccountService = __decorate([
-    (0, core_1.Provide)()
-], UserAccountService);
-exports.UserAccountService = UserAccountService;
+"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.UserAccountService = void 0;
+const md5 = require("md5");
+const core_1 = require("@midwayjs/core");
+const keys_1 = require("../libs/crud-pro/models/keys");
+const CurdMixService_1 = require("./curd/CurdMixService");
+const functions_1 = require("../libs/utils/functions");
+const exceptions_1 = require("../libs/crud-pro/exceptions");
+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 UserAccountService = class UserAccountService {
+    /**
+     * 查询用户: 根据loginName查询
+     * @param loginName
+     */
+    async queryUserAccountByLoginName(loginName) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const query = await this.curdMixService.executeCrudByCfg({
+            condition: { login_name: loginName },
+        }, {
+            method: 'UserAccountService.queryUserAccountByLoginName',
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        const { row } = query.getResModel();
+        return row;
+    }
+    /**
+     * 查询基本信息：根据accountId数组
+     * @param accountIdList
+     * @param columns
+     */
+    async queryAccountBasicInfoByIds(accountIdList, columns) {
+        if (!accountIdList || accountIdList.length === 0) {
+            return [];
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const accountIds = accountIdList.map(userId => {
+            return `${userId}`;
+        });
+        const cfgModel = {
+            method: 'UserAccountService.queryAccountBasicInfoByIds',
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        };
+        const reqJson = {
+            columns: columns,
+            condition: {
+                account_id: {
+                    $in: accountIds,
+                },
+            },
+        };
+        const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResRows();
+    }
+    /**
+     * 修改密码
+     * @param loginName
+     * @param unsaltedPwd
+     */
+    async chgUserPassword(loginName, unsaltedPwd) {
+        if (!loginName) {
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.OTHER_EXCEPTION, 'loginName不存在');
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const pwd_salt = (0, functions_1.createUniqueId)();
+        const pwd_md5 = md5(unsaltedPwd + pwd_salt);
+        const res1 = await this.curdMixService.executeCrudByCfg({
+            data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
+            condition: { login_name: loginName },
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        return common_dto_1.CommonResult.successRes(res1.getResModel());
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], UserAccountService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdMixService_1.CurdMixService)
+], UserAccountService.prototype, "curdMixService", void 0);
+UserAccountService = __decorate([
+    (0, core_1.Provide)()
+], UserAccountService);
+exports.UserAccountService = UserAccountService;

package/dist/service/UserSessionService.d.ts

@@ -1,16 +1,38 @@
-import { ISessionInfo } from '../models/userSession';
-export declare class UserSessionService {
-    private ctx;
-    private redisCacheService;
-    saveUserSession(sessionInfo: ISessionInfo): Promise<void>;
-    /**
-     * 移除Session
-     * @param sessionId
-     */
-    removeUserSession(sessionId: string): Promise<any>;
-    private getCurrentUserSessionForMiddleware1;
-    /**
-     * 专门给中间件点调用的
-     */
-    getCurrentUserSessionForMiddleware(): Promise<ISessionInfo>;
-}
+import { ISessionInfo } from '../models/userSession';
+export declare class UserSessionService {
+    private ctx;
+    private redisCacheService;
+    private curdProService;
+    private fatcmsUserSessionKeepTimeSecond;
+    /**
+     * 获取用户会话保持时间: 单位秒
+     * @returns
+     */
+    private getSessionKeepTimeSecond;
+    /**
+     * 保存用户会话信息。
+     * 用户登录后，在业务的项目中，可以调用此函数，更新bizExt字段
+     * @param sessionInfo
+     */
+    saveUserSession(sessionInfo: ISessionInfo): Promise<void>;
+    /**
+     * 移除Session
+     * @param sessionId
+     */
+    removeUserSession(sessionId: string): Promise<any>;
+    /**
+     * 获取用户会话信息
+     * @param sessionId
+     * @returns
+     */
+    private getCurrentUserSessionForMiddleware1;
+    /**
+     * 从异步任务队列中获取当时用户的Session信息
+     * @param asyncTaskId
+     */
+    private getCurrentUserSessionByAsyncTaskId;
+    /**
+     * 专门给中间件点调用的
+     */
+    getCurrentUserSessionForMiddleware(): Promise<ISessionInfo>;
+}