midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.22

package/dist/schedule/anonymousContext.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANONYMOUS_CONTEXT = void 0;
+const contextLogger_1 = require("../models/contextLogger");
+const Transaction_1 = require("../libs/crud-pro/models/Transaction");
+const userSession_1 = require("../models/userSession");
+const anonymousUserInfo = {
+    nickName: 'anonymous_user',
+    avatar: '',
+    roleCodes: [],
+    functionCodes: [],
+    loginName: 'anonymous_user',
+    sessionId: '',
+    accountId: '',
+    workbenchCode: '',
+    accountType: userSession_1.SYS_ACCOUNT_TYPE,
+};
+const anonymousWorkbenchInfo = {
+    id: 0,
+    workbench_code: 'anonymous_workbench',
+    workbench_name: 'anonymous_workbench',
+    workbench_domain: 'anonymous_workbench',
+    workbench_desc: 'anonymous_workbench',
+    html_content: 'anonymous_workbench',
+    status: 1,
+    workbench_type: 0,
+};
+class AnonymousContext {
+    setApp(app) {
+        this.app = app;
+    }
+    getApp() {
+        return this.app;
+    }
+    async runServiceAtAnonymousContext(runner) {
+        const app = this.app;
+        const ctx = app.createAnonymousContext();
+        ctx.app = app;
+        ctx.contextLogger = new contextLogger_1.ContextLogger(ctx);
+        ctx.transaction = new Transaction_1.Transaction();
+        ctx.userSession = new userSession_1.UserSessionInfo(anonymousUserInfo, true);
+        ctx.workbenchInfo = anonymousWorkbenchInfo;
+        let result = null;
+        let error = null;
+        try {
+            result = await runner(ctx);
+        }
+        catch (e) {
+            error = e;
+            ctx.logger.error(`runServiceAtAnonymousContext error `, e);
+        }
+        finally {
+            await ctx.transaction.releaseTx();
+        }
+        return { result: result, error: error };
+    }
+}
+const ANONYMOUS_CONTEXT = new AnonymousContext();
+exports.ANONYMOUS_CONTEXT = ANONYMOUS_CONTEXT;

package/dist/schedule/index.d.ts

@@ -1,3 +1,4 @@
-import * as koa from '@midwayjs/koa';
-declare function startSchedule(app: koa.Application, serviceList: string[]): Promise<void>;
-export { startSchedule };
+import { SCHEDULE_QUEUE, runScheduleTaskOnce } from './runSchedule';
+import { ANONYMOUS_CONTEXT } from './anonymousContext';
+import { INNER_SCHEDULE_INTERVAL } from './scheduleNames';
+export { INNER_SCHEDULE_INTERVAL, ANONYMOUS_CONTEXT, SCHEDULE_QUEUE, runScheduleTaskOnce };

package/dist/schedule/index.js

@@ -1,69 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startSchedule = void 0;
-const contextLogger_1 = require("../models/contextLogger");
-const Transaction_1 = require("../libs/crud-pro/models/Transaction");
-const userSession_1 = require("../models/userSession");
-const scheduleUserInfo = {
-    nickName: 'schedule_user',
-    avatar: '',
-    roleCodes: [],
-    functionCodes: [],
-    loginName: 'schedule_user',
-    sessionId: '',
-    accountId: '',
-    workbenchCode: '',
-    accountType: userSession_1.SYS_ACCOUNT_TYPE,
-};
-const scheduleWorkbenchInfo = {
-    id: 0,
-    workbench_code: 'schedule_workbench',
-    workbench_name: 'schedule_workbench',
-    workbench_domain: 'schedule_workbench',
-    workbench_desc: 'schedule_workbench',
-    html_content: 'schedule_workbench',
-    status: 1,
-    workbench_type: 0,
-};
-async function runScheduleService(app, serviceName) {
-    const ctx = app.createAnonymousContext();
-    ctx.app = app;
-    ctx.contextLogger = new contextLogger_1.ContextLogger(ctx);
-    ctx.transaction = new Transaction_1.Transaction();
-    ctx.userSession = new userSession_1.UserSessionInfo(scheduleUserInfo, true);
-    ctx.workbenchInfo = scheduleWorkbenchInfo;
-    try {
-        const serviceObject = await ctx.requestContext.getAsync(serviceName);
-        if (serviceObject && serviceObject.runBySchedule) {
-            await serviceObject.runBySchedule();
-        }
-        else {
-            ctx.logger.error(`runSchedule error , serviceName = ${serviceName}, 没有找到服务`);
-        }
-    }
-    catch (e) {
-        ctx.logger.error(`runSchedule error , serviceName = ${serviceName}`, e);
-    }
-    finally {
-        await ctx.transaction.releaseTx();
-    }
-}
-async function runSchedule(app, serviceList) {
-    for (let i = 0; i < serviceList.length; i++) {
-        const serviceName = serviceList[i];
-        try {
-            await runScheduleService(app, serviceName);
-        }
-        catch (e) {
-            const ctx = app.createAnonymousContext();
-            ctx.logger.error(`runSchedule error , serviceName = ${serviceName}`, e);
-        }
-    }
-}
-async function startSchedule(app, serviceList) {
-    await runSchedule(app, serviceList);
-    setInterval(() => {
-        runSchedule(app, serviceList);
-    }, 2 * 60 * 1000);
-}
-exports.startSchedule = startSchedule;
+exports.runScheduleTaskOnce = exports.SCHEDULE_QUEUE = exports.ANONYMOUS_CONTEXT = exports.INNER_SCHEDULE_INTERVAL = void 0;
+const runSchedule_1 = require("./runSchedule");
+Object.defineProperty(exports, "SCHEDULE_QUEUE", { enumerable: true, get: function () { return runSchedule_1.SCHEDULE_QUEUE; } });
+Object.defineProperty(exports, "runScheduleTaskOnce", { enumerable: true, get: function () { return runSchedule_1.runScheduleTaskOnce; } });
+const anonymousContext_1 = require("./anonymousContext");
+Object.defineProperty(exports, "ANONYMOUS_CONTEXT", { enumerable: true, get: function () { return anonymousContext_1.ANONYMOUS_CONTEXT; } });
+const scheduleNames_1 = require("./scheduleNames");
+Object.defineProperty(exports, "INNER_SCHEDULE_INTERVAL", { enumerable: true, get: function () { return scheduleNames_1.INNER_SCHEDULE_INTERVAL; } });

package/dist/schedule/runSchedule.d.ts

@@ -0,0 +1,15 @@
+declare function runScheduleTaskOnce(serviceName: string): Promise<{
+    result: any;
+    error: any;
+}>;
+declare class ScheduleQueue {
+    private scheduleIntervalMap;
+    setScheduleTask(serviceName: string, intervalTime: number): void;
+    removeScheduleTask(serviceName: string): void;
+    private isAlreadyTimeToExecute;
+    private runScheduleTaskOnceCheckTime;
+    private runScheduleServiceList;
+    startScheduleLoop(): Promise<void>;
+}
+declare const SCHEDULE_QUEUE: ScheduleQueue;
+export { SCHEDULE_QUEUE, runScheduleTaskOnce };

package/dist/schedule/runSchedule.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runScheduleTaskOnce = exports.SCHEDULE_QUEUE = void 0;
+const anonymousContext_1 = require("./anonymousContext");
+// 上次执行时间
+const lastExecuteTimeMap = {};
+const DEFAULT_SCHEDULE_INTERVAL = 2 * 60 * 1000;
+async function runScheduleTaskOnce(serviceName) {
+    return await anonymousContext_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
+        const serviceObject = await ctx.requestContext.getAsync(serviceName);
+        if (serviceObject && serviceObject.runBySchedule) {
+            await serviceObject.runBySchedule();
+        }
+        else {
+            ctx.logger.error(`runSchedule error , serviceName = ${serviceName}, 没有找到服务`);
+        }
+    });
+}
+exports.runScheduleTaskOnce = runScheduleTaskOnce;
+class ScheduleQueue {
+    constructor() {
+        this.scheduleIntervalMap = new Map();
+    }
+    setScheduleTask(serviceName, intervalTime) {
+        this.scheduleIntervalMap.set(serviceName, intervalTime);
+    }
+    removeScheduleTask(serviceName) {
+        this.scheduleIntervalMap.delete(serviceName);
+    }
+    isAlreadyTimeToExecute(serviceName) {
+        if (!lastExecuteTimeMap[serviceName]) {
+            return true; // 可以执行
+        }
+        const intervalTime1 = this.scheduleIntervalMap.get(serviceName);
+        const intervalTime = intervalTime1 || DEFAULT_SCHEDULE_INTERVAL; // 时间间隔
+        const lastExecuteTime = lastExecuteTimeMap[serviceName];
+        return (Date.now() - lastExecuteTime) >= intervalTime;
+    }
+    async runScheduleTaskOnceCheckTime(serviceName) {
+        // 还没有到可以执行时间
+        if (!this.isAlreadyTimeToExecute(serviceName)) {
+            return;
+        }
+        lastExecuteTimeMap[serviceName] = Date.now();
+        await runScheduleTaskOnce(serviceName);
+    }
+    async runScheduleServiceList() {
+        const serviceListKeys = this.scheduleIntervalMap.keys();
+        const serviceList = [...serviceListKeys];
+        for (let i = 0; i < serviceList.length; i++) {
+            const serviceName = serviceList[i];
+            try {
+                await this.runScheduleTaskOnceCheckTime(serviceName);
+            }
+            catch (e) {
+                anonymousContext_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error(`runSchedule error , serviceName = ${serviceName}`, e);
+            }
+        }
+    }
+    async startScheduleLoop() {
+        await this.runScheduleServiceList();
+        setInterval(() => {
+            this.runScheduleServiceList();
+        }, 1000); // 最少1秒执行一次
+    }
+}
+const SCHEDULE_QUEUE = new ScheduleQueue();
+exports.SCHEDULE_QUEUE = SCHEDULE_QUEUE;

package/dist/schedule/scheduleNames.d.ts

@@ -0,0 +1,13 @@
+declare const INNER_SCHEDULE_INTERVAL: {
+    proxyApiLoadService: number;
+    workbenchService: number;
+    visitStatService: number;
+    asyncTaskRunnerService: number;
+};
+declare const INNER_SCHEDULE_NAMES: {
+    proxyApiLoadService: string;
+    workbenchService: string;
+    visitStatService: string;
+    asyncTaskRunnerService: string;
+};
+export { INNER_SCHEDULE_INTERVAL, INNER_SCHEDULE_NAMES };

package/dist/schedule/scheduleNames.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.INNER_SCHEDULE_NAMES = exports.INNER_SCHEDULE_INTERVAL = void 0;
+const INNER_SCHEDULE_INTERVAL = {
+    proxyApiLoadService: 2 * 60 * 1000,
+    workbenchService: 60 * 1000,
+    visitStatService: 10 * 60 * 1000,
+    asyncTaskRunnerService: 1000, // 1s可以执行
+};
+exports.INNER_SCHEDULE_INTERVAL = INNER_SCHEDULE_INTERVAL;
+const INNER_SCHEDULE_NAMES = {
+    proxyApiLoadService: 'proxyApiLoadService',
+    workbenchService: 'workbenchService',
+    visitStatService: "visitStatService",
+    asyncTaskRunnerService: "asyncTaskRunnerService",
+};
+exports.INNER_SCHEDULE_NAMES = INNER_SCHEDULE_NAMES;

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,7 @@ 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");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
@@ -70,13 +71,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 +88,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.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.js

@@ -14,6 +14,7 @@ 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");
 function pickUserAvatar(avatar) {
     if (!avatar) {
         return null;
@@ -41,7 +42,7 @@ 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 {
     async saveUserSession(sessionInfo) {

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)(),