@nger/fk-upload 1.0.39 → 1.0.40

package/dist/main.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 require("reflect-metadata");
 require('dotenv').config();
 const core_1 = require("@nger/core");
-const core_2 = require("@nger/core");
 const fk_upload_module_1 = require("./fk-upload.module");
 const http_1 = require("@nger/http");
 const typeorm_1 = require("@nger/typeorm");
@@ -19,7 +18,7 @@ const w7_1 = require("@nger/w7");
 let AppModule = class AppModule {
 };
 AppModule = tslib_1.__decorate([
-    (0, core_2.Module)({
+    (0, core_1.Module)({
         providers: [{
                 provide: core_1.APP_ROOT,
                 useValue: process.cwd()

package/dist/templates/add-task.js

@@ -24,6 +24,14 @@ let AddTaskController = class AddTaskController {
         const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { w7Username: we7Username } });
         if (loginEntity) {
             const task = await this.taskService.createDownLoadTask(url, loginEntity.fkLoginId, 0);
+            const download = task.data;
+            const fkdownloadTask = new entities_1.FkDownloadTaskEntity();
+            fkdownloadTask.filename = download.filename;
+            fkdownloadTask.loginId = download.loginId;
+            fkdownloadTask.path = download.path;
+            fkdownloadTask.url = download.url;
+            fkdownloadTask.topicId = download.topicId;
+            await this.db.manager.save(entities_1.FkDownloadTaskEntity, fkdownloadTask);
             await this.task.send(task);
         }
         ctx.redirect('/@nger/fk-upload/task-manage');

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

@@ -32,7 +32,6 @@ class DownloadTask extends rabbitmq_1.Task {
                 'Content-Type': 'application/octet-stream'
             }
         });
-        let length = 0;
         let total = 0;
         let md5 = ``;
         // get split size

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

@@ -17,8 +17,8 @@ class EffectTask extends rabbitmq_1.Task {
         const fail = injector.get(rabbitmq_1.FAIL);
         const w7 = injector.get(w7_1.W7DataSource);
         const db = injector.get(typeorm_1.Db);
+        await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
         if (task.topicId) {
-            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
             await (0, fs_extra_1.unlink)(task.path);
             await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
         }

package/dist/templates/tasks/task.service.js

@@ -43,7 +43,18 @@ let TaskService = class TaskService {
         const _url = new URL(url);
         const filePath = _url.pathname;
         let ext = (0, path_1.extname)(filePath);
-        filename += ext === '.' ? '.mp4' : ext;
+        if (ext.length < 5) {
+            filename += ext === '.' ? '.mp4' : ext;
+        }
+        else if (filename.indexOf('.jpg')) {
+            filename += '.jpg';
+        }
+        else if (filename.indexOf('.png')) {
+            filename += '.png';
+        }
+        else if (filename.indexOf('.mp4')) {
+            filename += '.mp4';
+        }
         const root = this.injector.get(core_1.APP_ROOT);
         (0, fs_extra_1.ensureDirSync)((0, path_1.join)(root, 'attachments/fk-upload'));
         const path = (0, path_1.join)(root, 'attachments/fk-upload', filename);

package/docs.md

@@ -32,3 +32,4 @@ RABBITMQ_USERNAME=imeepos
 RABBITMQ_PASSWORD=123qwe
 ```
 
+

package/package.json

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