@nger/fk-upload 1.0.197 → 1.0.201

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/task-manage.d.ts

@@ -2,14 +2,12 @@
 import { Config } from '@nger/core';
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
-import { BrowserWindow } from 'electron';
 import { W7DataSource } from '@nger/w7';
 export declare class TaskManageController {
     private db;
     private config;
-    private win;
     private w7;
-    constructor(db: Db, config: Config, win: BrowserWindow, w7: W7DataSource);
+    constructor(db: Db, config: Config, w7: W7DataSource);
     toUrl(query: any): string;
     createPages(total: number, query: any, page: number): {
         index: number;

package/dist/templates/task-manage.js

@@ -24,17 +24,15 @@ function getStatusTitle(status) {
             return '未知';
     }
 }
-const electron_1 = require("electron");
+// import { BrowserWindow } from 'electron'
 const w7_1 = require("@nger/w7");
 let TaskManageController = class TaskManageController {
     db;
     config;
-    win;
     w7;
-    constructor(db, config, win, w7) {
+    constructor(db, config, w7) {
         this.db = db;
         this.config = config;
-        this.win = win;
         this.w7 = w7;
     }
     toUrl(query) {
@@ -249,13 +247,12 @@ let TaskManageController = class TaskManageController {
             react_1.default.createElement("script", { src: "/@nger/fk-upload/static/task-manage.js?t=" + new Date().getTime() }));
     }
     downloadFile(url, back, ctx) {
-        if (this.win) {
-            this.win.webContents.downloadURL(url);
-            ctx.redirect(back);
-        }
-        else {
-            ctx.redirect(url);
-        }
+        // if (this.win) {
+        //     this.win.webContents.downloadURL(url)
+        //     ctx.redirect(back)
+        // } else {
+        // }
+        ctx.redirect(url);
     }
     staticTaskManage(ctx) {
         try {
@@ -312,6 +309,6 @@ tslib_1.__decorate([
 ], TaskManageController.prototype, "finishTask", null);
 TaskManageController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, electron_1.BrowserWindow, w7_1.W7DataSource])
+    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, w7_1.W7DataSource])
 ], TaskManageController);
 exports.TaskManageController = TaskManageController;

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

@@ -42,6 +42,10 @@ class EffectTask extends rabbitmq_1.Task {
             }
             const w7 = injector.get(w7_1.W7DataSource);
             let uploadUrl = task.uploadUrl;
+            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');
             }
@@ -55,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.197",
+  "version": "1.0.201",
   "description": "nger fk upload",
   "main": "dist/electon.js",
   "types": "dist/core.d.ts",
@@ -39,15 +39,9 @@
     "react": "^18.1.0",
     "request": "^2.88.2"
   },
-  "devDependencies": {
-    "electron": "^18.2.3"
-  },
   "scripts": {
     "tsc": "tsc",
-    "tsc:build": "tsc",
-    "electron": "electron .",
-    "pack": "electron-builder --dir",
-    "dist": "electron-builder --win --ia32"
+    "tsc:build": "tsc"
   },
   "readme": "## admin\n\n## account\n\n## test url -- \n\n## \n\nhttp://kaifa2.jidujiaowang.com/web/index.php?c=site&a=entry&eid=8&version_id=0\nadmin888\n12345678"
 }