@nger/fk-upload 1.0.160 → 1.0.163

package/.env

@@ -0,0 +1,32 @@
+
+
+
+
+DB_TYPE=mysql
+DB_HOST=sh-cdb-36cco5yk.sql.tencentcdb.com
+DB_PORT=59440
+DB_USERNAME=wx_jidujiaowang
+DB_PASSWORD=S4Gx3ScmdYf23Gbb
+DB_DATABASE=wx_jidujiaowang
+DB_SYNCHRONIZE=true
+
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASS=123qwe
+
+HTTP_HOST=0.0.0.0
+HTTP_PORT=8081
+
+WS_HOST=0.0.0.0
+WS_PORT=8082
+
+RABBITMQ_HOST=111.229.255.176
+RABBITMQ_PORT=5672
+RABBITMQ_USERNAME=imeepos
+RABBITMQ_PASSWORD=123qwe
+
+CLOUD_URL=http://111.229.255.176:8081
+HOST_URL=http://111.229.255.176:8081
+
+
+

package/dist/electon.d.ts

@@ -0,0 +1,3 @@
+import "reflect-metadata";
+export declare class AppModule {
+}

package/dist/electon.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppModule = void 0;
+const tslib_1 = require("tslib");
+const electron_1 = require("electron");
+require("reflect-metadata");
+require('dotenv').config();
+const core_1 = require("@nger/core");
+const fk_upload_module_1 = require("./fk-upload.module");
+const http_1 = require("@nger/http");
+const typeorm_1 = require("@nger/typeorm");
+const api_1 = require("@nger/api");
+const utils_1 = require("@nger/utils");
+const ws_1 = require("@nger/ws");
+const redis_1 = require("@nger/redis");
+const rabbitmq_1 = require("@nger/rabbitmq");
+const schedule_1 = require("@nger/schedule");
+const w7_1 = require("@nger/w7");
+let AppModule = class AppModule {
+};
+AppModule = tslib_1.__decorate([
+    (0, core_1.Module)({
+        providers: [{
+                provide: core_1.APP_ROOT,
+                useValue: process.cwd()
+            }],
+        imports: [
+            w7_1.W7Module,
+            fk_upload_module_1.FkUploadModule,
+            http_1.HttpModule.forEnv(),
+            typeorm_1.TypeormModule.forEnv(),
+            ws_1.WsModule.forEnv(),
+            redis_1.RedisModule.forEnv(),
+            rabbitmq_1.RabbitMqModule.forEnv(),
+            api_1.ApiModule,
+            utils_1.UtilsModule,
+            schedule_1.ScheduleModule
+        ],
+        controllers: []
+    })
+], AppModule);
+exports.AppModule = AppModule;
+async function createWindow() {
+    const win = new electron_1.BrowserWindow({
+        width: 1024,
+        height: 768,
+        closable: true,
+        title: 'FkUpload'
+    });
+    const injector = await (0, core_1.platformCore)().bootstrap(AppModule);
+    injector.use([{
+            provide: electron_1.BrowserWindow,
+            useValue: win
+        }], 'root');
+    win.webContents.closeDevTools();
+    electron_1.Menu.setApplicationMenu(null);
+    setTimeout(() => {
+        win.loadURL('http://0.0.0.0:8081/@nger/fk-upload/help');
+    }, 200);
+}
+// 
+electron_1.app.whenReady().then(() => {
+    createWindow();
+    electron_1.app.on('activate', () => {
+        if (electron_1.BrowserWindow.getAllWindows().length === 0) {
+            createWindow();
+        }
+    });
+});

package/dist/templates/add-fk-login.js

@@ -47,7 +47,6 @@ let AddFkLoginController = class AddFkLoginController {
                 fkLogin = item;
         }
         return react_1.default.createElement(component_1.Nav, { active: 1 },
-            react_1.default.createElement("link", { href: "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", rel: "stylesheet" }),
             react_1.default.createElement("form", { action: '', method: 'post', encType: 'application/x-www-form-urlencoded' },
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("label", { htmlFor: "username" }, "\u7528\u6237\u540D"),
@@ -60,8 +59,7 @@ let AddFkLoginController = class AddFkLoginController {
                     react_1.default.createElement("input", { id: "w7Username", name: "w7Username", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.w7Username })),
                 react_1.default.createElement("div", { className: "for-group" },
                     react_1.default.createElement("button", { type: "submit", className: 'btn btn-primary' }, "\u6DFB\u52A0"),
-                    react_1.default.createElement("button", { type: "reset", className: 'btn' }, "\u91CD\u7F6E"),
-                    react_1.default.createElement("a", { className: "btn btn-link", href: "/@nger/fk-upload/help" }, "\u9996\u9875"))));
+                    react_1.default.createElement("button", { type: "reset", className: 'btn' }, "\u91CD\u7F6E"))));
     }
 };
 tslib_1.__decorate([

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

@@ -9,5 +9,5 @@ export declare class AddTaskController {
     private taskService;
     constructor(db: Db, task: TaskManager, taskService: TaskService);
     postAddTask(post: any, ctx: Context): Promise<void>;
-    addTask(): JSX.Element;
+    addTask(query: any): JSX.Element;
 }

package/dist/templates/add-task.js

@@ -23,7 +23,8 @@ let AddTaskController = class AddTaskController {
         const { url, we7Username } = post;
         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 topicId = Number(post.topicId);
+            const task = await this.taskService.createDownLoadTask(url, loginEntity.fkLoginId, topicId);
             const download = task.data;
             const fkdownloadTask = new entities_1.FkDownloadTaskEntity();
             fkdownloadTask.filename = download.filename;
@@ -37,15 +38,19 @@ let AddTaskController = class AddTaskController {
         ctx.redirect('/@nger/fk-upload/task-manage');
         return;
     }
-    addTask() {
+    addTask(query) {
+        const data = query || {};
         return react_1.default.createElement(component_1.Nav, { active: 3 },
             react_1.default.createElement("form", { action: "/@nger/fk-upload/add-task", method: "post" },
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("label", { htmlFor: "url" }, "\u8FDE\u63A5"),
-                    react_1.default.createElement("input", { type: "text", name: "url", className: 'form-control', id: "url" })),
+                    react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "url", value: data.value, className: 'form-control', id: "url" })),
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("label", { htmlFor: "w7Username" }, "\u5FAE\u64CE\u8D26\u6237"),
-                    react_1.default.createElement("input", { type: "text", name: "we7Username", className: 'form-control', id: "w7Username" })),
+                    react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "we7Username", value: data.username, className: 'form-control', id: "w7Username" })),
+                react_1.default.createElement("div", { className: "form-group" },
+                    react_1.default.createElement("label", { htmlFor: "w7Username" }, "topicId"),
+                    react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "topicId", value: "{data.id}", className: 'form-control', id: "topicId" })),
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("button", { type: "submit", className: "btn btn-primary" }, "\u63D0\u4EA4"),
                     react_1.default.createElement("button", { type: "reset", className: "btn" }, "\u91CD\u7F6E"))));
@@ -61,8 +66,9 @@ tslib_1.__decorate([
 ], AddTaskController.prototype, "postAddTask", null);
 tslib_1.__decorate([
     (0, http_1.Get)('add-task'),
+    tslib_1.__param(0, (0, http_1.Query)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", void 0)
 ], AddTaskController.prototype, "addTask", null);
 AddTaskController = tslib_1.__decorate([

package/dist/templates/code.js

@@ -21,7 +21,8 @@ initFaicaptcha({
     window.location.href = '/@nger/fk-upload/relogin?token='+n+'&loginId='+loginId;
 });
             `
-                } }));
+                } }),
+            react_1.default.createElement("a", { href: "/@nger/fk-upload/help" }, "go home"));
     }
 };
 tslib_1.__decorate([

package/dist/templates/component.js

@@ -21,7 +21,7 @@ function Nav(props) {
             title: '设置'
         }];
     return react_1.default.createElement("div", null,
-        react_1.default.createElement("link", { href: "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", rel: "stylesheet" }),
+        react_1.default.createElement("link", { href: "https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/4.6.1/css/bootstrap.min.css", rel: "stylesheet" }),
         react_1.default.createElement("nav", { className: "navbar navbar-expand-lg navbar-dark bg-primary" },
             react_1.default.createElement("div", { className: "collapse navbar-collapse show" },
                 react_1.default.createElement("ul", { className: "navbar-nav mr-auto", style: { display: "flex", flexDirection: 'row' } },

package/dist/templates/help.js

@@ -16,7 +16,6 @@ let HelpController = class HelpController {
     async help() {
         const list = await this.db.manager.find(fk_login_entity_1.FkLoginEntity, { where: {} });
         return react_1.default.createElement(component_1.Nav, { active: 0 },
-            react_1.default.createElement("link", { href: "https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css", rel: "stylesheet" }),
             react_1.default.createElement("table", { className: 'table' },
                 react_1.default.createElement("thead", null,
                     react_1.default.createElement("tr", null,

package/dist/templates/setting.d.ts

@@ -1,15 +1,13 @@
 /// <reference types="react" />
 import { TaskService } from './tasks/task.service';
-import { Client } from '@nger/redis';
 import { Context } from 'koa';
 import { TaskManager } from '@nger/rabbitmq';
 import { Db } from '@nger/typeorm';
 export declare class SettingController {
     private task;
-    private redis;
     private manager;
     private db;
-    constructor(task: TaskService, redis: Client, manager: TaskManager, db: Db);
+    constructor(task: TaskService, manager: TaskManager, db: Db);
     saveSetting(body: any, taskId: number, ctx: Context): Promise<void>;
     setting(): Promise<JSX.Element>;
 }

package/dist/templates/setting.js

@@ -7,18 +7,15 @@ const http_1 = require("@nger/http");
 const react_1 = tslib_1.__importDefault(require("react"));
 const component_1 = require("./component");
 const task_service_1 = require("./tasks/task.service");
-const redis_1 = require("@nger/redis");
 const actions_1 = require("./tasks/actions");
 const rabbitmq_1 = require("@nger/rabbitmq");
 const typeorm_1 = require("@nger/typeorm");
 let SettingController = class SettingController {
     task;
-    redis;
     manager;
     db;
-    constructor(task, redis, manager, db) {
+    constructor(task, manager, db) {
         this.task = task;
-        this.redis = redis;
         this.manager = manager;
         this.db = db;
     }
@@ -63,6 +60,6 @@ tslib_1.__decorate([
 ], SettingController.prototype, "setting", null);
 SettingController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    tslib_1.__metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client, rabbitmq_1.TaskManager, typeorm_1.Db])
+    tslib_1.__metadata("design:paramtypes", [task_service_1.TaskService, rabbitmq_1.TaskManager, typeorm_1.Db])
 ], SettingController);
 exports.SettingController = SettingController;

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

@@ -2,15 +2,19 @@
 import { Config } from '@nger/core';
 import { Db } from '@nger/typeorm';
 import { Context } from 'koa';
+import { BrowserWindow } from 'electron';
 export declare class TaskManageController {
     private db;
     private config;
-    constructor(db: Db, config: Config);
+    private win;
+    constructor(db: Db, config: Config, win: BrowserWindow);
     toUrl(query: any): string;
     createPages(total: number, query: any, page: number): {
         index: number;
         link: string;
+        cls: string;
     }[];
     taskManage(query: any): Promise<JSX.Element>;
+    downloadFile(url: string, back: string, ctx: Context): void;
     staticTaskManage(ctx: Context): any;
 }

package/dist/templates/task-manage.js

@@ -24,12 +24,15 @@ function getStatusTitle(status) {
             return 'unknow';
     }
 }
+const electron_1 = require("electron");
 let TaskManageController = class TaskManageController {
     db;
     config;
-    constructor(db, config) {
+    win;
+    constructor(db, config, win) {
         this.db = db;
         this.config = config;
+        this.win = win;
     }
     toUrl(query) {
         return Object.keys(query).map(key => `${key}=${decodeURIComponent(query[key])}`).join('&');
@@ -45,13 +48,26 @@ let TaskManageController = class TaskManageController {
                 max += -min;
             }
             if (d > min && d < max) {
-                list.push({
-                    index: d,
-                    link: `/@nger/fk-upload/task-manage?${this.toUrl({
-                        ...query,
-                        page: d
-                    })}`
-                });
+                if (d === page) {
+                    list.push({
+                        index: d,
+                        link: `/@nger/fk-upload/task-manage?${this.toUrl({
+                            ...query,
+                            page: d
+                        })}`,
+                        cls: `page-item active`
+                    });
+                }
+                else {
+                    list.push({
+                        index: d,
+                        link: `/@nger/fk-upload/task-manage?${this.toUrl({
+                            ...query,
+                            page: d
+                        })}`,
+                        cls: `page-item`
+                    });
+                }
             }
         }
         return list;
@@ -98,37 +114,37 @@ let TaskManageController = class TaskManageController {
         const nextUrl = `/@nger/fk-upload/task-manage?${this.toUrl(next)}`;
         const pages = this.createPages(totalPage, query, page);
         const bigNav = [{
-                title: 'all',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: -1 })}`,
+                title: '不限',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: -1, page: 1 })}`,
                 key: -1
             }, {
-                title: 'big',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: 1 })}`,
+                title: '大于1G',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: 1, page: 1 })}`,
                 key: 1
             }, {
-                title: 'small',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: 0 })}`,
+                title: '小于1G',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, isBigFile: 0, page: 1 })}`,
                 key: 0
             }];
         const navs = [{
-                title: 'all',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: -1 })}`,
+                title: '不限',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: -1, page: 1 })}`,
                 key: -1
             }, {
-                title: 'downloading',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 0 })}`,
+                title: '待下载',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 0, page: 1 })}`,
                 key: 0
             }, {
-                title: 'uploading',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 1 })}`,
+                title: '待上传',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 1, page: 1 })}`,
                 key: 1
             }, {
-                title: 'effecting',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 2 })}`,
+                title: '待生效',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 2, page: 1 })}`,
                 key: 2
             }, {
-                title: 'finish',
-                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3 })}`,
+                title: '已完成',
+                link: `/@nger/fk-upload/task-manage?${this.toUrl({ ...query, status: 3, page: 1 })}`,
                 key: 3
             }];
         return react_1.default.createElement(component_1.Nav, { active: 2 },
@@ -158,32 +174,44 @@ let TaskManageController = class TaskManageController {
                     react_1.default.createElement("tr", null,
                         react_1.default.createElement("td", { width: '180px' }, "\u6587\u4EF6\u540D"),
                         react_1.default.createElement("td", null, "\u72B6\u6001"),
-                        react_1.default.createElement("td", null, "size"),
-                        react_1.default.createElement("td", null, "isBigFile"),
-                        react_1.default.createElement("td", { width: '240px' }, "\u8FDE\u63A5"),
-                        react_1.default.createElement("td", null, "operation"))),
+                        react_1.default.createElement("td", null, "\u5927\u5C0F"),
+                        react_1.default.createElement("td", null, "\u5927\u4E8E1G"),
+                        react_1.default.createElement("td", null, "\u64CD\u4F5C"))),
                 react_1.default.createElement("tbody", null, tasks.map((task, key) => {
+                    const uploadUrl = task.uploadUrl;
+                    // https://29294142.s21v.faiusr.com/58/ABUIABA6GAAg3tiOlAYogPvErAY.mp4
+                    // https://29294142.s21d.faiusrd.com/58/ABUIABA6GAAgzrCRlAYo_J_Aag.mp4
+                    // 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)}`;
                     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)),
                         react_1.default.createElement("td", null,
                             Math.ceil(100 * task.totalSize / (1024 * 1024 * 1024)) / 100,
                             "G"),
-                        react_1.default.createElement("td", null, task.isBigFile ? 'big' : 'small'),
-                        react_1.default.createElement("td", { id: task.filename + '-upload-url' },
-                            react_1.default.createElement("a", { href: task.uploadUrl }, "download")),
-                        react_1.default.createElement("td", { id: task.filename + '-operation-td' }));
+                        react_1.default.createElement("td", null, task.isBigFile ? '是' : '否'),
+                        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", { href: url }, "\u4E0B\u8F7D")));
                 }))),
             react_1.default.createElement("nav", null,
                 react_1.default.createElement("ul", { className: "pagination" },
                     react_1.default.createElement("li", { className: "page-item" },
                         react_1.default.createElement("a", { className: "page-link", href: preUrl }, "Previous")),
-                    pages.map(page => react_1.default.createElement("li", { className: "page-item" },
+                    pages.map(page => react_1.default.createElement("li", { className: page.cls },
                         react_1.default.createElement("a", { className: "page-link", href: page.link }, page.index))),
                     react_1.default.createElement("li", { className: "page-item" },
                         react_1.default.createElement("a", { className: "page-link", href: nextUrl }, "Next")))),
             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);
+    }
     staticTaskManage(ctx) {
         try {
             ctx.type = 'js';
@@ -202,6 +230,15 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], TaskManageController.prototype, "taskManage", null);
+tslib_1.__decorate([
+    (0, http_1.Get)('download-file'),
+    tslib_1.__param(0, (0, http_1.Query)('url')),
+    tslib_1.__param(1, (0, http_1.Query)('back')),
+    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", void 0)
+], TaskManageController.prototype, "downloadFile", null);
 tslib_1.__decorate([
     (0, http_1.Get)('static/task-manage.js'),
     tslib_1.__param(0, (0, core_1.Inject)(http_1.CONTEXT)),
@@ -211,6 +248,6 @@ tslib_1.__decorate([
 ], TaskManageController.prototype, "staticTaskManage", null);
 TaskManageController = tslib_1.__decorate([
     (0, core_1.Controller)(`@nger/fk-upload`),
-    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config])
+    tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config, electron_1.BrowserWindow])
 ], TaskManageController);
 exports.TaskManageController = TaskManageController;

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

@@ -27,7 +27,7 @@ class DownloadTask extends rabbitmq_1.Task {
         const complete = injector.get(rabbitmq_1.COMPLETE);
         const fail = injector.get(rabbitmq_1.FAIL);
         const download = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
-        if (download.status !== 0) {
+        if (!download || (download && download.status !== 0)) {
             await complete();
             return next && next();
         }

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

@@ -25,11 +25,13 @@ class UploadTask extends rabbitmq_1.Task {
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
-        const fail = injector.get(rabbitmq_1.FAIL);
         const fk = injector.get(fk_service_1.FkService);
         const taskService = injector.get(task_service_1.TaskService);
         const manager = injector.get(rabbitmq_1.TaskManager);
         const db = injector.get(typeorm_1.Db);
+        if (!(0, fs_1.existsSync)(task.path)) {
+            throw new Error(`file ${task.path} not found`);
+        }
         // check file size
         const old = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         // not exist

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nger/fk-upload",
-  "version": "1.0.160",
+  "version": "1.0.163",
   "description": "",
-  "main": "dist/core.js",
+  "main": "dist/electon.js",
   "types": "dist/core.d.ts",
   "nger": {
     "cover": [],
@@ -36,9 +36,13 @@
     "react": "^18.1.0",
     "request": "^2.88.2"
   },
+  "devDependencies": {
+    "electron": "^18.2.3"
+  },
   "scripts": {
     "tsc": "tsc",
-    "tsc:build": "tsc"
+    "tsc:build": "tsc",
+    "electron": "electron ."
   },
   "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"
 }