@whyour/qinglong 2.21.0-1 → 2.21.0-3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whyour/qinglong",
   "packageManager": "pnpm@8.3.1",
-  "version": "2.21.0-1",
+  "version": "2.21.0-3",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/static/build/api/cron.js

@@ -247,8 +247,8 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const cronService = typedi_1.Container.get(cron_1.default);
-            const data = await cronService.log(req.params.id);
-            return res.send({ code: 200, data });
+            const result = await cronService.log(req.params.id);
+            return res.send({ code: 200, data: result.content, logStatus: result.status });
         }
         catch (e) {
             return next(e);

package/static/build/api/dashboard.js

@@ -10,6 +10,8 @@ const cronStats_1 = require("../data/cronStats");
 const runningInstance_1 = require("../data/runningInstance");
 const dayjs_1 = __importDefault(require("dayjs"));
 const os_1 = __importDefault(require("os"));
+const lodash_1 = require("lodash");
+const i18n_1 = require("../shared/i18n");
 const route = (0, express_1.Router)();
 exports.default = (app) => {
     app.use('/dashboard', route);
@@ -153,7 +155,7 @@ exports.default = (app) => {
             crons.forEach((c) => { nameMap[c.id] = c.name || c.command; });
             const data = rows.map((r, i) => ({
                 rank: i + 1,
-                name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+                name: nameMap[Number(r.ref_id)] || (0, i18n_1.tf)('任务#%s', r.ref_id),
                 avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
                 maxTime: Number(r.max_time),
             }));
@@ -188,7 +190,7 @@ exports.default = (app) => {
             crons.forEach((c) => { nameMap[c.id] = c.name || c.command; });
             const data = rows.map((r, i) => ({
                 rank: i + 1,
-                name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+                name: nameMap[Number(r.ref_id)] || (0, i18n_1.tf)('任务#%s', r.ref_id),
                 runCount: Number(r.run_count),
                 avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
                 successRate: Number(r.run_count) > 0
@@ -232,7 +234,7 @@ exports.default = (app) => {
                 return {
                     instanceId: inst.id,
                     id: inst.cron_id,
-                    name: (cron === null || cron === void 0 ? void 0 : cron.name) || (cron === null || cron === void 0 ? void 0 : cron.command) || `任务#${inst.cron_id}`,
+                    name: (cron === null || cron === void 0 ? void 0 : cron.name) || (cron === null || cron === void 0 ? void 0 : cron.command) || (0, i18n_1.tf)('任务#%s', inst.cron_id),
                     pid: inst.pid,
                     elapsed: inst.started_at ? now - inst.started_at : 0,
                     logPath: inst.log_path,
@@ -257,7 +259,7 @@ exports.default = (app) => {
                     running,
                     idleTasks: idleTasks.map((c) => ({
                         id: c.id,
-                        name: c.name || c.command || `任务#${c.id}`,
+                        name: c.name || c.command || (0, i18n_1.tf)('任务#%s', c.id),
                         lastRun: c.last_execution_time
                             ? dayjs_1.default.unix(c.last_execution_time).format('MM-DD HH:mm')
                             : '-',
@@ -283,7 +285,12 @@ exports.default = (app) => {
                 let rawLabels = c.labels;
                 if (typeof rawLabels === 'string')
                     rawLabels = JSON.parse(rawLabels);
-                const labels = Array.isArray(rawLabels) && rawLabels.length > 0 ? rawLabels : ['未分类'];
+                const labels = Array.isArray(rawLabels)
+                    ? [...new Set(rawLabels.filter((l) => !(0, lodash_1.isEmpty)(l)))]
+                    : [];
+                if (labels.length === 0) {
+                    labels.push((0, i18n_1.t)('未分类'));
+                }
                 const st = statMap[c.id];
                 labels.forEach((label) => {
                     if (!labelMap[label])
@@ -318,7 +325,7 @@ exports.default = (app) => {
                 code: 200,
                 data: {
                     platform: os_1.default.platform(),
-                    uptime: Math.floor(os_1.default.uptime()),
+                    uptime: Math.floor(process.uptime()),
                     memTotal: os_1.default.totalmem(),
                     memFree: os_1.default.freemem(),
                     memUsagePercent: ((1 - os_1.default.freemem() / os_1.default.totalmem()) * 100).toFixed(1),

package/static/build/config/index.js

@@ -87,8 +87,6 @@ const extraFile = path_1.default.join(configPath, 'extra.sh');
 const confBakDir = path_1.default.join(dataPath, 'config/bak/');
 const sampleFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sqliteFile = path_1.default.join(samplePath, 'database.sqlite');
-const authError = '错误的用户名密码，请重试';
-const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path_1.default.join(rootPath, 'version.yaml');
 const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
@@ -105,8 +103,6 @@ exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, ba
     shareShellFile,
     dependenceProxyFile,
     configString,
-    loginFaild,
-    authError,
     logPath,
     extraFile,
     authConfigFile,

package/static/build/config/util.js

@@ -498,7 +498,7 @@ function safeJSONParse(value) {
         return JSON.parse(value);
     }
     catch (error) {
-        logger_1.default.error('[safeJSONParse失败]', error);
+        logger_1.default.error('[safeJSONParse error]', error);
         return {};
     }
 }
@@ -511,7 +511,7 @@ async function rmPath(path) {
         }
     }
     catch (error) {
-        logger_1.default.error('[rmPath失败]', error);
+        logger_1.default.error('[rmPath error]', error);
     }
 }
 exports.rmPath = rmPath;
@@ -525,7 +525,7 @@ async function setSystemTimezone(timezone) {
         return true;
     }
     catch (error) {
-        logger_1.default.error('[setSystemTimezone失败]', error);
+        logger_1.default.error('[setSystemTimezone error]', error);
         return false;
     }
 }

package/static/build/data/sock.js

@@ -6,6 +6,7 @@ class SockMessage {
         this.type = options.type;
         this.message = options.message;
         this.references = options.references;
+        this.status = options.status;
     }
 }
 exports.SockMessage = SockMessage;

package/static/build/loaders/initTask.js

@@ -11,6 +11,7 @@ const sshKey_1 = __importDefault(require("../services/sshKey"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
 const path_1 = require("path");
+const i18n_1 = require("../shared/i18n");
 exports.default = async () => {
     const systemService = typedi_1.Container.get(system_1.default);
     const scheduleService = typedi_1.Container.get(schedule_1.default);
@@ -24,7 +25,7 @@ exports.default = async () => {
     }
     const cron = {
         id: NaN,
-        name: '生成token',
+        name: (0, i18n_1.t)('生成token'),
         command: tokenCommand,
         runOrigin: 'system',
     };
@@ -38,7 +39,7 @@ exports.default = async () => {
         if (data.info.logRemoveFrequency) {
             const rmlogCron = {
                 id: data.id,
-                name: '删除日志',
+                name: (0, i18n_1.t)('删除日志'),
                 command: `ql rmlog ${data.info.logRemoveFrequency}`,
                 runOrigin: 'system',
             };

package/static/build/services/cron.js

@@ -588,21 +588,24 @@ let CronService = class CronService {
     async log(id) {
         const doc = await this.getDb({ id });
         if (!doc) {
-            return '';
+            return { content: '', status: 'empty' };
         }
         if (doc.log_name === '/dev/null') {
-            return '日志设置为忽略';
+            return { content: (0, i18n_1.t)('日志设置为忽略'), status: 'ignored' };
         }
         const absolutePath = path_1.default.resolve(config_1.default.logPath, `${doc.log_path}`);
         const logFileExist = doc.log_path && (await (0, util_1.fileExist)(absolutePath));
         if (logFileExist) {
-            return await (0, util_1.getFileContentByName)(`${absolutePath}`);
+            const content = await (0, util_1.getFileContentByName)(`${absolutePath}`);
+            const isRunning = typeof doc.status === 'number' &&
+                [cron_1.CrontabStatus.running, cron_1.CrontabStatus.queued].includes(doc.status);
+            return { content, status: isRunning ? 'running' : 'completed' };
         }
         else {
             return typeof doc.status === 'number' &&
                 [cron_1.CrontabStatus.queued, cron_1.CrontabStatus.running].includes(doc.status)
-                ? '运行中...'
-                : '日志不存在...';
+                ? { content: (0, i18n_1.t)('运行中...'), status: 'running' }
+                : { content: (0, i18n_1.t)('日志不存在...'), status: 'notFound' };
         }
     }
     async logs(id) {

package/static/build/services/dependence.js

@@ -38,6 +38,7 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const util_2 = require("../config/util");
 const const_1 = require("../config/const");
+const i18n_1 = require("../shared/i18n");
 let DependenceService = class DependenceService {
     constructor(logger, sockService) {
         this.logger = logger;
@@ -183,7 +184,7 @@ let DependenceService = class DependenceService {
                 }
                 const depIds = [dependency.id];
                 let depName = dependency.name.trim();
-                const actionText = isInstall ? '安装' : '删除';
+                const actionText = isInstall ? (0, i18n_1.t)('安装') : (0, i18n_1.t)('删除');
                 const socketMessageType = isInstall
                     ? 'installDependence'
                     : 'uninstallDependence';
@@ -197,11 +198,12 @@ let DependenceService = class DependenceService {
                     if (!osType) {
                         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.installFailed }, { where: { id: depIds } });
                         const startTime = (0, dayjs_1.default)();
-                        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n当前系统不支持\n\n依赖${actionText}失败，结束时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${startTime.diff(startTime, 'second')} 秒`;
+                        const message = (0, i18n_1.tf)('开始%s依赖 %s，开始时间 %s\n\n当前系统不支持\n\n依赖%s失败，结束时间 %s，耗时 %s 秒', actionText, depName, startTime.format('YYYY-MM-DD HH:mm:ss'), actionText, startTime.format('YYYY-MM-DD HH:mm:ss'), String(startTime.diff(startTime, 'second')));
                         this.sockService.sendMessage({
                             type: socketMessageType,
                             message,
                             references: depIds,
+                            status: dependence_1.DependenceStatus.installFailed,
                         });
                         this.updateLog(depIds, message);
                         return resolve(null);
@@ -221,11 +223,12 @@ let DependenceService = class DependenceService {
                         : `${linuxCommand.uninstall} ${depName.trim()}`;
                 }
                 const startTime = (0, dayjs_1.default)();
-                const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
+                const message = (0, i18n_1.tf)('开始%s依赖 %s，开始时间 %s\n\n', actionText, depName, startTime.format('YYYY-MM-DD HH:mm:ss'));
                 this.sockService.sendMessage({
                     type: socketMessageType,
                     message,
                     references: depIds,
+                    status,
                 });
                 this.updateLog(depIds, message);
                 // 判断是否已经安装过依赖
@@ -254,11 +257,12 @@ let DependenceService = class DependenceService {
                             isPythonDependence) &&
                         (!depVersion || depInfo.includes(depVersion))) {
                         const endTime = (0, dayjs_1.default)();
-                        const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                        const _message = (0, i18n_1.tf)('检测到已经安装 %s\n\n%s\n\n跳过安装\n\n依赖%s成功，结束时间 %s，耗时 %s 秒', depName, depInfo, actionText, endTime.format('YYYY-MM-DD HH:mm:ss'), String(endTime.diff(startTime, 'second')));
                         this.sockService.sendMessage({
                             type: socketMessageType,
                             message: _message,
                             references: depIds,
+                            status: dependence_1.DependenceStatus.installed,
                         });
                         this.updateLog(depIds, _message);
                         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.installed }, { where: { id: depIds } });
@@ -277,6 +281,7 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: data.toString(),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, data.toString());
                 });
@@ -285,6 +290,7 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: data.toString(),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, data.toString());
                 });
@@ -293,37 +299,32 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: JSON.stringify(err),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, JSON.stringify(err));
                 });
                 cp.on('exit', async (code) => {
                     const endTime = (0, dayjs_1.default)();
                     const isSucceed = code === 0;
-                    const resultText = isSucceed ? '成功' : '失败';
-                    const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                    const resultText = isSucceed ? (0, i18n_1.t)('成功') : (0, i18n_1.t)('失败');
+                    const message = '\n' +
+                        (0, i18n_1.tf)('依赖%s%s，结束时间 %s，耗时 %s 秒', actionText, resultText, endTime.format('YYYY-MM-DD HH:mm:ss'), String(endTime.diff(startTime, 'second')));
+                    const exitStatus = isSucceed
+                        ? (isInstall ? dependence_1.DependenceStatus.installed : dependence_1.DependenceStatus.removed)
+                        : (isInstall ? dependence_1.DependenceStatus.installFailed : dependence_1.DependenceStatus.removeFailed);
                     this.sockService.sendMessage({
                         type: socketMessageType,
                         message,
                         references: depIds,
+                        status: exitStatus,
                     });
                     this.updateLog(depIds, message);
-                    let status;
-                    if (isSucceed) {
-                        status = isInstall
-                            ? dependence_1.DependenceStatus.installed
-                            : dependence_1.DependenceStatus.removed;
-                    }
-                    else {
-                        status = isInstall
-                            ? dependence_1.DependenceStatus.installFailed
-                            : dependence_1.DependenceStatus.removeFailed;
-                    }
                     const docs = await dependence_1.DependenceModel.findAll({ where: { id: depIds } });
                     const _docIds = docs
                         .filter((x) => x.status !== dependence_1.DependenceStatus.cancelled)
                         .map((x) => x.id);
                     if (_docIds.length > 0) {
-                        await dependence_1.DependenceModel.update({ status }, { where: { id: _docIds } });
+                        await dependence_1.DependenceModel.update({ status: exitStatus }, { where: { id: _docIds } });
                     }
                     // 如果删除依赖成功或者强制删除
                     if ((isSucceed || force) && !isInstall) {

package/static/build/services/notify.js

@@ -306,7 +306,7 @@ let NotificationService = class NotificationService {
                     {
                         title: `${this.title}`,
                         thumb_media_id,
-                        author: `智能助手`,
+                        author: (0, i18n_1.t)('智能助手'),
                         content_source_url: ``,
                         content: `${this.content.replace(/\n/g, '<br/>')}`,
                         digest: `${this.content}`,
@@ -322,7 +322,7 @@ let NotificationService = class NotificationService {
                         title: `${this.title}`,
                         description: `${this.content}`,
                         url: 'https://github.com/whyour/qinglong',
-                        btntxt: '更多',
+                        btntxt: (0, i18n_1.t)('更多'),
                     },
                 };
                 break;
@@ -361,7 +361,7 @@ let NotificationService = class NotificationService {
                     roomName: `${aibotkName}`,
                     message: {
                         type: 1,
-                        content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+                        content: `【${(0, i18n_1.t)('青龙快讯')}】\n\n${this.title}\n${this.content}`,
                     },
                 };
                 break;
@@ -372,7 +372,7 @@ let NotificationService = class NotificationService {
                     name: `${aibotkName}`,
                     message: {
                         type: 1,
-                        content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+                        content: `【${(0, i18n_1.t)('青龙快讯')}】\n\n${this.title}\n${this.content}`,
                     },
                 };
                 break;
@@ -507,7 +507,7 @@ let NotificationService = class NotificationService {
                 },
             });
             const info = await transporter.sendMail({
-                from: `"青龙快讯" <${emailUser}>`,
+                from: `"${(0, i18n_1.t)('青龙快讯')}" <${emailUser}>`,
                 to: recipients,
                 subject: `${this.title}`,
                 html: `${this.content.replace(/\n/g, '<br/>')}`,

package/static/build/services/subscription.js

@@ -126,12 +126,12 @@ let SubscriptionService = class SubscriptionService {
                     status: subscription_1.SubscriptionStatus.running,
                     log_path: logPath,
                 }, { where: { id: doc.id } });
-                const absolutePath = await (0, util_1.handleLogPath)(logPath, `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`);
+                const absolutePath = await (0, util_1.handleLogPath)(logPath, (0, i18n_1.tf)('## 开始执行... %s\n', startTime.format('YYYY-MM-DD HH:mm:ss')));
                 // 执行sub_before
                 let beforeStr = '';
                 try {
                     if (doc.sub_before) {
-                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n## 执行before命令...\n\n`);
+                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n## ${(0, i18n_1.t)('执行before命令...')}\n\n`);
                         beforeStr = await (0, util_1.promiseExec)(doc.sub_before);
                     }
                 }
@@ -155,7 +155,7 @@ let SubscriptionService = class SubscriptionService {
                 let afterStr = '';
                 try {
                     if (sub.sub_after) {
-                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n\n## 执行after命令...\n\n`);
+                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n\n## ${(0, i18n_1.t)('执行after命令...')}\n\n`);
                         afterStr = await (0, util_1.promiseExec)(sub.sub_after);
                     }
                 }
@@ -166,7 +166,9 @@ let SubscriptionService = class SubscriptionService {
                 if (afterStr) {
                     await logStreamManager_1.logStreamManager.write(absolutePath, `${afterStr}\n`);
                 }
-                await logStreamManager_1.logStreamManager.write(absolutePath, `\n## 执行结束... ${endTime.format('YYYY-MM-DD HH:mm:ss')}  耗时 ${diff} 秒${const_1.LOG_END_SYMBOL}`);
+                await logStreamManager_1.logStreamManager.write(absolutePath, '\n' +
+                    (0, i18n_1.tf)('## 执行结束... %s  耗时 %s 秒', endTime.format('YYYY-MM-DD HH:mm:ss'), String(diff)) +
+                    const_1.LOG_END_SYMBOL);
                 // Close the stream after task completion
                 await logStreamManager_1.logStreamManager.closeStream(absolutePath);
                 await subscription_1.SubscriptionModel.update({ status: subscription_1.SubscriptionStatus.idle, pid: undefined }, { where: { id: sub.id } });

package/static/build/services/system.js

@@ -72,7 +72,7 @@ let SystemService = class SystemService {
     }
     async updateNotificationMode(notificationInfo) {
         const code = Math.random().toString().slice(-6);
-        const isSuccess = await this.notificationService.testNotify(notificationInfo, '青龙', `【蛟龙】测试通知 https://t.me/jiao_long`);
+        const isSuccess = await this.notificationService.testNotify(notificationInfo, (0, i18n_1.t)('青龙'), (0, i18n_1.t)('【蛟龙】测试通知 https://t.me/jiao_long'));
         if (isSuccess) {
             const result = await this.updateAuthDb({
                 type: system_1.AuthDataType.notification,
@@ -90,7 +90,7 @@ let SystemService = class SystemService {
         const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), info) }));
         const cron = {
             id: result.id,
-            name: '删除日志',
+            name: (0, i18n_1.t)('删除日志'),
             command: `ql rmlog ${info.logRemoveFrequency}`,
             runOrigin: 'system',
         };
@@ -149,6 +149,7 @@ let SystemService = class SystemService {
                 this.sockService.sendMessage({
                     type: 'updateNodeMirror',
                     message: 'update node mirror end',
+                    status: 'completed',
                 });
             },
             onError: async (message) => {
@@ -189,6 +190,7 @@ let SystemService = class SystemService {
                 this.sockService.sendMessage({
                     type: 'updateLinuxMirror',
                     message: 'update linux mirror end',
+                    status: 'completed',
                 });
                 onEnd === null || onEnd === void 0 ? void 0 : onEnd();
                 if (!hasError) {
@@ -277,6 +279,14 @@ let SystemService = class SystemService {
             this.sockService.sendMessage({
                 type: 'updateSystemVersion',
                 message: JSON.stringify(err),
+                status: 'failed',
+            });
+        });
+        cp.on('exit', (code) => {
+            this.sockService.sendMessage({
+                type: 'updateSystemVersion',
+                message: '',
+                status: code === 0 ? 'success' : 'failed',
             });
         });
         return { code: 200 };

package/static/build/services/user.js

@@ -49,7 +49,7 @@ let UserService = class UserService {
             const waitTime = Math.ceil((retriesTime - (timestamp - lastlogon)) / 1000);
             return {
                 code: 410,
-                message: `失败次数过多，请${waitTime}秒后重试`,
+                message: (0, i18n_1.tf)('失败次数过多，请%s秒后重试', waitTime),
                 data: waitTime,
             };
         }
@@ -98,7 +98,18 @@ let UserService = class UserService {
                 platform: req.platform,
                 isTwoFactorChecking: false,
             });
-            this.notificationService.notify('登录通知', `你于${(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform}端 登录成功，ip地址 ${ip}`);
+            this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
+                (0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
+                (0, i18n_1.t)('在') +
+                address +
+                ' ' +
+                req.platform +
+                (0, i18n_1.t)('端') +
+                ' ' +
+                (0, i18n_1.t)('登录成功') +
+                (0, i18n_1.t)('，ip地址') +
+                ' ' +
+                ip);
             await this.insertDb({
                 type: system_1.AuthDataType.loginLog,
                 info: {
@@ -130,7 +141,18 @@ let UserService = class UserService {
                 lastaddr: address,
                 platform: req.platform,
             });
-            this.notificationService.notify('登录通知', `你于${(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform}端 登录失败，ip地址 ${ip}`);
+            this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
+                (0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
+                (0, i18n_1.t)('在') +
+                address +
+                ' ' +
+                req.platform +
+                (0, i18n_1.t)('端') +
+                ' ' +
+                (0, i18n_1.t)('登录失败') +
+                (0, i18n_1.t)('，ip地址') +
+                ' ' +
+                ip);
             await this.insertDb({
                 type: system_1.AuthDataType.loginLog,
                 info: {
@@ -146,12 +168,12 @@ let UserService = class UserService {
                 const waitTime = Math.round(Math.pow(3, retries + 1));
                 return {
                     code: 410,
-                    message: `失败次数过多，请${waitTime}秒后重试`,
+                    message: (0, i18n_1.tf)('失败次数过多，请%s秒后重试', waitTime),
                     data: waitTime,
                 };
             }
             else {
-                return { code: 400, message: config_1.default.authError };
+                return { code: 400, message: (0, i18n_1.t)('错误的用户名密码，请重试') };
             }
         }
     }
@@ -308,7 +330,7 @@ let UserService = class UserService {
     }
     async updateNotificationMode(notificationInfo) {
         const code = Math.random().toString().slice(-6);
-        const isSuccess = await this.notificationService.testNotify(notificationInfo, '青龙', `【蛟龙】测试通知 https://t.me/jiao_long`);
+        const isSuccess = await this.notificationService.testNotify(notificationInfo, (0, i18n_1.t)('青龙'), (0, i18n_1.t)('【蛟龙】测试通知 https://t.me/jiao_long'));
         if (isSuccess) {
             const result = await this.updateAuthDb({
                 type: system_1.AuthDataType.notification,

package/static/build/shared/i18n.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.t = exports.getLang = exports.setLang = void 0;
+exports.tf = exports.t = exports.getLang = exports.setLang = void 0;
 const messages = {
     zh: {},
     en: {
@@ -83,6 +83,46 @@ const messages = {
         '订阅执行完成': 'Subscription completed',
         'wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行': 'wxPusher requires at least one of TopicIds or Uids',
         'Url 或者 Body 中必须包含 $title': 'Url or Body must contain $title',
+        '绝对路径必须在日志目录内或使用 /dev/null': 'Absolute path must be within log directory or use /dev/null',
+        '请先登录!': 'Please login first!',
+        '运行中...': 'Running...',
+        '日志不存在...': 'Log does not exist...',
+        '未分类': 'Uncategorized',
+        '任务重复运行': 'Duplicate task execution',
+        '日志设置为忽略': 'Log set to ignore',
+        '定时规则不能为空': 'Schedule rule cannot be empty',
+        '无效的定时规则': 'Invalid schedule rule',
+        '日志名称只能包含字母、数字、下划线和连字符': 'Log name can only contain letters, numbers, underscores, and hyphens',
+        '日志名称不能超过100个字符': 'Log name cannot exceed 100 characters',
+        '错误的用户名密码，请重试': 'Incorrect username or password, please try again',
+        '青龙快讯': 'QingLong',
+        '登录通知': 'Login Notification',
+        '你于': 'You at ',
+        '在': ' in ',
+        端: '',
+        登录失败: 'login failed',
+        '，ip地址': ', IP: ',
+        '任务#%s': 'Task#%s',
+        安装: 'Install',
+        删除: 'Uninstall',
+        成功: 'Succeeded',
+        失败: 'Failed',
+        '失败次数过多，请%s秒后重试': 'Too many failed attempts, please retry in %s seconds',
+        智能助手: 'Smart Assistant',
+        更多: 'More',
+        '开始%s依赖 %s，开始时间 %s\n\n当前系统不支持\n\n依赖%s失败，结束时间 %s，耗时 %s 秒': 'Start %s dependency %s, start time %s\n\nCurrent system not supported\n\nDependency %s failed, end time %s, elapsed %s seconds',
+        '检测到已经安装 %s\n\n%s\n\n跳过安装\n\n依赖%s成功，结束时间 %s，耗时 %s 秒': 'Already installed %s\n\n%s\n\nSkipping install\n\nDependency %s succeeded, end time %s, elapsed %s seconds',
+        '开始%s依赖 %s，开始时间 %s\n\n': 'Start %s dependency %s, start time %s\n\n',
+        '依赖%s%s，结束时间 %s，耗时 %s 秒': 'Dependency %s%s, end time %s, elapsed %s seconds',
+        '任务：%s，命令：%s，定时：%s，处于运行中的超过 %d 个，请检查定时设置': 'Task: %s, command: %s, schedule: %s, more than %d instances running, please check schedule settings',
+        青龙: 'QingLong',
+        '【蛟龙】测试通知 https://t.me/jiao_long': '[JiaoLong] Test notification https://t.me/jiao_long',
+        '生成token': 'Generate token',
+        '删除日志': 'Delete logs',
+        '## 开始执行... %s\n': '## Start executing... %s\n',
+        '执行before命令...': 'Execute before command...',
+        '执行after命令...': 'Execute after command...',
+        '## 执行结束... %s  耗时 %s 秒': '## Execution finished... %s  elapsed %s seconds',
     },
 };
 let currentLang = 'zh';
@@ -102,4 +142,8 @@ function t(key, lang) {
     return key;
 }
 exports.t = t;
+function tf(key, ...args) {
+    return args.reduce((str, arg) => str.replace(/%s|%d/, String(arg)), t(key));
+}
+exports.tf = tf;
 //# sourceMappingURL=i18n.js.map

package/static/build/shared/pLimit.js

@@ -8,6 +8,7 @@ const os_1 = __importDefault(require("os"));
 const system_1 = require("../data/system");
 const logger_1 = __importDefault(require("../loaders/logger"));
 const notify_1 = __importDefault(require("../services/notify"));
+const i18n_1 = require("../shared/i18n");
 const config_1 = __importDefault(require("../config"));
 const grpc_js_1 = require("@grpc/grpc-js");
 const api_1 = require("../protos/api");
@@ -117,8 +118,8 @@ class TaskLimit {
             if (repeatTimes < 3) {
                 this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
                 this.client.systemNotify({
-                    title: '任务重复运行',
-                    content: `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
+                    title: (0, i18n_1.t)('任务重复运行'),
+                    content: (0, i18n_1.tf)('任务：%s，命令：%s，定时：%s，处于运行中的超过 %d 个，请检查定时设置', cron.name || '', cron.command || '', cron.schedule || '', 5),
                 }, (err, res) => {
                     if (err) {
                         logger_1.default.error(`[schedule][任务重复运行] 通知失败 ${JSON.stringify(err)}`);