midway-fatcms 0.0.1-beta.4 → 0.0.1-beta.41

package/dist/service/AuthService.js

@@ -22,6 +22,7 @@ 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密码
@@ -116,7 +117,7 @@ let AuthService = class AuthService {
             sessionId,
             accountId,
             workbenchCode,
-            accountType: userSession_1.SYS_ACCOUNT_TYPE
+            accountType: userSession_1.SYS_ACCOUNT_TYPE,
         };
         await this.userSessionService.saveUserSession(sessionInfo);
         return {
@@ -171,14 +172,15 @@ let AuthService = class AuthService {
      * @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: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const roleCodes = rows.map(({ role_code }) => {
@@ -195,14 +197,15 @@ let AuthService = class AuthService {
         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: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const funcCodes = rows.map(({ func_code }) => {

package/dist/service/EnumInfoService.js

@@ -18,6 +18,8 @@ const SystemTables_1 = require("../models/SystemTables");
 const parseConfig_1 = require("../libs/utils/parseConfig");
 const RedisCacheService_1 = require("./base/RedisCacheService");
 const CurdMixByLinkToCustomService_1 = require("./curd/CurdMixByLinkToCustomService");
+const global_config_1 = require("../libs/global-config/global-config");
+const RedisKeys_1 = require("../models/RedisKeys");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
@@ -27,7 +29,7 @@ let EnumInfoService = class EnumInfoService {
         const result = [];
         for (let i = 0; i < codeList.length; i++) {
             const { code, type } = codeList[i];
-            const cacheKey = `enums@@${type}@@${code}`;
+            const cacheKey = `${RedisKeys_1.RedisKeys.QUERY_ENUM_INFO_PREFIX}${type}@@${code}`;
             const emums = refreshCache ? null : await this.redisCacheService.getJsonObject(cacheKey);
             if (!Array.isArray(emums) || emums.length === 0) {
                 let values;
@@ -70,13 +72,14 @@ let EnumInfoService = class EnumInfoService {
         });
     }
     async queryEnumInfoBySysCfgEnum(code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: { config_code: code },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const obj = res1.getOneObj();
         if (!obj) {
@@ -86,13 +89,14 @@ let EnumInfoService = class EnumInfoService {
         return rows.map(e => ({ label: e.label, value: e.value, children: e.children })).filter(filterEmpty);
     }
     async queryEnumInfoItemByDict(code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: { dict_code: code },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const obj = res1.getResRows();
         if (!obj) {

package/dist/service/FileCenterService.js

@@ -20,7 +20,7 @@ const CurdMixService_1 = require("./curd/CurdMixService");
 const keys_1 = require("../libs/crud-pro/models/keys");
 const bizmodels_1 = require("../models/bizmodels");
 const BaseService_1 = require("./base/BaseService");
-const SystemTables_1 = require("../models/SystemTables");
+const global_config_1 = require("../libs/global-config/global-config");
 function getSuffix(s) {
     if (s) {
         const indexOf = s.lastIndexOf('.');
@@ -93,12 +93,13 @@ class FileDB {
         this.curdMixService = curdMixService;
     }
     async getFileInfo(fileKey) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const condition = { file_key: fileKey };
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             validateCfg: {
                 'condition.file_key': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
@@ -107,11 +108,12 @@ class FileDB {
         return res.getOneObj();
     }
     async saveFileInfo(fileInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({
             data: fileInfo,
@@ -121,20 +123,22 @@ class FileDB {
         }, cfgModel);
     }
     async saveAssetsLog(fileInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_assets_log',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ data: fileInfo }, cfgModel);
     }
     async deleteFileInfo(id) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMBER],
             },

package/dist/service/SysConfigService.d.ts

@@ -1,5 +1,5 @@
 import { Context } from '@midwayjs/koa';
-import { BaseService } from "./base/BaseService";
+import { BaseService } from './base/BaseService';
 export declare class SysConfigService extends BaseService {
     ctx: Context;
     private curdProService;

package/dist/service/SysConfigService.js

@@ -15,18 +15,20 @@ 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: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         return res1.getOneObj();
     }

package/dist/service/UserAccountService.js

@@ -18,20 +18,22 @@ 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: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         const { row } = query.getResModel();
         return row;
@@ -45,6 +47,7 @@ let UserAccountService = class UserAccountService {
         if (!accountIdList || accountIdList.length === 0) {
             return [];
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const accountIds = accountIdList.map(userId => {
             return `${userId}`;
         });
@@ -52,8 +55,8 @@ let UserAccountService = class UserAccountService {
             method: 'UserAccountService.queryAccountBasicInfoByIds',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         const reqJson = {
             columns: columns,
@@ -75,6 +78,7 @@ let UserAccountService = class UserAccountService {
         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({
@@ -83,8 +87,8 @@ let UserAccountService = class UserAccountService {
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         });
         return common_dto_1.CommonResult.successRes(res1.getResModel());
     }

package/dist/service/UserSessionService.d.ts

@@ -2,13 +2,34 @@ import { ISessionInfo } from '../models/userSession';
 export declare class UserSessionService {
     private ctx;
     private redisCacheService;
+    private curdProService;
+    private fatcmsUserSessionKeepTimeSecond;
+    /**
+     * 获取用户会话保持时间: 单位秒
+     * @returns
+     */
+    private getSessionKeepTimeSecond;
+    /**
+     * 保存用户会话信息
+     * @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;
     /**
      * 专门给中间件点调用的
      */

package/dist/service/UserSessionService.js

@@ -14,6 +14,12 @@ const core_1 = require("@midwayjs/core");
 const functions_1 = require("../libs/utils/functions");
 const userSession_1 = require("../models/userSession");
 const RedisCacheService_1 = require("./base/RedisCacheService");
+const RedisKeys_1 = require("../models/RedisKeys");
+const AsyncTaskModel_1 = require("../models/AsyncTaskModel");
+const CurdProService_1 = require("./curd/CurdProService");
+const keys_1 = require("../libs/crud-pro/models/keys");
+const SystemTables_1 = require("../models/SystemTables");
+const global_config_1 = require("../libs/global-config/global-config");
 function pickUserAvatar(avatar) {
     if (!avatar) {
         return null;
@@ -41,13 +47,28 @@ function pickUserAvatar(avatar) {
 }
 const SESSION_KEEP_TIME_SECOND = 3600 * 24 * 30;
 const toCacheKey = (sessionId) => {
-    return `UserSession@@${sessionId}`;
+    return `${RedisKeys_1.RedisKeys.USER_SESSION_PREFIX}${sessionId}`;
 };
 let UserSessionService = class UserSessionService {
+    /**
+     * 获取用户会话保持时间: 单位秒
+     * @returns
+     */
+    getSessionKeepTimeSecond() {
+        if (typeof this.fatcmsUserSessionKeepTimeSecond === 'number' && this.fatcmsUserSessionKeepTimeSecond > 0) {
+            return this.fatcmsUserSessionKeepTimeSecond;
+        }
+        return SESSION_KEEP_TIME_SECOND;
+    }
+    /**
+     * 保存用户会话信息
+     * @param sessionInfo
+     */
     async saveUserSession(sessionInfo) {
         sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
         const sessionId = sessionInfo.sessionId;
-        await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, SESSION_KEEP_TIME_SECOND);
+        const keepTime = this.getSessionKeepTimeSecond();
+        await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, keepTime);
     }
     /**
      * 移除Session
@@ -56,16 +77,58 @@ let UserSessionService = class UserSessionService {
     async removeUserSession(sessionId) {
         return await this.redisCacheService.removeItem(toCacheKey(sessionId));
     }
+    /**
+     * 获取用户会话信息
+     * @param sessionId
+     * @returns
+     */
     async getCurrentUserSessionForMiddleware1(sessionId) {
         if (!sessionId) {
             return null;
         }
         return await this.redisCacheService.getJsonObject(toCacheKey(sessionId));
     }
+    /**
+     * 从异步任务队列中获取当时用户的Session信息
+     * @param asyncTaskId
+     */
+    async getCurrentUserSessionByAsyncTaskId(asyncTaskId) {
+        const taskSessionCacheKey = `${RedisKeys_1.RedisKeys.USER_SESSION_ASYNC_TASK_ID_PREFIX}${asyncTaskId}`;
+        const loadSessionInfo = async () => {
+            const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+            const asyncTaskRes = await this.curdProService.executeCrudByCfg({
+                columns: ['id', 'created_user_session'],
+                condition: {
+                    id: asyncTaskId,
+                }
+            }, {
+                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+                sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
+            });
+            const asyncTaskObj = asyncTaskRes.getOneObj();
+            if (!asyncTaskObj) {
+                return null;
+            }
+            return (0, functions_1.parseJsonObject)(asyncTaskObj.created_user_session);
+        };
+        let sessionInfo1 = await this.redisCacheService.getJsonObject(taskSessionCacheKey);
+        if (!sessionInfo1) {
+            sessionInfo1 = await loadSessionInfo();
+            await this.redisCacheService.setJsonObject(taskSessionCacheKey, sessionInfo1, 3600); // 只缓存一小时即可
+        }
+        return sessionInfo1;
+    }
     /**
      * 专门给中间件点调用的
      */
     async getCurrentUserSessionForMiddleware() {
+        // 先从Header中获取：异步任务队列的任务ID
+        const asyncTaskId = this.ctx.headers[AsyncTaskModel_1.HEADER_KEY_RUN_BY_ASYNC_TASK_ID];
+        if (asyncTaskId && typeof asyncTaskId === 'string') {
+            return this.getCurrentUserSessionByAsyncTaskId(asyncTaskId);
+        }
         const cookies = this.ctx.cookies;
         const sessionId = cookies.get(userSession_1.SESSION_ID_KEY, userSession_1.sessionCookieCfg);
         return this.getCurrentUserSessionForMiddleware1(sessionId);
@@ -79,6 +142,14 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", RedisCacheService_1.RedisCacheService)
 ], UserSessionService.prototype, "redisCacheService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], UserSessionService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Config)('fatcmsUserSessionKeepTimeSecond'),
+    __metadata("design:type", Number)
+], UserSessionService.prototype, "fatcmsUserSessionKeepTimeSecond", void 0);
 UserSessionService = __decorate([
     (0, core_1.Provide)()
 ], UserSessionService);

package/dist/service/VisitStatService.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
 import { IScheduleService } from '../interface';
-import { BaseService } from "./base/BaseService";
+import { BaseService } from './base/BaseService';
 export declare class VisitStatService extends BaseService implements IScheduleService {
     protected ctx: Context;
     private curdProService;

package/dist/service/VisitStatService.js

@@ -17,6 +17,8 @@ const SystemTables_1 = require("../models/SystemTables");
 const keys_1 = require("../libs/crud-pro/models/keys");
 const bizmodels_1 = require("../models/bizmodels");
 const common_dto_1 = require("../libs/utils/common-dto");
+const global_config_1 = require("../libs/global-config/global-config");
+const RedisKeys_1 = require("../models/RedisKeys");
 // 3天 的秒数
 const EXPIRE_TIME = 3 * 24 * 60 * 60;
 const STAT_TYPES = {
@@ -27,25 +29,26 @@ const STAT_TYPES = {
 let VisitStatService = class VisitStatService extends BaseService_1.BaseService {
     async runBySchedule() {
         const hours = new Date().getHours();
-        this.logInfo("[VisitStatService] runBySchedule called, hours = " + hours);
+        this.logInfo('[VisitStatService] runBySchedule called, hours = ' + hours);
         return this.flushVisitStatToDB();
     }
     async flushVisitStatToDB() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //  统计昨天的数据。
         const stat_date = new Date(Date.now() - 24 * 3600 * 1000).toISOString().split('T')[0];
-        const lockKey = `vs_lock_${stat_date}`;
+        const lockKey = `${RedisKeys_1.RedisKeys.VISIT_STAT_LOCK_PREFIX}${stat_date}`;
         // 每天只能执行一次
         const client = this.redisService;
         const nxRes = await client.set(lockKey, 1, 'EX', EXPIRE_TIME, 'NX');
         if (nxRes !== 'OK') {
-            this.logInfo("[VisitStatService] flushVisitStatToDB 每天只能执行一次 ");
-            return common_dto_1.CommonResult.errorRes("每天只能执行一次");
+            this.logInfo('[VisitStatService] flushVisitStatToDB 每天只能执行一次 ');
+            return common_dto_1.CommonResult.errorRes('每天只能执行一次');
         }
-        this.logInfo("[VisitStatService] flushVisitStatToDB start ");
+        this.logInfo('[VisitStatService] flushVisitStatToDB start ');
         let totalCount = 0;
         let successCount = 0;
         try {
-            const keys = await client.keys(`vs_${stat_date}::*`);
+            const keys = await client.keys(`${RedisKeys_1.RedisKeys.VISIT_STAT_DATE_PREFIX}${stat_date}::*`);
             // `vs_${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
             totalCount = keys.length;
             for (const key of keys) {
@@ -57,7 +60,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                         const stat_type = parts[3];
                         const stat_resource = parts[4];
                         let stat_count;
-                        if (stat_type === STAT_TYPES.uv_ip || stat_type == STAT_TYPES.uv_uid) {
+                        if (stat_type === STAT_TYPES.uv_ip || stat_type === STAT_TYPES.uv_uid) {
                             stat_count = await client.scard(key);
                         }
                         else {
@@ -70,12 +73,12 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                                 stat_type,
                                 resource_type,
                                 stat_count,
-                                req_host
-                            }
+                                req_host,
+                            },
                         }, {
                             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                            sqlDatabase: SystemTables_1.SystemDbName,
-                            sqlDdType: SystemTables_1.SystemDbType,
+                            sqlDatabase: SystemDbName,
+                            sqlDbType: SystemDbType,
                             sqlTable: SystemTables_1.SystemTables.sys_visit_stats,
                         });
                         await client.del(key);
@@ -92,7 +95,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
             this.logError('[VisitStatService] flushVisitStatToDB', error);
             console.log('[VisitStatService] flushVisitStatToDB', error);
         }
-        this.logInfo("[VisitStatService] flushVisitStatToDB end ");
+        this.logInfo('[VisitStatService] flushVisitStatToDB end ');
         return common_dto_1.CommonResult.successRes({ successCount, totalCount });
     }
     /**
@@ -122,34 +125,24 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
         const client = this.redisService;
         const ip = this.ctx.headers['x-real-ip'];
         const userSession = this.ctx.userSession;
-        const req_host = ((_b = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.host) || "null"; // 域名
+        const req_host = ((_b = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.host) || 'null'; // 域名
         const date = new Date().toISOString().split('T')[0];
         const toDateResourceKey = (stat_type) => {
-            return `vs_${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
+            return `${RedisKeys_1.RedisKeys.VISIT_STAT_DATE_PREFIX}${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
         };
         const pv_key = toDateResourceKey(STAT_TYPES.pv);
         const uv_ip_key = toDateResourceKey(STAT_TYPES.uv_ip);
         const uv_uid_key = toDateResourceKey(STAT_TYPES.uv_uid);
         // 统计 PV
-        await Promise.all([
-            client.incr(pv_key),
-            client.expire(pv_key, EXPIRE_TIME)
-        ]);
+        await Promise.all([client.incr(pv_key), client.expire(pv_key, EXPIRE_TIME)]);
         // IP 访问 UV
-        await Promise.all([
-            client.sadd(uv_ip_key, `${ip}`),
-            client.expire(uv_ip_key, EXPIRE_TIME)
-        ]);
+        await Promise.all([client.sadd(uv_ip_key, `${ip}`), client.expire(uv_ip_key, EXPIRE_TIME)]);
         if (userSession && userSession.isLogin()) {
             const accountId = userSession.getSessionInfo().accountId;
             // 统计 UV
-            await Promise.all([
-                client.sadd(uv_uid_key, accountId),
-                client.expire(uv_uid_key, EXPIRE_TIME)
-            ]);
+            await Promise.all([client.sadd(uv_uid_key, accountId), client.expire(uv_uid_key, EXPIRE_TIME)]);
         }
     }
-    ;
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/WorkbenchService.d.ts

@@ -5,15 +5,48 @@ import { IScheduleService } from '../interface';
 export declare class WorkbenchService extends BaseService implements IScheduleService {
     ctx: Context;
     private curdProService;
+    private fatcmsTargetWorkbenchCode;
     clearCache(): void;
     runBySchedule(): Promise<void>;
+    /**
+     * 获取所有站点列表
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     getAllWorkbenchInfoList(isForceRefresh?: boolean): Promise<IWorkbenchEntity[]>;
+    /**
+     * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     getAllWorkbenchInfoMap(isForceRefresh?: boolean): Promise<Record<any, IWorkbenchEntity>>;
+    /**
+     * 检查站点编码是否匹配
+     * @param workbench_code_array 站点编码数组
+     * @param workbench_code 站点编码
+     * @returns
+     */
     isMatchWorkbenchCode(workbench_code_array: string | string[], workbench_code: string): boolean;
+    /**
+     * 根据站点编码获取站点信息
+     * @param workbenchCode 站点编码
+     * @returns
+     */
+    private getWorkbenchInfoByCode;
+    /**
+     * 根据域名获取站点信息
+     * @param host 域名
+     * @returns
+     */
+    private getWorkbenchInfoByHost;
     /**
      * 获取当前请求的域名所对应的站点信息
      */
     getCurrentHostWorkbenchInfo(): Promise<IWorkbenchEntity>;
+    /**
+     * 获取当前请求的域名
+     * @returns
+     */
     private getCurrentHost;
     isSupportCurrentWorkbench(workbench_code_array: string | string[]): Promise<boolean>;
     isSupportCurrentHostForForMiddleware(): Promise<string | boolean>;