@nger/fk-upload 1.0.181 → 1.0.185

package/dist/templates/task-manage.d.ts

@@ -3,11 +3,13 @@ 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;
-    constructor(db: Db, config: Config, win: BrowserWindow);
+    private w7;
+    constructor(db: Db, config: Config, win: BrowserWindow, w7: W7DataSource);
     toUrl(query: any): string;
     createPages(total: number, query: any, page: number): {
         index: number;
@@ -17,4 +19,5 @@ export declare class TaskManageController {
     taskManage(query: any): Promise<JSX.Element>;
     downloadFile(url: string, back: string, ctx: Context): void;
     staticTaskManage(ctx: Context): any;
+    finishTask(filename: string, callback: string, ctx: Context): Promise<void>;
 }

package/dist/templates/task-manage.js

@@ -13,26 +13,29 @@ const path_1 = require("path");
 function getStatusTitle(status) {
     switch (status) {
         case 0:
-            return 'downloading';
+            return '待下载';
         case 1:
-            return 'uploading';
+            return '待上传';
         case 2:
-            return 'effecting';
+            return '待生效';
         case 3:
-            return 'finish';
+            return '已完成';
         default:
-            return 'unknow';
+            return '未知';
     }
 }
 const electron_1 = require("electron");
+const w7_1 = require("@nger/w7");
 let TaskManageController = class TaskManageController {
     db;
     config;
     win;
-    constructor(db, config, win) {
+    w7;
+    constructor(db, config, win, w7) {
         this.db = db;
         this.config = config;
         this.win = win;
+        this.w7 = w7;
     }
     toUrl(query) {
         return Object.keys(query).map(key => `${key}=${decodeURIComponent(query[key])}`).join('&');
@@ -99,6 +102,10 @@ let TaskManageController = class TaskManageController {
         const take = psize;
         const skip = (page - 1) * psize;
         const tasks = await this.db.manager.find(entities_1.FkDownloadTaskEntity, { where, order: { createDate: "DESC" }, take, skip });
+        await Promise.all(tasks.map(async (task) => {
+            const topic = await this.w7.manager.findOne(w7_1.W7ChatTopicEntity, { where: { id: task.topicId } });
+            Reflect.set(topic, 'topicName', topic.topicName);
+        }));
         const count = await this.db.manager.count(entities_1.FkDownloadTaskEntity, { where });
         // const downloadSize = await this.db.manager.find();
         const totalPage = Math.ceil(count / psize);
@@ -147,6 +154,9 @@ let TaskManageController = class TaskManageController {
                 link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
                 key: 3
             }];
+        const finishUrl = (filename) => `/@nger/fk-upload/finish-task?ffilename=${filename}&callback=/@nger/fk-uplaod/task-manage?${this.toUrl({
+            ...query
+        })}`;
         const logins = await this.db.manager.find(entities_1.FkLoginEntity, { where: {} });
         const getLogin = (id) => {
             return logins.find(it => it.fkLoginId = id);
@@ -184,6 +194,8 @@ let TaskManageController = class TaskManageController {
                         react_1.default.createElement("td", null),
                         react_1.default.createElement("td", null),
                         react_1.default.createElement("td", null),
+                        react_1.default.createElement("td", null, "\u65F6\u95F4"),
+                        react_1.default.createElement("td", null, "\u8BFE\u7A0B\u6807\u9898"),
                         react_1.default.createElement("td", null, "\u64CD\u4F5C"))),
                 react_1.default.createElement("tbody", null, tasks.map((task, key) => {
                     const login = getLogin(task.loginId);
@@ -193,7 +205,7 @@ let TaskManageController = class TaskManageController {
                     // https://29294142.s21d.faiusrd.com/0/ABUIABA6GAAg3tiOlAYogPvErAY.mp4?f=mAVUREPTVCTkBF%2BzQR2oy8h6lZw4.mp4&
                     // let downloadurl = uploadUrl.replace('s21v.faiusr/58', 's21d.faiusrd/0')
                     // downloadurl += `?f=${task.filename}&`
-                    const url = `/@nger/fk-upload/download-file?url=${task.uploadUrl}&back=/@nger/fk-upload/task-manage?${this.toUrl(query)}`;
+                    const url = `/@nger/fk-upload/download-file?url=${task.url}&back=/@nger/fk-upload/task-manage?${this.toUrl(query)}`;
                     return react_1.default.createElement("tr", { key: key },
                         react_1.default.createElement("td", null, task.filename),
                         react_1.default.createElement("td", null, getStatusTitle(task.status)),
@@ -205,11 +217,15 @@ let TaskManageController = class TaskManageController {
                         react_1.default.createElement("td", null, login.username),
                         react_1.default.createElement("td", null, login.pass),
                         react_1.default.createElement("td", null, login.w7Username),
+                        react_1.default.createElement("td", null, `${task.createDate.getMonth() + 1}月${task.createDate.getDay()}日:${task.createDate.getMinutes()}分`),
+                        react_1.default.createElement("td", null, Reflect.get(task, 'topicName')),
                         react_1.default.createElement("td", null,
                             react_1.default.createElement("input", { type: "hidden", id: task.filename + '-copy', onChange: () => { }, value: task.uploadUrl }),
                             react_1.default.createElement("a", { className: "btn", target: "_blank", href: url }, "\u4E0B\u8F7D"),
                             "\u00A0",
-                            react_1.default.createElement("a", { className: "btn", target: "_blank", href: `https://wx.jidujiaowang.com/web/index.php?c=site&a=entry&topic_id=${task.topicId}&do=topic_add&m=dg_chat` }, "\u7F16\u8F91")));
+                            react_1.default.createElement("a", { className: "btn", target: "_blank", href: `https://wx.jidujiaowang.com/web/index.php?c=site&a=entry&topic_id=${task.topicId}&do=topic_add&m=dg_chat` }, "\u7F16\u8F91"),
+                            "\u00A0",
+                            react_1.default.createElement("a", { className: "btn", href: finishUrl(task.filename) }, "\u5B8C\u6210")));
                 }))),
             react_1.default.createElement("nav", null,
                 react_1.default.createElement("ul", { className: "pagination" },
@@ -240,6 +256,10 @@ let TaskManageController = class TaskManageController {
             return e.message;
         }
     }
+    async finishTask(filename, callback, ctx) {
+        await this.db.manager.update(entities_1.FkDownloadTaskEntity, filename, { status: 3 });
+        ctx.redirect(callback);
+    }
 };
 tslib_1.__decorate([
     (0, http_1.Get)('task-manage'),
@@ -264,8 +284,17 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", void 0)
 ], TaskManageController.prototype, "staticTaskManage", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('finish-task'),
+    tslib_1.__param(0, (0, http_1.Query)('filename')),
+    tslib_1.__param(1, (0, http_1.Query)('callback')),
+    tslib_1.__param(2, (0, core_1.Inject)(http_1.CONTEXT)),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], 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])
+    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, electron_1.BrowserWindow, w7_1.W7DataSource])
 ], TaskManageController);
 exports.TaskManageController = TaskManageController;

package/electron/pnpm-lock.yaml

@@ -18,16 +18,6 @@ specifiers:
   reflect-metadata: ^0.1.13
 
 dependencies:
-  '@nger/core': link:../../core
-  '@nger/fk-upload': link:..
-  '@nger/http': link:../../http
-  '@nger/rabbitmq': link:../../rabbitmq
-  '@nger/redis': link:../../redis
-  '@nger/schedule': link:../../schedule
-  '@nger/typeorm': link:../../typeorm
-  '@nger/utils': link:../../utils
-  '@nger/w7': link:../../w7
-  '@nger/ws': link:../../ws
   dotenv: 16.0.1
   pm2: 5.2.0
   reflect-metadata: 0.1.13

package/package.json

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