@nger/fk-upload 1.0.201 → 1.0.204

package/dist/entities/w7-account.d.ts

@@ -0,0 +1,11 @@
+import { FkAccount } from './fk-account';
+import { FkW7 } from './w7';
+export declare class FkW7Account {
+    id: number;
+    w7Id: number;
+    w7: FkW7;
+    fkAccountId: number;
+    fkAccount: FkAccount;
+    username: string;
+    deleteDate: Date;
+}

package/dist/entities/w7-account.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FkW7Account = void 0;
+const tslib_1 = require("tslib");
+const fk_account_1 = require("./fk-account");
+const w7_1 = require("./w7");
+const rest_1 = require("@nger/rest");
+const typeorm_1 = require("typeorm");
+let FkW7Account = class FkW7Account {
+    id;
+    w7Id;
+    w7;
+    fkAccountId;
+    fkAccount;
+    username;
+    deleteDate;
+};
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `序号`,
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        displayOrder: 100,
+        width: '75px',
+        sortable: true
+    }),
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    tslib_1.__metadata("design:type", Number)
+], FkW7Account.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `站点`,
+        placeholder: '请选择站点',
+        span: 12,
+        required: true,
+        path: 'w7.title',
+        widget: {
+            type: 'selector',
+            from: 'fk_w7',
+            config: {
+                label: 'title',
+                value: 'id'
+            }
+        }
+    }),
+    (0, typeorm_1.Column)({
+        name: 'w7_id'
+    }),
+    tslib_1.__metadata("design:type", Number)
+], FkW7Account.prototype, "w7Id", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        hideInTable: true
+    }),
+    (0, typeorm_1.ManyToOne)(() => w7_1.FkW7),
+    (0, typeorm_1.JoinColumn)({
+        name: 'w7_id'
+    }),
+    tslib_1.__metadata("design:type", w7_1.FkW7)
+], FkW7Account.prototype, "w7", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `账号`,
+        placeholder: `请选择账号`,
+        required: true,
+        path: '主(fkAccount.mainUsername)-子(fkAccount.childUsername)',
+        span: 12,
+        widget: {
+            type: 'selector',
+            from: 'fk_account',
+            config: {
+                label: 'childUsername',
+                value: 'id'
+            }
+        }
+    }),
+    (0, typeorm_1.Column)({
+        name: 'fk_account_id'
+    }),
+    tslib_1.__metadata("design:type", Number)
+], FkW7Account.prototype, "fkAccountId", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        hideInTable: true
+    }),
+    (0, typeorm_1.ManyToOne)(() => fk_account_1.FkAccount),
+    (0, typeorm_1.JoinColumn)({
+        name: 'fk_account_id'
+    }),
+    tslib_1.__metadata("design:type", fk_account_1.FkAccount)
+], FkW7Account.prototype, "fkAccount", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `站点账号`,
+        placeholder: `请输入站点账号`,
+        required: true,
+        span: 24
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], FkW7Account.prototype, "username", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        hideInTable: true
+    }),
+    (0, typeorm_1.DeleteDateColumn)({
+        name: 'delete_date'
+    }),
+    tslib_1.__metadata("design:type", Date)
+], FkW7Account.prototype, "deleteDate", void 0);
+FkW7Account = tslib_1.__decorate([
+    (0, typeorm_1.Entity)({
+        name: 'fk_w7_account'
+    })
+], FkW7Account);
+exports.FkW7Account = FkW7Account;

package/dist/entities/w7.d.ts

@@ -0,0 +1,10 @@
+export declare class FkW7 {
+    id: number;
+    title: string;
+    host: string;
+    port: number;
+    username: string;
+    password: string;
+    database: string;
+    deleteDate: Date;
+}

package/dist/entities/w7.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FkW7 = void 0;
+const tslib_1 = require("tslib");
+const rest_1 = require("@nger/rest");
+const typeorm_1 = require("typeorm");
+let FkW7 = class FkW7 {
+    id;
+    title;
+    host;
+    port;
+    username;
+    password;
+    database;
+    deleteDate;
+};
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `序号`,
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        displayOrder: 100,
+        width: '75px',
+        sortable: true
+    }),
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    tslib_1.__metadata("design:type", Number)
+], FkW7.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `站点名称`,
+        required: true,
+        span: 12
+    }),
+    (0, typeorm_1.Column)({
+        default: ``
+    }),
+    tslib_1.__metadata("design:type", String)
+], FkW7.prototype, "title", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `数据库地址`,
+        required: true,
+        span: 12
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], FkW7.prototype, "host", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `数据库端口号`,
+        required: true,
+        span: 12
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", Number)
+], FkW7.prototype, "port", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `数据库用户名`,
+        required: true,
+        span: 12
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], FkW7.prototype, "username", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `数据库密码`,
+        hideInTable: true,
+        span: 12,
+        required: true,
+        widget: {
+            type: 'password'
+        }
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], FkW7.prototype, "password", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        title: `使用的数据库`,
+        span: 12,
+        required: true
+    }),
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], FkW7.prototype, "database", void 0);
+tslib_1.__decorate([
+    (0, rest_1.Widget)({
+        hideInAdd: true,
+        hideInEdit: true,
+        hideInSearch: true,
+        hideInTable: true
+    }),
+    (0, typeorm_1.DeleteDateColumn)({
+        name: 'delete_date'
+    }),
+    tslib_1.__metadata("design:type", Date)
+], FkW7.prototype, "deleteDate", void 0);
+FkW7 = tslib_1.__decorate([
+    (0, typeorm_1.Entity)({
+        name: 'fk_w7'
+    })
+], FkW7);
+exports.FkW7 = FkW7;

package/dist/entities/w7_chat_topic.d.ts

@@ -0,0 +1,9 @@
+export declare class W7ChatTopicEntity {
+    id: number;
+    uniacid: number;
+    topicName: string;
+    thirdUrl: string;
+    foreverUrl: string;
+    createTime: number;
+    topicStyle: number;
+}

package/dist/entities/w7_chat_topic.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.W7ChatTopicEntity = void 0;
+const tslib_1 = require("tslib");
+const typeorm_1 = require("typeorm");
+let W7ChatTopicEntity = class W7ChatTopicEntity {
+    id;
+    uniacid;
+    topicName;
+    thirdUrl;
+    foreverUrl;
+    createTime;
+    topicStyle;
+};
+tslib_1.__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    tslib_1.__metadata("design:type", Number)
+], W7ChatTopicEntity.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", Number)
+], W7ChatTopicEntity.prototype, "uniacid", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'topic_name'
+    }),
+    tslib_1.__metadata("design:type", String)
+], W7ChatTopicEntity.prototype, "topicName", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'third_url'
+    }),
+    tslib_1.__metadata("design:type", String)
+], W7ChatTopicEntity.prototype, "thirdUrl", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'forever_url'
+    }),
+    tslib_1.__metadata("design:type", String)
+], W7ChatTopicEntity.prototype, "foreverUrl", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'create_time'
+    }),
+    tslib_1.__metadata("design:type", Number)
+], W7ChatTopicEntity.prototype, "createTime", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({
+        name: 'topic_style'
+    }),
+    tslib_1.__metadata("design:type", Number)
+], W7ChatTopicEntity.prototype, "topicStyle", void 0);
+W7ChatTopicEntity = tslib_1.__decorate([
+    (0, typeorm_1.Entity)({
+        name: 'ims_chat_topic'
+    })
+], W7ChatTopicEntity);
+exports.W7ChatTopicEntity = W7ChatTopicEntity;

package/dist/entities/w7_uni_account.d.ts

@@ -0,0 +1,4 @@
+export declare class W7UniAccount {
+    uniacid: number;
+    name: string;
+}

package/dist/entities/w7_uni_account.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.W7UniAccount = void 0;
+const tslib_1 = require("tslib");
+const typeorm_1 = require("typeorm");
+let W7UniAccount = class W7UniAccount {
+    uniacid;
+    name;
+};
+tslib_1.__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    tslib_1.__metadata("design:type", Number)
+], W7UniAccount.prototype, "uniacid", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)(),
+    tslib_1.__metadata("design:type", String)
+], W7UniAccount.prototype, "name", void 0);
+W7UniAccount = tslib_1.__decorate([
+    (0, typeorm_1.Entity)({
+        name: 'ims_uni_account'
+    })
+], W7UniAccount);
+exports.W7UniAccount = W7UniAccount;

package/dist/fk-upload.module.d.ts

@@ -1,2 +1,7 @@
+import { AppInit, Injector, Next } from '@nger/core';
+export declare class FkUploadAppInit extends AppInit {
+    constructor();
+    handle(injector: Injector, next?: Next): Promise<void>;
+}
 export declare class FkUploadModule {
 }

package/dist/fk-upload.module.js

@@ -1,64 +1,97 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FkUploadModule = void 0;
+exports.FkUploadModule = exports.FkUploadAppInit = void 0;
 const tslib_1 = require("tslib");
-const check_upload_1 = require("./templates/check-upload");
+const fk_jiqun_1 = require("./entities/fk-jiqun");
+const w7_account_1 = require("./entities/w7-account");
+const w7_1 = require("./entities/w7");
+const rest_1 = require("@nger/rest");
+const download_task_1 = require("./entities/download-task");
+const effect_task_1 = require("./entities/effect-task");
 const core_1 = require("@nger/core");
 const typeorm_1 = require("@nger/typeorm");
-const entities_1 = require("./entities");
-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 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/tasks/task.service");
-const providers_1 = require("./templates/tasks/providers");
-const upload_1 = require("./templates/upload");
-const upload_task_1 = require("./templates/upload-task");
-const verify_1 = require("./templates/verify");
-const urlSafeBase64Decode_1 = require("./urlSafeBase64Decode");
-const fk_service_1 = require("./templates/tasks/fk.service");
-const player_1 = require("./templates/player");
+const fk_account_1 = require("./entities/fk-account");
+const upload_task_1 = require("./entities/upload-task");
+const check_task_1 = require("./entities/check-task");
+const login_service_1 = require("./services/login.service");
+const axios_1 = require("@nger/axios");
+const utils_1 = require("@nger/utils");
+const verify_1 = require("./controllers/verify");
+const code_1 = require("./controllers/code");
+const relogin_1 = require("./controllers/relogin");
+const typeorm_2 = require("@nger/typeorm");
+const download_service_1 = require("./services/download.service");
+const providers_1 = require("./tasks/providers");
+const client_service_1 = require("./services/client.service");
+const upload_service_1 = require("./services/upload.service");
+const fk_service_1 = require("./services/fk.service");
+const effect_service_1 = require("./services/effect.service");
+const schedule_1 = require("@nger/schedule");
+const check_service_1 = require("./services/check.service");
+class FkUploadAppInit extends core_1.AppInit {
+    constructor() {
+        super(`fk-upload app init`);
+    }
+    async handle(injector, next) {
+        const db = injector.get(typeorm_2.Db);
+        const client = injector.get(client_service_1.ClientService);
+        const clientId = client.createClientId();
+        const jiqun = await db.manager.findOne(fk_jiqun_1.FkJiQun, { where: { clientId: clientId } });
+        if (!jiqun) {
+            const item = new fk_jiqun_1.FkJiQun();
+            item.clientId = clientId;
+            await db.manager.save(item);
+        }
+        next && next();
+    }
+}
+exports.FkUploadAppInit = FkUploadAppInit;
 let FkUploadModule = class FkUploadModule {
 };
 FkUploadModule = tslib_1.__decorate([
     (0, core_1.Module)({
         providers: [
-            urlSafeBase64Decode_1.UrlSafeBase64,
-            task_service_1.TaskService,
-            fk_service_1.FkService,
-            ...providers_1.tasksProviders,
+            login_service_1.FkLoginService,
+            client_service_1.ClientService,
+            effect_service_1.EffectService,
+            check_service_1.CheckService,
             {
-                provide: core_1.LoadAddon,
-                useFactory: () => new mq_runner_1.MqRunner(),
+                provide: core_1.AppInit,
+                useFactory: () => new FkUploadAppInit(),
                 multi: true
-            }
+            },
+            download_service_1.DownloadService,
+            upload_service_1.UploadService,
+            fk_service_1.FkService,
+            ...providers_1.tasksProviders
         ],
         controllers: [
-            code_1.FkUploadCodeController,
-            login_controller_1.LoginController,
             verify_1.VerifyController,
-            help_1.HelpController,
-            upload_1.UploadController,
-            upload_task_1.UploadTaskController,
-            add_fk_login_1.AddFkLoginController,
-            task_manage_1.TaskManageController,
-            add_task_1.AddTaskController,
-            error_1.ErrorController,
-            setting_1.SettingController,
-            player_1.Player,
-            check_upload_1.CheckUploadController
+            code_1.FkUploadCodeController,
+            relogin_1.ReloginController
         ],
         imports: [
+            axios_1.AxiosModule,
+            utils_1.UtilsModule,
+            schedule_1.ScheduleModule,
             typeorm_1.TypeormModule.forFeature([
-                entities_1.FkLoginEntity,
-                entities_1.FkLoginCookieEntity,
-                entities_1.FkDownloadTaskEntity
-            ])
+                upload_task_1.FkUploadTask,
+                fk_account_1.FkAccount,
+                effect_task_1.FkEffectTask,
+                download_task_1.FkDownloadTask,
+                w7_1.FkW7,
+                check_task_1.FkCheckTask,
+                w7_account_1.FkW7Account,
+                fk_jiqun_1.FkJiQun
+            ]),
+            rest_1.RestModule.forFeature(upload_task_1.FkUploadTask, 'fk_upload_task'),
+            rest_1.RestModule.forFeature(fk_jiqun_1.FkJiQun, 'fk_ji_qun'),
+            rest_1.RestModule.forFeature(w7_account_1.FkW7Account, 'fk_w7_account'),
+            rest_1.RestModule.forFeature(check_task_1.FkCheckTask, 'fk_check_task'),
+            rest_1.RestModule.forFeature(w7_1.FkW7, 'fk_w7'),
+            rest_1.RestModule.forFeature(fk_account_1.FkAccount, 'fk_account'),
+            rest_1.RestModule.forFeature(effect_task_1.FkEffectTask, 'fk_effect_task'),
+            rest_1.RestModule.forFeature(download_task_1.FkDownloadTask, 'fk_download_task')
         ]
     })
 ], FkUploadModule);

package/dist/main.d.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import "reflect-metadata";
 export declare class AppModule {
 }

package/dist/main.js

@@ -1,47 +1,36 @@
+#!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
 require('dotenv').config();
+const main_1 = require("@nger/main");
 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");
 const sirv_1 = require("@nger/sirv");
+const rest_1 = require("@nger/rest");
+const upload_1 = require("@nger/upload");
+const rabbitmq_1 = require("@nger/rabbitmq");
+const fk_upload_module_1 = require("./fk-upload.module");
 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,
-            sirv_1.SirvModule.forRoot(),
-            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: []
+            sirv_1.SirvModule.forRoot(),
+            rest_1.RestModule,
+            upload_1.UploadModule,
+            fk_upload_module_1.FkUploadModule
+        ]
     })
 ], AppModule);
 exports.AppModule = AppModule;
-(0, core_1.platformCore)().bootstrap(AppModule).then(() => {
-    if (process && process.send)
-        process.send('ready');
+(0, main_1.platformNger)().bootstrap(AppModule);
+process.on('uncaughtException', (e) => {
+    console.log(e);
+});
+process.on('unhandledRejection', (reason, e) => {
+    console.log(reason);
+    e.catch(i => console.log(i));
 });

package/dist/services/check.service.d.ts

@@ -0,0 +1,6 @@
+import { Injector } from "@nger/core";
+export declare class CheckService {
+    private injector;
+    constructor(injector: Injector);
+    start(id: number, from: string, to: string): Promise<void>;
+}

package/dist/services/check.service.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CheckService = void 0;
+const tslib_1 = require("tslib");
+const rabbitmq_1 = require("@nger/rabbitmq");
+const rabbitmq_2 = require("@nger/rabbitmq");
+const typeorm_1 = require("@nger/typeorm");
+const core_1 = require("@nger/core");
+const check_task_1 = require("../entities/check-task");
+const actions_1 = require("../tasks/actions");
+let CheckService = class CheckService {
+    injector;
+    constructor(injector) {
+        this.injector = injector;
+    }
+    async start(id, from, to) {
+        const db = this.injector.get(typeorm_1.Db);
+        const download = await db.manager.findOneOrFail(check_task_1.FkCheckTask, {
+            where: { id }
+        });
+        const taskManager = this.injector.get(rabbitmq_2.TaskManager);
+        const t = new rabbitmq_1.TaskEntity();
+        t.topic = actions_1.CHECK_ACTION;
+        t.data = { id: download.id, from, to };
+        await taskManager.send(t);
+    }
+};
+CheckService = tslib_1.__decorate([
+    (0, core_1.Injectable)(),
+    tslib_1.__metadata("design:paramtypes", [core_1.Injector])
+], CheckService);
+exports.CheckService = CheckService;

package/dist/services/client.service.d.ts

@@ -0,0 +1,6 @@
+import { Injector } from "@nger/core";
+export declare class ClientService {
+    private injector;
+    constructor(injector: Injector);
+    createClientId(): any;
+}

package/dist/services/client.service.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientService = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@nger/core");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const uuid_1 = require("uuid");
+let ClientService = class ClientService {
+    injector;
+    constructor(injector) {
+        this.injector = injector;
+    }
+    createClientId() {
+        const root = this.injector.get(core_1.APP_ROOT);
+        const file = (0, path_1.join)(root, 'client.txt');
+        if ((0, fs_1.existsSync)(file)) {
+            return (0, fs_1.readFileSync)(file).toString('utf-8');
+        }
+        const clientId = (0, uuid_1.v4)();
+        (0, fs_1.writeFileSync)(file, clientId);
+        return clientId;
+    }
+};
+ClientService = tslib_1.__decorate([
+    (0, core_1.Injectable)(),
+    tslib_1.__metadata("design:paramtypes", [core_1.Injector])
+], ClientService);
+exports.ClientService = ClientService;

package/dist/services/download.service.d.ts

@@ -0,0 +1,15 @@
+import { Injector } from "@nger/core";
+import { Db } from "@nger/typeorm";
+export declare class DownloadService {
+    private injector;
+    private db;
+    constructor(injector: Injector, db: Db);
+    startDownload(id: number): Promise<void>;
+    start(id: number): Promise<void>;
+    starts(ids: number[]): Promise<void[]>;
+    continue(id: number): Promise<void>;
+    stop(id: number): Promise<void>;
+    stops(ids: number[]): Promise<void[]>;
+    createDir(): string;
+    createFilename(url: string): string;
+}