@nger/fk-upload 1.0.195 → 1.0.198

package/dist/templates/task-manage.js

@@ -167,7 +167,7 @@ let TaskManageController = class TaskManageController {
             status: where.status,
             ...query
         })}`;
-        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${filename}&callback=${encodeURIComponent(finishCallback)}`;
+        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?filename=${encodeURIComponent(filename)}&callback=${encodeURIComponent(finishCallback)}`;
         const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
         const getLogin = (id) => {
             return logins.find(it => it.fkLoginId = id);

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) {

package/package.json

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