midway-fatcms 0.0.1-beta.65 → 0.0.1-beta.67

package/dist/service/AuthService.js

@@ -1,263 +1,270 @@
-"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.AuthService = void 0;
-const core_1 = require("@midwayjs/core");
-const keys_1 = require("../libs/crud-pro/models/keys");
-const CurdMixService_1 = require("./curd/CurdMixService");
-const md5 = require("md5");
-const UserAccountService_1 = require("./UserAccountService");
-const functions_1 = require("../libs/utils/functions");
-const userSession_1 = require("../models/userSession");
-const SystemTables_1 = require("../models/SystemTables");
-const UserSessionService_1 = require("./UserSessionService");
-const common_dto_1 = require("../libs/utils/common-dto");
-const fatcms_request_1 = require("../libs/utils/fatcms-request");
-const exceptions_1 = require("../libs/crud-pro/exceptions");
-const global_config_1 = require("../libs/global-config/global-config");
-let AuthService = class AuthService {
-    /**
-     * 明文密码转unsaltedPwd密码
-     * @param plainPwd
-     * @param loginName
-     */
-    toUnsaltedPwd(plainPwd, loginName) {
-        const pw2 = md5(md5(plainPwd) + '_' + loginName);
-        return pw2;
-    }
-    /**
-     * front: pw1 = md5(md5(input_pw) + "_" + loginName)
-     * db: pw2 = md5(pwd_salt + pw1)
-     * 检查用户名密码是否正确
-     * @param loginName
-     * @param unsaltedPwd
-     */
-    async checkLoginPassword(loginName, unsaltedPwd) {
-        const message = '用户名或密码错误';
-        const errorCode = 'USERNAME_OR_PASSWORD_IS_INCORRECT';
-        if (!loginName) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, '!loginName');
-        }
-        if (!unsaltedPwd) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, '!unsaltedPwd');
-        }
-        const userAccount = await this.queryUserAccountByLoginName(loginName);
-        if (!userAccount) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, '!userAccount');
-        }
-        if (userAccount.status !== 1) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, 'userAccount.status !== 1');
-        }
-        if (!userAccount.pwd_md5) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, '!userAccount.pwd_md5');
-        }
-        const pwd_salt = userAccount.pwd_salt;
-        const pwd_md5 = md5(unsaltedPwd + pwd_salt);
-        if (userAccount['pwd_md5'] !== pwd_md5) {
-            return common_dto_1.CommonResult.errorRes(message, errorCode, "userAccount['pwd_md5'] !== pwd_md5");
-        }
-        return common_dto_1.CommonResult.successRes();
-    }
-    /**
-     * 创建一个toC端的UserSession
-     * @param consumerUserInfo
-     * @param loadRoleCodes
-     */
-    async createUserSessionForConsumer(consumerUserInfo, loadRoleCodes) {
-        const sessionId = (0, functions_1.createUniqueId)();
-        const accountId = consumerUserInfo.accountId;
-        let roleCodes = [];
-        let functionCodes = [];
-        if (loadRoleCodes === true) {
-            roleCodes = await this.queryUserRoleCodeList(accountId);
-            functionCodes = await this.queryFunctionCodeList(roleCodes);
-        }
-        const sessionInfo = {
-            nickName: consumerUserInfo.nickName,
-            avatar: consumerUserInfo.avatar,
-            roleCodes: roleCodes,
-            functionCodes: functionCodes,
-            loginName: consumerUserInfo.loginName,
-            sessionId,
-            accountId: consumerUserInfo.accountId,
-            workbenchCode: consumerUserInfo.workbenchCode,
-            accountType: consumerUserInfo.accountType,
-        };
-        await this.userSessionService.saveUserSession(sessionInfo);
-        return {
-            sessionId,
-            loginName: sessionInfo.loginName,
-            accountId: sessionInfo.accountId,
-            nickName: sessionInfo.nickName,
-            avatar: sessionInfo.avatar,
-            workbenchCode: sessionInfo.workbenchCode,
-            accountType: sessionInfo.accountType,
-        };
-    }
-    /**
-     * 创建一个Session
-     * @param loginName
-     * @param workbenchCode
-     */
-    async createUserSession(loginName, workbenchCode, bizExt) {
-        const userAccount = await this.queryUserAccountByLoginName(loginName);
-        if (!userAccount) {
-            throw new exceptions_1.CommonException('USER_ACCOUNT_NOT_EXIST', '用户账号不存在');
-        }
-        const accountId = userAccount.account_id;
-        const sessionId = (0, functions_1.createUniqueId)();
-        const roleCodes = await this.queryUserRoleCodeList(accountId);
-        const functionCodes = await this.queryFunctionCodeList(roleCodes);
-        const sessionInfo = {
-            nickName: userAccount.nick_name,
-            avatar: userAccount.avatar,
-            roleCodes,
-            functionCodes,
-            loginName,
-            sessionId,
-            accountId,
-            workbenchCode,
-            accountType: userSession_1.SYS_ACCOUNT_TYPE,
-            bizExt: {},
-        };
-        if (bizExt && typeof bizExt === 'object') {
-            sessionInfo.bizExt = bizExt;
-        }
-        await this.userSessionService.saveUserSession(sessionInfo);
-        return {
-            sessionId,
-            loginName,
-            accountId,
-            nickName: userAccount.nick_name,
-            avatar: userAccount.avatar,
-            workbenchCode: sessionInfo.workbenchCode,
-            accountType: sessionInfo.accountType,
-        };
-    }
-    /**
-     * 获取用户
-     * @param loginName
-     * @private
-     */
-    async queryUserAccountByLoginName(loginName) {
-        const superAdminList = this.superAdminList;
-        const findFromSuperAdmin = () => {
-            if (!(0, fatcms_request_1.isEnableSuperAdmin)(this.ctx)) {
-                return null;
-            }
-            if (!Array.isArray(superAdminList)) {
-                return null;
-            }
-            for (let i = 0; i < superAdminList.length; i++) {
-                const element = superAdminList[i];
-                if (element && element.login_name === loginName) {
-                    const nick_name = 'SA' + i;
-                    return {
-                        nick_name: element.nick_name || nick_name,
-                        avatar: '',
-                        account_id: nick_name,
-                        status: 1,
-                        login_name: element.login_name,
-                        pwd_salt: element.pwd_salt,
-                        pwd_md5: element.pwd_md5,
-                    };
-                }
-            }
-        };
-        const superAdmin = findFromSuperAdmin();
-        if (superAdmin) {
-            return superAdmin;
-        }
-        return this.userService.queryUserAccountByLoginName(loginName);
-    }
-    /**
-     * 查询此accountId下关联的角色code列表
-     * @param accountId
-     * @private
-     */
-    async queryUserRoleCodeList(accountId) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res = await this.curdMixService.executeCrudByCfg({
-            condition: { account_id: accountId },
-            limit: 10000,
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_perm_user_role,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-        });
-        const rows = res.getResModel().rows || [];
-        const roleCodes = rows.map(({ role_code }) => {
-            return role_code;
-        });
-        return [...new Set(roleCodes)];
-    }
-    /**
-     * 查询此roleCodeList下面关联的所有功能点列表
-     * @param roleCodeList
-     * @private
-     */
-    async queryFunctionCodeList(roleCodeList) {
-        if (!roleCodeList || roleCodeList.length === 0) {
-            return [];
-        }
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res = await this.curdMixService.executeCrudByCfg({
-            condition: { role_code: { $in: roleCodeList } },
-            limit: 10000,
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-        });
-        const rows = res.getResModel().rows || [];
-        const funcCodes = rows.map(({ func_code }) => {
-            return func_code;
-        });
-        return [...new Set(funcCodes)];
-    }
-    async removeUserSession(sessionId) {
-        return this.userSessionService.removeUserSession(sessionId);
-    }
-    async refreshSession(sessionInfo) {
-        const oldSessionId = sessionInfo.sessionId;
-        const sessionId = (0, functions_1.createUniqueId)();
-        const newSessionInfo = { ...sessionInfo, sessionId };
-        await this.userSessionService.saveUserSession(newSessionInfo);
-        await this.removeUserSession(oldSessionId);
-        return newSessionInfo;
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], AuthService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Config)('superAdminList'),
-    __metadata("design:type", Array)
-], AuthService.prototype, "superAdminList", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdMixService_1.CurdMixService)
-], AuthService.prototype, "curdMixService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", UserAccountService_1.UserAccountService)
-], AuthService.prototype, "userService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", UserSessionService_1.UserSessionService)
-], AuthService.prototype, "userSessionService", void 0);
-AuthService = __decorate([
-    (0, core_1.Provide)()
-], AuthService);
-exports.AuthService = AuthService;
+"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.AuthService = void 0;
+const core_1 = require("@midwayjs/core");
+const keys_1 = require("../libs/crud-pro/models/keys");
+const CurdMixService_1 = require("./curd/CurdMixService");
+const md5 = require("md5");
+const UserAccountService_1 = require("./UserAccountService");
+const functions_1 = require("../libs/utils/functions");
+const userSession_1 = require("../models/userSession");
+const SystemTables_1 = require("../models/SystemTables");
+const UserSessionService_1 = require("./UserSessionService");
+const common_dto_1 = require("../libs/utils/common-dto");
+const fatcms_request_1 = require("../libs/utils/fatcms-request");
+const exceptions_1 = require("../libs/crud-pro/exceptions");
+const global_config_1 = require("../libs/global-config/global-config");
+const AsymmetricCrypto_1 = require("../libs/utils/AsymmetricCrypto");
+let AuthService = class AuthService {
+    /**
+     * 明文密码转unsaltedPwd密码
+     * @param plainPwd
+     * @param loginName
+     */
+    toUnsaltedPwd(plainPwd, loginName) {
+        const pw2 = md5(md5(plainPwd) + '_' + loginName);
+        return pw2;
+    }
+    /**
+     * front: pw1 = md5(md5(input_pw) + "_" + loginName)
+     * db: pw2 = md5(pwd_salt + pw1)
+     * 检查用户名密码是否正确
+     * @param loginName
+     * @param unsaltedPwd
+     */
+    async checkLoginPassword(loginName, unsaltedPwd) {
+        const message = '用户名或密码错误';
+        const errorCode = 'USERNAME_OR_PASSWORD_IS_INCORRECT';
+        if (!loginName) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, '!loginName');
+        }
+        if (!unsaltedPwd) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, '!unsaltedPwd');
+        }
+        const userAccount = await this.queryUserAccountByLoginName(loginName);
+        if (!userAccount) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, '!userAccount');
+        }
+        if (userAccount.status !== 1) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, 'userAccount.status !== 1');
+        }
+        if (!userAccount.pwd_md5) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, '!userAccount.pwd_md5');
+        }
+        const pwd_salt = userAccount.pwd_salt;
+        const pwd_md5 = md5(unsaltedPwd + pwd_salt);
+        if (userAccount['pwd_md5'] !== pwd_md5) {
+            return common_dto_1.CommonResult.errorRes(message, errorCode, "userAccount['pwd_md5'] !== pwd_md5");
+        }
+        return common_dto_1.CommonResult.successRes();
+    }
+    /**
+     * 创建一个toC端的UserSession
+     * @param consumerUserInfo
+     * @param loadRoleCodes
+     */
+    async createUserSessionForConsumer(consumerUserInfo, loadRoleCodes) {
+        const sessionId = (0, functions_1.createUniqueId)();
+        const accountId = consumerUserInfo.accountId;
+        let roleCodes = [];
+        let functionCodes = [];
+        if (loadRoleCodes === true) {
+            roleCodes = await this.queryUserRoleCodeList(accountId);
+            functionCodes = await this.queryFunctionCodeList(roleCodes);
+        }
+        const { publicKey, privateKey } = await AsymmetricCrypto_1.AsymmetricCrypto.generateKeyPair();
+        const sessionInfo = {
+            nickName: consumerUserInfo.nickName,
+            avatar: consumerUserInfo.avatar,
+            roleCodes: roleCodes,
+            functionCodes: functionCodes,
+            loginName: consumerUserInfo.loginName,
+            sessionId,
+            accountId: consumerUserInfo.accountId,
+            workbenchCode: consumerUserInfo.workbenchCode,
+            accountType: consumerUserInfo.accountType,
+            publicKey,
+            privateKey,
+        };
+        await this.userSessionService.saveUserSession(sessionInfo);
+        return {
+            sessionId,
+            loginName: sessionInfo.loginName,
+            accountId: sessionInfo.accountId,
+            nickName: sessionInfo.nickName,
+            avatar: sessionInfo.avatar,
+            workbenchCode: sessionInfo.workbenchCode,
+            accountType: sessionInfo.accountType,
+        };
+    }
+    /**
+     * 创建一个Session
+     * @param loginName
+     * @param workbenchCode
+     */
+    async createUserSession(loginName, workbenchCode, bizExt) {
+        const userAccount = await this.queryUserAccountByLoginName(loginName);
+        if (!userAccount) {
+            throw new exceptions_1.CommonException('USER_ACCOUNT_NOT_EXIST', '用户账号不存在');
+        }
+        const accountId = userAccount.account_id;
+        const sessionId = (0, functions_1.createUniqueId)();
+        const roleCodes = await this.queryUserRoleCodeList(accountId);
+        const functionCodes = await this.queryFunctionCodeList(roleCodes);
+        const { publicKey, privateKey } = await AsymmetricCrypto_1.AsymmetricCrypto.generateKeyPair();
+        const sessionInfo = {
+            nickName: userAccount.nick_name,
+            avatar: userAccount.avatar,
+            roleCodes,
+            functionCodes,
+            loginName,
+            sessionId,
+            accountId,
+            workbenchCode,
+            accountType: userSession_1.SYS_ACCOUNT_TYPE,
+            bizExt: {},
+            publicKey,
+            privateKey,
+        };
+        if (bizExt && typeof bizExt === 'object') {
+            sessionInfo.bizExt = bizExt;
+        }
+        await this.userSessionService.saveUserSession(sessionInfo);
+        return {
+            sessionId,
+            loginName,
+            accountId,
+            nickName: userAccount.nick_name,
+            avatar: userAccount.avatar,
+            workbenchCode: sessionInfo.workbenchCode,
+            accountType: sessionInfo.accountType,
+        };
+    }
+    /**
+     * 获取用户
+     * @param loginName
+     * @private
+     */
+    async queryUserAccountByLoginName(loginName) {
+        const superAdminList = this.superAdminList;
+        const findFromSuperAdmin = () => {
+            if (!(0, fatcms_request_1.isEnableSuperAdmin)(this.ctx)) {
+                return null;
+            }
+            if (!Array.isArray(superAdminList)) {
+                return null;
+            }
+            for (let i = 0; i < superAdminList.length; i++) {
+                const element = superAdminList[i];
+                if (element && element.login_name === loginName) {
+                    const nick_name = 'SA' + i;
+                    return {
+                        nick_name: element.nick_name || nick_name,
+                        avatar: '',
+                        account_id: nick_name,
+                        status: 1,
+                        login_name: element.login_name,
+                        pwd_salt: element.pwd_salt,
+                        pwd_md5: element.pwd_md5,
+                    };
+                }
+            }
+        };
+        const superAdmin = findFromSuperAdmin();
+        if (superAdmin) {
+            return superAdmin;
+        }
+        return this.userService.queryUserAccountByLoginName(loginName);
+    }
+    /**
+     * 查询此accountId下关联的角色code列表
+     * @param accountId
+     * @private
+     */
+    async queryUserRoleCodeList(accountId) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const res = await this.curdMixService.executeCrudByCfg({
+            condition: { account_id: accountId },
+            limit: 10000,
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_perm_user_role,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        const rows = res.getResModel().rows || [];
+        const roleCodes = rows.map(({ role_code }) => {
+            return role_code;
+        });
+        return [...new Set(roleCodes)];
+    }
+    /**
+     * 查询此roleCodeList下面关联的所有功能点列表
+     * @param roleCodeList
+     * @private
+     */
+    async queryFunctionCodeList(roleCodeList) {
+        if (!roleCodeList || roleCodeList.length === 0) {
+            return [];
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const res = await this.curdMixService.executeCrudByCfg({
+            condition: { role_code: { $in: roleCodeList } },
+            limit: 10000,
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        const rows = res.getResModel().rows || [];
+        const funcCodes = rows.map(({ func_code }) => {
+            return func_code;
+        });
+        return [...new Set(funcCodes)];
+    }
+    async removeUserSession(sessionId) {
+        return this.userSessionService.removeUserSession(sessionId);
+    }
+    async refreshSession(sessionInfo) {
+        const oldSessionId = sessionInfo.sessionId;
+        const sessionId = (0, functions_1.createUniqueId)();
+        const newSessionInfo = { ...sessionInfo, sessionId };
+        await this.userSessionService.saveUserSession(newSessionInfo);
+        await this.removeUserSession(oldSessionId);
+        return newSessionInfo;
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], AuthService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Config)('superAdminList'),
+    __metadata("design:type", Array)
+], AuthService.prototype, "superAdminList", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdMixService_1.CurdMixService)
+], AuthService.prototype, "curdMixService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", UserAccountService_1.UserAccountService)
+], AuthService.prototype, "userService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", UserSessionService_1.UserSessionService)
+], AuthService.prototype, "userSessionService", void 0);
+AuthService = __decorate([
+    (0, core_1.Provide)()
+], AuthService);
+exports.AuthService = AuthService;

package/dist/service/EnumInfoService.d.ts

@@ -1,30 +1,30 @@
-import { Context } from '@midwayjs/koa';
-import { RelatedType } from './curd/CurdMixUtils';
-import { IEnumInfo } from '../libs/utils/parseConfig';
-interface IQueryEnumInfo {
-    type: RelatedType;
-    code: string;
-}
-interface IQueryEnumResult {
-    type: RelatedType;
-    code: string;
-    values: IEnumInfo[];
-}
-export declare class EnumInfoService {
-    ctx: Context;
-    private curdProService;
-    private curdMixByLinkToCustomService;
-    private redisCacheService;
-    queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]>;
-    /**
-     * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
-     * code形如：fatcms~~~sys_perm_role~~~id,*
-     * 【数据库】~~~【表名】~~~【label】,【value】，【style】
-     * @param code
-     * @private
-     */
-    private queryEnumInfoByLinkToCustom;
-    private queryEnumInfoBySysCfgEnum;
-    private queryEnumInfoItemByDict;
-}
-export {};
+import { Context } from '@midwayjs/koa';
+import { RelatedType } from './curd/CurdMixUtils';
+import { IEnumInfo } from '../libs/utils/parseConfig';
+interface IQueryEnumInfo {
+    type: RelatedType;
+    code: string;
+}
+interface IQueryEnumResult {
+    type: RelatedType;
+    code: string;
+    values: IEnumInfo[];
+}
+export declare class EnumInfoService {
+    ctx: Context;
+    private curdProService;
+    private curdMixByLinkToCustomService;
+    private cacheServiceFactory;
+    queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]>;
+    /**
+     * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
+     * code形如：fatcms~~~sys_perm_role~~~id,*
+     * 【数据库】~~~【表名】~~~【label】,【value】，【style】
+     * @param code
+     * @private
+     */
+    private queryEnumInfoByLinkToCustom;
+    private queryEnumInfoBySysCfgEnum;
+    private queryEnumInfoItemByDict;
+}
+export {};