@nger/fk-upload 1.0.6 → 1.0.9

package/dist/entities/fk-download-task.entity.d.ts

@@ -7,6 +7,8 @@ export declare class FkDownloadTaskEntity {
     path: string;
     uploadSize: number;
     uploadUrl: string;
+    uploadStatus: number;
     loginId: number;
     fileMd5: string;
+    topicId: number;
 }

package/dist/entities/fk-download-task.entity.js

@@ -20,8 +20,10 @@ let FkDownloadTaskEntity = class FkDownloadTaskEntity {
     path;
     uploadSize;
     uploadUrl;
+    uploadStatus;
     loginId;
     fileMd5;
+    topicId;
 };
 __decorate([
     (0, typeorm_1.PrimaryColumn)(),
@@ -40,7 +42,9 @@ __decorate([
     __metadata("design:type", Number)
 ], FkDownloadTaskEntity.prototype, "size", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({
+        length: 320
+    }),
     __metadata("design:type", String)
 ], FkDownloadTaskEntity.prototype, "url", void 0);
 __decorate([
@@ -55,10 +59,17 @@ __decorate([
 ], FkDownloadTaskEntity.prototype, "uploadSize", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        default: ''
+        default: '',
+        length: 320
     }),
     __metadata("design:type", String)
 ], FkDownloadTaskEntity.prototype, "uploadUrl", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        default: 0
+    }),
+    __metadata("design:type", Number)
+], FkDownloadTaskEntity.prototype, "uploadStatus", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         default: 0
@@ -72,6 +83,13 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], FkDownloadTaskEntity.prototype, "fileMd5", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        name: 'topic_id',
+        default: 0
+    }),
+    __metadata("design:type", Number)
+], FkDownloadTaskEntity.prototype, "topicId", void 0);
 FkDownloadTaskEntity = __decorate([
     (0, typeorm_1.Entity)({
         name: 'nger_fk_download_task'

package/dist/entities/fk-login-account.entity.d.ts

@@ -1,5 +1,6 @@
 export declare class FkLoginAccountEntity {
     fkLoginAccountId: number;
     uniacid: number;
+    topicId: number;
     fkLoginId: number;
 }

package/dist/entities/fk-login-account.entity.js

@@ -14,6 +14,7 @@ const typeorm_1 = require("typeorm");
 let FkLoginAccountEntity = class FkLoginAccountEntity {
     fkLoginAccountId;
     uniacid;
+    topicId;
     fkLoginId;
 };
 __decorate([
@@ -27,7 +28,15 @@ __decorate([
     __metadata("design:type", Number)
 ], FkLoginAccountEntity.prototype, "uniacid", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, typeorm_1.Column)({
+        name: 'topic_id'
+    }),
+    __metadata("design:type", Number)
+], FkLoginAccountEntity.prototype, "topicId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        name: 'fk_login_id'
+    }),
     __metadata("design:type", Number)
 ], FkLoginAccountEntity.prototype, "fkLoginId", void 0);
 FkLoginAccountEntity = __decorate([

package/dist/fk-upload.module.js

@@ -10,18 +10,19 @@ exports.FkUploadModule = void 0;
 const core_1 = require("@nger/core");
 const typeorm_1 = require("@nger/typeorm");
 const entities_1 = require("./entities");
-const fk_login_account_entity_1 = require("./entities/fk-login-account.entity");
-const fk_upload_controller_1 = require("./fk-upload.controller");
-const fk_v2_service_1 = require("./fk-v2.service");
-const fk_service_1 = require("./fk.service");
 const login_controller_1 = require("./login.controller");
+const mq_runner_1 = require("./mq-runner");
 const add_fk_login_1 = require("./templates/add-fk-login");
+const add_task_1 = require("./templates/add-task");
 const code_1 = require("./templates/code");
-const download_task_1 = require("./templates/download-task");
+const error_1 = require("./templates/error");
 const help_1 = require("./templates/help");
+const setting_1 = require("./templates/setting");
 const task_manage_1 = require("./templates/task-manage");
+const task_service_1 = require("./templates/task.service");
 const upload_1 = require("./templates/upload");
 const upload_task_1 = require("./templates/upload-task");
+const upload_service_1 = require("./templates/upload.service");
 const verify_1 = require("./templates/verify");
 const urlSafeBase64Decode_1 = require("./urlSafeBase64Decode");
 let FkUploadModule = class FkUploadModule {
@@ -29,28 +30,33 @@ let FkUploadModule = class FkUploadModule {
 FkUploadModule = __decorate([
     (0, core_1.Module)({
         providers: [
-            fk_service_1.FkService,
             urlSafeBase64Decode_1.UrlSafeBase64,
-            fk_v2_service_1.FkV2Service
+            upload_service_1.UploadService,
+            task_service_1.TaskService,
+            {
+                provide: core_1.LoadAddon,
+                useFactory: () => new mq_runner_1.MqRunner(),
+                multi: true
+            }
         ],
         controllers: [
-            fk_upload_controller_1.FkAjaxController,
             code_1.FkUploadCodeController,
             login_controller_1.LoginController,
             verify_1.VerifyController,
             help_1.HelpController,
             upload_1.UploadController,
-            download_task_1.DownloadTaskController,
             upload_task_1.UploadTaskController,
             add_fk_login_1.AddFkLoginController,
-            task_manage_1.TaskManageController
+            task_manage_1.TaskManageController,
+            add_task_1.AddTaskController,
+            error_1.ErrorController,
+            setting_1.SettingController
         ],
         imports: [
             typeorm_1.TypeormModule.forFeature([
                 entities_1.FkLoginEntity,
                 entities_1.FkLoginCookieEntity,
-                entities_1.FkDownloadTaskEntity,
-                fk_login_account_entity_1.FkLoginAccountEntity
+                entities_1.FkDownloadTaskEntity
             ])
         ]
     })

package/dist/fk.service.d.ts

@@ -1,7 +1,6 @@
 import { Injector } from '@nger/core';
 import { Db } from '@nger/typeorm';
 import { FkLoginCookieEntity, FkLoginEntity } from './entities';
-import { FkV2Service } from './fk-v2.service';
 export declare class FkService {
     db: Db;
     private injector;
@@ -13,6 +12,6 @@ export declare class FkService {
     getCloudUrl(url: string): void;
     getFkLogin(username: string): Promise<FkLoginEntity | null>;
     getFkLoginCookie(fkLoginId: number): Promise<FkLoginCookieEntity[]>;
-    createV2(login: FkLoginEntity): Promise<FkV2Service>;
+    createV2(login: FkLoginEntity): Promise<any>;
     saveCookie(fkLoginId: number): Promise<void>;
 }

package/dist/main.js

@@ -14,6 +14,13 @@ 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");
+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 = __decorate([
@@ -23,12 +30,22 @@ AppModule = __decorate([
                 useValue: process.cwd()
             }],
         imports: [
+            w7_1.W7Module,
             fk_upload_module_1.FkUploadModule,
             http_1.HttpModule.forEnv(),
-            typeorm_1.TypeormModule.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;
 (0, core_1.platformCore)().bootstrap(AppModule);
+process.on('uncaughtException', (err) => {
+    console.log(err.message);
+});

package/dist/mq-runner.d.ts

@@ -0,0 +1,5 @@
+import { Injector, LoadAddon, Next } from '@nger/core';
+export declare class MqRunner extends LoadAddon {
+    constructor();
+    handle(injector: Injector, next?: Next): Promise<void>;
+}

package/dist/mq-runner.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MqRunner = void 0;
+const core_1 = require("@nger/core");
+const task_service_1 = require("./templates/task.service");
+let i = 0;
+class MqRunner extends core_1.LoadAddon {
+    constructor() {
+        super(`mq runner`);
+    }
+    async handle(injector, next) {
+        const task = injector.get(task_service_1.TaskService);
+        await task.receiveDownloadTask();
+        await task.receiveUploadTask();
+        await task.receiveEffectTask();
+        await task.receiveScheduleTask();
+        if (next)
+            await next();
+    }
+}
+exports.MqRunner = MqRunner;

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

@@ -0,0 +1,6 @@
+declare const url: URL;
+declare const WS_PORT: any;
+declare const socket: WebSocket;
+declare const CREATE_TASK = "@nger/fk-upload/create-task";
+declare const CREATE_TASK_DOWNLOADING = "@nger/fk-upload/downloading";
+declare const CREATE_TASK_UPLOADING = "@nger/fk-upload/uploading";

package/dist/static/task-manage.js

@@ -0,0 +1,35 @@
+"use strict";
+const url = new URL(window.location.href);
+const WS_PORT = Reflect.get(window, 'WS_PORT');
+const socket = new WebSocket(`ws://${url.hostname}:${WS_PORT}`);
+const CREATE_TASK = `@nger/fk-upload/create-task`;
+const CREATE_TASK_DOWNLOADING = `@nger/fk-upload/downloading`;
+const CREATE_TASK_UPLOADING = `@nger/fk-upload/uploading`;
+socket.onopen = () => {
+    socket.onmessage = (msg) => {
+        const data = msg.data;
+        const payload = JSON.parse(data);
+        if (payload.action === CREATE_TASK_DOWNLOADING) {
+            const id = payload.data.filename + '-size';
+            const item = document.getElementById(id);
+            const total = document.getElementById(`${payload.data.filename}-total`);
+            if (item)
+                item.innerHTML = `${payload.data.size}`;
+            if (total) {
+                total.innerHTML = `${payload.data.total}`;
+            }
+        }
+        else if (payload.action === CREATE_TASK_UPLOADING) {
+            const id = payload.data.filename + '-upload-size';
+            const item = document.getElementById(id);
+            const uploadUrlHtml = document.getElementById(`${payload.data.filename}-upload-url`);
+            if (item)
+                item.innerHTML = `${payload.data.uploadSize}`;
+            if (uploadUrlHtml && payload.data.uploadUrl)
+                uploadUrlHtml.innerHTML = `${payload.data.uploadUrl}`;
+        }
+        else {
+            console.log(payload);
+        }
+    };
+};

package/dist/templates/add-fk-login.d.ts

@@ -1,6 +1,10 @@
 import { Db } from '@nger/typeorm';
+import { Context } from 'koa';
+import { CryptoService } from '@nger/utils';
 export declare class AddFkLoginController {
     private db;
-    constructor(db: Db);
+    private crypto;
+    constructor(db: Db, crypto: CryptoService);
+    postAddFkLogin(fkLoginId: string, post: any, ctx: Context): Promise<void>;
     addFkLogin(fkLoginId: string): Promise<JSX.Element>;
 }

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

@@ -22,14 +22,33 @@ const typeorm_1 = require("@nger/typeorm");
 const react_1 = __importDefault(require("react"));
 const entities_1 = require("../entities");
 const component_1 = require("./component");
+const utils_1 = require("@nger/utils");
 let AddFkLoginController = class AddFkLoginController {
     db;
-    constructor(db) {
+    crypto;
+    constructor(db, crypto) {
         this.db = db;
+        this.crypto = crypto;
     }
-    async addFkLogin(fkLoginId) {
+    async postAddFkLogin(fkLoginId, post, ctx) {
         let fkLogin = new entities_1.FkLoginEntity();
+        fkLogin.username = post.username;
+        fkLogin.pass = post.pass;
+        fkLogin.w7Username = post.w7Username;
+        fkLogin.password = this.crypto.md5(post.pass);
         if (fkLoginId) {
+            // edit
+            await this.db.manager.update(entities_1.FkLoginEntity, Number(fkLoginId), fkLogin);
+        }
+        else {
+            await this.db.manager.save(entities_1.FkLoginEntity, fkLogin);
+        }
+        ctx.redirect('/@nger/fk-upload/help');
+        return;
+    }
+    async addFkLogin(fkLoginId) {
+        let fkLogin = new entities_1.FkLoginEntity();
+        if (fkLoginId && Number(fkLoginId) > 0) {
             const item = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { fkLoginId: Number(fkLoginId) } });
             if (item)
                 fkLogin = item;
@@ -38,22 +57,31 @@ let AddFkLoginController = class AddFkLoginController {
             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("div", { className: "card" },
                 react_1.default.createElement("div", { className: "card-body" },
-                    react_1.default.createElement("form", null,
+                    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" }, "username"),
-                            react_1.default.createElement("input", { id: "username", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.username })),
+                            react_1.default.createElement("input", { id: "username", name: "username", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.username })),
                         react_1.default.createElement("div", { className: "form-group" },
                             react_1.default.createElement("label", { htmlFor: "password" }, "password"),
-                            react_1.default.createElement("input", { id: "password", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.pass })),
+                            react_1.default.createElement("input", { id: "password", name: "pass", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.pass })),
                         react_1.default.createElement("div", { className: "form-group" },
                             react_1.default.createElement("label", { htmlFor: "w7Username" }, "w7Username"),
-                            react_1.default.createElement("input", { id: "w7Username", onChange: e => { }, className: "form-control", type: "text", value: fkLogin.w7Username })),
+                            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' }, "add"),
                             react_1.default.createElement("button", { type: "reset", className: 'btn' }, "reset"),
                             react_1.default.createElement("a", { className: "btn btn-link", href: "/@nger/fk-upload/help" }, "list"))))));
     }
 };
+__decorate([
+    (0, http_1.Post)('add-fk-login'),
+    __param(0, (0, http_1.Query)('loginId')),
+    __param(1, (0, http_1.Body)()),
+    __param(2, (0, core_1.Inject)(http_1.CONTEXT)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object, Object]),
+    __metadata("design:returntype", Promise)
+], AddFkLoginController.prototype, "postAddFkLogin", null);
 __decorate([
     (0, http_1.Get)(`add-fk-login`),
     __param(0, (0, http_1.Query)(`loginId`)),
@@ -63,6 +91,6 @@ __decorate([
 ], AddFkLoginController.prototype, "addFkLogin", null);
 AddFkLoginController = __decorate([
     (0, core_1.Controller)('@nger/fk-upload'),
-    __metadata("design:paramtypes", [typeorm_1.Db])
+    __metadata("design:paramtypes", [typeorm_1.Db, utils_1.CryptoService])
 ], AddFkLoginController);
 exports.AddFkLoginController = AddFkLoginController;

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

@@ -0,0 +1,10 @@
+import { Db } from '@nger/typeorm';
+import { Context } from 'koa';
+import { TaskService } from './task.service';
+export declare class AddTaskController {
+    private db;
+    private task;
+    constructor(db: Db, task: TaskService);
+    postAddTask(post: any, ctx: Context): Promise<void>;
+    addTask(): JSX.Element;
+}

package/dist/templates/add-task.js

@@ -0,0 +1,76 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddTaskController = void 0;
+const core_1 = require("@nger/core");
+const http_1 = require("@nger/http");
+const component_1 = require("./component");
+const react_1 = __importDefault(require("react"));
+const typeorm_1 = require("@nger/typeorm");
+const entities_1 = require("../entities");
+const task_service_1 = require("./task.service");
+let AddTaskController = class AddTaskController {
+    db;
+    task;
+    constructor(db, task) {
+        this.db = db;
+        this.task = task;
+    }
+    async postAddTask(post, ctx) {
+        const { url, we7Username } = post;
+        const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { w7Username: we7Username } });
+        if (loginEntity) {
+            await this.task.createDownLoadTask(url, loginEntity.fkLoginId, 0);
+        }
+        ctx.redirect('/@nger/fk-upload/task-manage');
+        return;
+    }
+    addTask() {
+        return react_1.default.createElement(component_1.Nav, { active: 3 },
+            react_1.default.createElement("div", { className: "card" },
+                react_1.default.createElement("div", { className: "card-body" },
+                    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" }, "url"),
+                            react_1.default.createElement("input", { type: "text", name: "url", className: 'form-control', id: "url" })),
+                        react_1.default.createElement("div", { className: "form-group" },
+                            react_1.default.createElement("label", { htmlFor: "w7Username" }, "w7 account"),
+                            react_1.default.createElement("input", { type: "text", name: "we7Username", className: 'form-control', id: "w7Username" })),
+                        react_1.default.createElement("div", { className: "form-group" },
+                            react_1.default.createElement("button", { type: "submit", className: "btn btn-primary" }, "submit"),
+                            react_1.default.createElement("button", { type: "reset", className: "btn" }, "reset"))))));
+    }
+};
+__decorate([
+    (0, http_1.Post)('add-task'),
+    __param(0, (0, http_1.Body)()),
+    __param(1, (0, core_1.Inject)(http_1.CONTEXT)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], AddTaskController.prototype, "postAddTask", null);
+__decorate([
+    (0, http_1.Get)('add-task'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], AddTaskController.prototype, "addTask", null);
+AddTaskController = __decorate([
+    (0, core_1.Controller)('@nger/fk-upload'),
+    __metadata("design:paramtypes", [typeorm_1.Db, task_service_1.TaskService])
+], AddTaskController);
+exports.AddTaskController = AddTaskController;

package/dist/templates/component.js

@@ -18,6 +18,9 @@ function Nav(props) {
         }, {
             link: '/@nger/fk-upload/add-task',
             title: 'add task'
+        }, {
+            link: '/@nger/fk-upload/setting',
+            title: 'setting'
         }];
     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" }),

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

@@ -1,10 +1,10 @@
 import { Db } from '@nger/typeorm';
-import { WsPluginContext } from '@nger/ws';
+import { Context } from 'koa';
+import { UploadService } from './upload.service';
 export declare const CREATE_TASK_DOWNLOADING = "@nger/fk-upload/create-task/downloading";
 export declare class DownloadTaskController {
     private db;
-    constructor(db: Db);
-    createTask(url: string): Promise<string>;
-    private createUrl;
-    createTaskWs(url: string, ctx: WsPluginContext): Promise<import("rxjs").Subscription>;
+    private upload;
+    constructor(db: Db, upload: UploadService);
+    createTask(url: string, ctx: Context): Promise<void>;
 }