@nger/fk-upload 1.0.196 → 1.0.200

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

@@ -34,8 +34,7 @@ tslib_1.__decorate([
         title: '状态',
         widget: {
             type: 'status',
-            color: {},
-            label: {}
+            options: []
         }
     }),
     (0, typeorm_1.Column)({

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

@@ -42,8 +42,15 @@ class EffectTask extends rabbitmq_1.Task {
             }
             const w7 = injector.get(w7_1.W7DataSource);
             let uploadUrl = task.uploadUrl;
-            if (uploadUrl.startsWith('https://29294142.s21i.faiusr.com')) {
-                uploadUrl = uploadUrl.replace('https://29294142.s21i.faiusr.com', 'https://29294142.s21v.faiusr.com');
+            if (!(uploadUrl && uploadUrl.length > 0)) {
+                await complete();
+                return next && next();
+            }
+            if (uploadUrl.includes('s21i.faiusr.com')) {
+                uploadUrl = uploadUrl.replace('s21i.faiusr.com', 's21v.faiusr.com');
+            }
+            if (uploadUrl.includes('s21d.faiusrd.com')) {
+                uploadUrl = uploadUrl.replace('s21d.faiusrd.com', 's21v.faiusr.com');
             }
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl });
             if (task.topicId) {
@@ -52,7 +59,7 @@ class EffectTask extends rabbitmq_1.Task {
                     await (0, fs_extra_1.unlink)(filePath);
                 }
                 catch (e) { }
-                await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { topicStyle: 7, thirdUrl: item.url, foreverUrl: task.uploadUrl });
+                await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { topicStyle: 7, thirdUrl: item.url, foreverUrl: uploadUrl });
                 await complete();
             }
             else {

package/package.json

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