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

package/dist/service/UserSessionService.js

@@ -1,157 +1,166 @@
-"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.UserSessionService = void 0;
-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;
-    }
-    if (typeof avatar === 'string') {
-        if (avatar.startsWith('http') || avatar.startsWith('/')) {
-            return avatar;
-        }
-        const obj = (0, functions_1.parseJsonObject)(avatar);
-        if (!obj) {
-            return null;
-        }
-        if (Array.isArray(obj)) {
-            return pickUserAvatar(obj[0]);
-        }
-        return pickUserAvatar(obj);
-    }
-    if (avatar && avatar.imgURL) {
-        return avatar.imgURL;
-    }
-    if (avatar && avatar.downloadURL) {
-        return avatar.downloadURL;
-    }
-    return null;
-}
-const SESSION_KEEP_TIME_SECOND = 3600 * 24 * 30;
-const toCacheKey = (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;
-    }
-    /**
-     * 保存用户会话信息。
-     * 用户登录后，在业务的项目中，可以调用此函数，更新bizExt字段
-     * @param sessionInfo
-     */
-    async saveUserSession(sessionInfo) {
-        sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
-        const sessionId = sessionInfo.sessionId;
-        const keepTime = this.getSessionKeepTimeSecond();
-        await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, keepTime);
-    }
-    /**
-     * 移除Session
-     * @param sessionId
-     */
-    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);
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], UserSessionService.prototype, "ctx", void 0);
-__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);
-exports.UserSessionService = UserSessionService;
+"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.UserSessionService = void 0;
+const core_1 = require("@midwayjs/core");
+const functions_1 = require("../libs/utils/functions");
+const userSession_1 = require("../models/userSession");
+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");
+const CacheServiceFactory_1 = require("./base/cache/CacheServiceFactory");
+const SystemEntities_1 = require("../models/SystemEntities");
+function pickUserAvatar(avatar) {
+    if (!avatar) {
+        return null;
+    }
+    if (typeof avatar === 'string') {
+        if (avatar.startsWith('http') || avatar.startsWith('/')) {
+            return avatar;
+        }
+        const obj = (0, functions_1.parseJsonObject)(avatar);
+        if (!obj) {
+            return null;
+        }
+        if (Array.isArray(obj)) {
+            return pickUserAvatar(obj[0]);
+        }
+        return pickUserAvatar(obj);
+    }
+    if (avatar && avatar.imgURL) {
+        return avatar.imgURL;
+    }
+    if (avatar && avatar.downloadURL) {
+        return avatar.downloadURL;
+    }
+    return null;
+}
+const SESSION_KEEP_TIME_SECOND = 3600 * 24 * 7;
+let UserSessionService = class UserSessionService {
+    /**
+     * 获取用户会话保持时间: 单位秒
+     * @returns
+     */
+    getSessionKeepTimeSecond() {
+        if (typeof this.fatcmsUserSessionKeepTimeSecond === 'number' && this.fatcmsUserSessionKeepTimeSecond > 0) {
+            return this.fatcmsUserSessionKeepTimeSecond;
+        }
+        return SESSION_KEEP_TIME_SECOND;
+    }
+    /**
+     * 获取用户会话缓存服务
+     * @returns
+     */
+    getUserSessionCacheService() {
+        return this.cacheServiceFactory.getCacheService(SystemEntities_1.CacheLevelEnum.REDIS, SystemEntities_1.CacheNameEnum.UserSessionBySessionId);
+    }
+    /**
+     * 保存用户会话信息。
+     * 用户登录后，在业务的项目中，可以调用此函数，更新bizExt字段
+     * @param sessionInfo
+     */
+    async saveUserSession(sessionInfo) {
+        sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
+        const sessionId = sessionInfo.sessionId;
+        const keepTime = this.getSessionKeepTimeSecond();
+        const userSessionCache = this.getUserSessionCacheService();
+        await userSessionCache.setJsonObject(sessionId, sessionInfo, keepTime);
+    }
+    /**
+     * 移除Session
+     * @param sessionId
+     */
+    async removeUserSession(sessionId) {
+        const userSessionCache = this.getUserSessionCacheService();
+        return await userSessionCache.removeItem(sessionId);
+    }
+    /**
+     * 获取用户会话信息
+     * @param sessionId
+     * @returns
+     */
+    async getCurrentUserSessionForMiddleware1(sessionId) {
+        if (!sessionId) {
+            return null;
+        }
+        const userSessionCache = this.getUserSessionCacheService();
+        return await userSessionCache.getJsonObject(sessionId);
+    }
+    /**
+     * 从异步任务队列中获取当时用户的Session信息
+     * @param asyncTaskId
+     */
+    async getCurrentUserSessionByAsyncTaskId(asyncTaskId) {
+        const taskSessionCacheKey = `${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);
+        };
+        const sessionInfo1 = await this.cacheServiceFactory.getJsonObjectCache({
+            cacheLevel: SystemEntities_1.CacheLevelEnum.REDIS,
+            cacheName: SystemEntities_1.CacheNameEnum.UserSessionByAsyncTaskId,
+            cacheKey: taskSessionCacheKey,
+            cacheSecond: 3600,
+            getter: loadSessionInfo,
+        });
+        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);
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], UserSessionService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], UserSessionService.prototype, "cacheServiceFactory", 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);
+exports.UserSessionService = UserSessionService;

package/dist/service/VisitStatService.d.ts

@@ -1,14 +1,14 @@
-import { Context } from '@midwayjs/koa';
-import { IScheduleService } from '../interface';
-import { BaseService } from './base/BaseService';
-export declare class VisitStatService extends BaseService implements IScheduleService {
-    protected ctx: Context;
-    private curdProService;
-    runBySchedule(): Promise<any>;
-    flushVisitStatToDB(): Promise<any>;
-    /**
-     * 统计请求数据
-     */
-    trackRequest(resource: string, resourceType: string): Promise<void>;
-    private trackRequestImpl;
-}
+import { Context } from '@midwayjs/koa';
+import { IScheduleService } from '../interface';
+import { BaseService } from './base/BaseService';
+export declare class VisitStatService extends BaseService implements IScheduleService {
+    protected ctx: Context;
+    private curdProService;
+    runBySchedule(): Promise<any>;
+    flushVisitStatToDB(): Promise<any>;
+    /**
+     * 统计请求数据
+     */
+    trackRequest(resource: string, resourceType: string): Promise<void>;
+    private trackRequestImpl;
+}