@nger/fk-upload 1.0.132 → 1.0.135
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -18,9 +18,9 @@ class EffectTask extends rabbitmq_1.Task {
|
|
|
18
18
|
const manager = injector.get(rabbitmq_1.TaskManager);
|
|
19
19
|
console.log(`effect`, task.filename);
|
|
20
20
|
try {
|
|
21
|
+
const item = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
|
|
21
22
|
if (task.uploadUrl.startsWith('https://site')) {
|
|
22
23
|
// redownload
|
|
23
|
-
const item = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
|
|
24
24
|
if (item) {
|
|
25
25
|
const download = {
|
|
26
26
|
filename: item.filename,
|
|
@@ -37,15 +37,18 @@ class EffectTask extends rabbitmq_1.Task {
|
|
|
37
37
|
await complete();
|
|
38
38
|
return next && next();
|
|
39
39
|
}
|
|
40
|
-
const fail = injector.get(rabbitmq_1.FAIL);
|
|
41
40
|
const w7 = injector.get(w7_1.W7DataSource);
|
|
42
|
-
|
|
41
|
+
let uploadUrl = task.uploadUrl;
|
|
42
|
+
if (uploadUrl.startsWith('https://29294142.s21i.faiusr.com')) {
|
|
43
|
+
uploadUrl = uploadUrl.replace('https://29294142.s21i.faiusr.com', 'https://29294142.s21v.faiusr.com');
|
|
44
|
+
}
|
|
45
|
+
await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl });
|
|
43
46
|
if (task.topicId) {
|
|
44
47
|
try {
|
|
45
48
|
await (0, fs_extra_1.unlink)(task.path);
|
|
46
49
|
}
|
|
47
50
|
catch (e) { }
|
|
48
|
-
await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { topicStyle: 7, foreverUrl: task.uploadUrl });
|
|
51
|
+
await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { topicStyle: 7, thirdUrl: item.url, foreverUrl: task.uploadUrl });
|
|
49
52
|
await complete();
|
|
50
53
|
}
|
|
51
54
|
else {
|
|
@@ -186,7 +186,7 @@ let FkService = class FkService {
|
|
|
186
186
|
console.log(`upload ----- `, { index, max, start, end });
|
|
187
187
|
if (uploadResult) {
|
|
188
188
|
const data = uploadResult.data;
|
|
189
|
-
const downUrl = data.
|
|
189
|
+
const downUrl = data.fullDownUrl;
|
|
190
190
|
if (downUrl) {
|
|
191
191
|
if (downUrl.startsWith('https://site-upload')) {
|
|
192
192
|
console.log(`upload fail`);
|