@nger/fk-upload 1.0.186 → 1.0.189

package/dist/entities/fk-download-task.entity.d.ts

@@ -11,6 +11,7 @@ export declare class FkDownloadTaskEntity {
     loginId: number;
     fileMd5: string;
     topicId: number;
+    topicName: string;
     createDate: Date;
     updateDate: Date;
     isBigFile: boolean;

package/dist/entities/fk-download-task.entity.js

@@ -16,6 +16,7 @@ let FkDownloadTaskEntity = class FkDownloadTaskEntity {
     loginId;
     fileMd5;
     topicId;
+    topicName;
     createDate;
     updateDate;
     isBigFile;
@@ -91,6 +92,13 @@ tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "topicId", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'topic_name',
+        default: ``
+    }),
+    tslib_1.__metadata("design:type", String)
+], FkDownloadTaskEntity.prototype, "topicName", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.CreateDateColumn)({
         name: 'create_date'

package/dist/templates/task-manage.js

@@ -103,9 +103,11 @@ let TaskManageController = class TaskManageController {
         const skip = (page - 1) * psize;
         const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where, order: { createDate: "DESC" }, take, skip });
         await Promise.all(tasks.map(async (task) => {
-            const topic = await this.w7.manager.findOne(w7_1.W7ChatTopicEntity, { where: { id: task.topicId } });
-            if (topic) {
-                Reflect.set(topic, 'topicName', topic.topicName);
+            if (!task.topicName) {
+                const topic = await this.w7.manager.findOne(w7_1.W7ChatTopicEntity, { where: { id: task.topicId } });
+                if (topic) {
+                    task.topicName = topic.topicName;
+                }
             }
         }));
         const count = await this.db.manager.count(entities_1.FkDownloadTaskEntity, { where });
@@ -156,7 +158,7 @@ let TaskManageController = class TaskManageController {
                 link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
                 key: 3
             }];
-        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?ffilename=${filename}&callback=/@nger/fk-uplaod/task-manage?${this.toUrl({
+        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=/@nger/fk-uplaod/task-manage?${this.toUrl({
             ...query
         })}`;
         const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
@@ -219,8 +221,8 @@ let TaskManageController = class TaskManageController {
                         react_1.default.createElement("td", null, login.username),
                         react_1.default.createElement("td", null, login.pass),
                         react_1.default.createElement("td", null, login.w7Username),
-                        react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDay()}日:${task.createDate.getMinutes()}分`),
-                        react_1.default.createElement("td", null, Reflect.get(task, 'topicName')),
+                        react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDate()}日 ${task.createDate.getHours()}时:${task.createDate.getMinutes()}分`),
+                        react_1.default.createElement("td", null, task.topicName),
                         react_1.default.createElement("td", null,
                             react_1.default.createElement("input", { type: "hidden", id: task.filename + '-copy', onChange: () => { }, value: task.uploadUrl }),
                             react_1.default.createElement("a", { className: "btn", target: "_blank", href: url }, "\u4E0B\u8F7D"),

package/dist/templates/tasks/schedule-task.js

@@ -64,6 +64,7 @@ class ScheduleTask extends rabbitmq_1.Task {
                         fkdownloadTask.path = download.path;
                         fkdownloadTask.url = download.url;
                         fkdownloadTask.topicId = download.topicId;
+                        fkdownloadTask.topicName = topic.topicName;
                         await db.manager.save(entities_1.FkDownloadTaskEntity, fkdownloadTask);
                         await manager.send(task);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.186",
+  "version": "1.0.189",
   "description": "nger fk upload",
   "main": "dist/electon.js",
   "types": "dist/core.d.ts",