@nger/fk-upload 1.0.188 → 1.0.191
Sign up to get free protection for your applications and to get access to all the features.
@@ -16,6 +16,7 @@ let FkDownloadTaskEntity = class FkDownloadTaskEntity {
|
|
16
16
|
loginId;
|
17
17
|
fileMd5;
|
18
18
|
topicId;
|
19
|
+
topicName;
|
19
20
|
createDate;
|
20
21
|
updateDate;
|
21
22
|
isBigFile;
|
@@ -91,6 +92,13 @@ tslib_1.__decorate([
|
|
91
92
|
}),
|
92
93
|
tslib_1.__metadata("design:type", Number)
|
93
94
|
], FkDownloadTaskEntity.prototype, "topicId", void 0);
|
95
|
+
tslib_1.__decorate([
|
96
|
+
(0, typeorm_1.Column)({
|
97
|
+
name: 'topic_name',
|
98
|
+
default: ``
|
99
|
+
}),
|
100
|
+
tslib_1.__metadata("design:type", String)
|
101
|
+
], FkDownloadTaskEntity.prototype, "topicName", void 0);
|
94
102
|
tslib_1.__decorate([
|
95
103
|
(0, typeorm_1.CreateDateColumn)({
|
96
104
|
name: 'create_date'
|
@@ -103,9 +103,11 @@ let TaskManageController = class TaskManageController {
|
|
103
103
|
const skip = (page - 1) * psize;
|
104
104
|
const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where, order: { createDate: "DESC" }, take, skip });
|
105
105
|
await Promise.all(tasks.map(async (task) => {
|
106
|
-
|
107
|
-
|
108
|
-
|
106
|
+
if (!task.topicName) {
|
107
|
+
const topic = await this.w7.manager.findOne(w7_1.W7ChatTopicEntity, { where: { id: task.topicId } });
|
108
|
+
if (topic) {
|
109
|
+
task.topicName = topic.topicName;
|
110
|
+
}
|
109
111
|
}
|
110
112
|
}));
|
111
113
|
const count = await this.db.manager.count(entities_1.FkDownloadTaskEntity, { where });
|
@@ -156,7 +158,7 @@ let TaskManageController = class TaskManageController {
|
|
156
158
|
link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
|
157
159
|
key: 3
|
158
160
|
}];
|
159
|
-
const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=/@nger/fk-
|
161
|
+
const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=/@nger/fk-upload/task-manage?${this.toUrl({
|
160
162
|
...query
|
161
163
|
})}`;
|
162
164
|
const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
|
@@ -220,7 +222,7 @@ let TaskManageController = class TaskManageController {
|
|
220
222
|
react_1.default.createElement("td", null, login.pass),
|
221
223
|
react_1.default.createElement("td", null, login.w7Username),
|
222
224
|
react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDate()}日 ${task.createDate.getHours()}时:${task.createDate.getMinutes()}分`),
|
223
|
-
react_1.default.createElement("td", null,
|
225
|
+
react_1.default.createElement("td", null, task.topicName),
|
224
226
|
react_1.default.createElement("td", null,
|
225
227
|
react_1.default.createElement("input", { type: "hidden", id: task.filename + '-copy', onChange: () => { }, value: task.uploadUrl }),
|
226
228
|
react_1.default.createElement("a", { className: "btn", target: "_blank", href: url }, "\u4E0B\u8F7D"),
|
@@ -64,6 +64,7 @@ class ScheduleTask extends rabbitmq_1.Task {
|
|
64
64
|
fkdownloadTask.path = download.path;
|
65
65
|
fkdownloadTask.url = download.url;
|
66
66
|
fkdownloadTask.topicId = download.topicId;
|
67
|
+
fkdownloadTask.topicName = topic.topicName;
|
67
68
|
await db.manager.save(entities_1.FkDownloadTaskEntity, fkdownloadTask);
|
68
69
|
await manager.send(task);
|
69
70
|
}
|