@nger/fk-upload 1.0.85 → 1.0.91

package/dist/templates/check-upload.js

@@ -84,7 +84,7 @@ let CheckUploadController = class CheckUploadController {
         const download = this.db.manager.getRepository(fk_download_task_entity_1.FkDownloadTaskEntity);
         const errors = await download.find({ where: { uploadUrl: (0, typeorm_2.Like)('https://site%') } });
         await download.update(errors.map(err => err.filename), { status: 1 });
-        const list = await download.find({ where: { status: 1 } });
+        const list = await download.find({ where: { status: 1, totalSize: (0, typeorm_2.LessThan)(1024 * 1024 * 1024) } });
         const task = this.injector.get(task_service_1.TaskService);
         await Promise.all(list.map(async (item) => {
             const upload = await task.createUploadTask({

package/dist/templates/setting.d.ts

@@ -3,11 +3,13 @@ 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;
-    constructor(task: TaskService, redis: Client, manager: TaskManager);
-    saveSetting(body: any, ctx: Context): Promise<void>;
+    private db;
+    constructor(task: TaskService, redis: Client, manager: TaskManager, db: Db);
+    saveSetting(body: any, taskId: number, ctx: Context): Promise<void>;
     setting(): Promise<JSX.Element>;
 }

package/dist/templates/setting.js

@@ -8,36 +8,34 @@ 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;
-    constructor(task, redis, manager) {
+    db;
+    constructor(task, redis, manager, db) {
         this.task = task;
         this.redis = redis;
         this.manager = manager;
+        this.db = db;
     }
-    async saveSetting(body, ctx) {
-        const task = await this.task.createScheduleTask(body.name, body.rule);
+    async saveSetting(body, taskId, ctx) {
+        const task = await this.task.createScheduleTask(body.name, body.rule, Number(taskId));
         await this.manager.send(task);
         ctx.redirect(`/@nger/fk-upload/setting`);
         return;
     }
     async setting() {
-        const setting = await new Promise((resolve, reject) => {
-            this.redis.get(`setting`, (err, reply) => {
-                if (err)
-                    return reject(err);
-                if (reply)
-                    resolve(JSON.parse(reply));
-                resolve({});
-            });
-        });
+        const task = await this.db.manager.findOne(rabbitmq_1.TaskEntity, { where: { topic: actions_1.SCHEDULE_ACTION } });
+        const setting = task ? task.data : {};
+        const url = `/@nger/fk-upload/setting?id=${task.taskId}`;
         return react_1.default.createElement(component_1.Nav, { active: 4 },
             react_1.default.createElement("div", { className: "card" },
                 react_1.default.createElement("div", { className: "card-body" },
-                    react_1.default.createElement("form", { action: "/@nger/fk-upload/setting", method: 'post', encType: 'application/x-www-form-urlencoded' },
+                    react_1.default.createElement("form", { action: url, method: 'post', encType: 'application/x-www-form-urlencoded' },
                         react_1.default.createElement("div", { className: "form-group" },
                             react_1.default.createElement("label", { htmlFor: "name" }, "\u540D\u79F0"),
                             react_1.default.createElement("input", { type: "text", className: 'form-control', onChange: e => { }, value: setting.name, id: "name", name: "name" })),
@@ -52,9 +50,10 @@ let SettingController = class SettingController {
 tslib_1.__decorate([
     (0, http_1.Post)('setting'),
     tslib_1.__param(0, (0, http_1.Body)()),
-    tslib_1.__param(1, (0, core_1.Inject)(http_1.CONTEXT)),
+    tslib_1.__param(1, (0, http_1.Query)('id')),
+    tslib_1.__param(2, (0, core_1.Inject)(http_1.CONTEXT)),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [Object, Number, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], SettingController.prototype, "saveSetting", null);
 tslib_1.__decorate([
@@ -65,6 +64,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])
+    tslib_1.__metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client, rabbitmq_1.TaskManager, typeorm_1.Db])
 ], SettingController);
 exports.SettingController = SettingController;

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

@@ -14,6 +14,7 @@ class EffectTask extends rabbitmq_1.Task {
     async handle(injector, next) {
         const task = injector.get(rabbitmq_1.DATA);
         const complete = injector.get(rabbitmq_1.COMPLETE);
+        console.log(`effect`, task.filename);
         if (task.uploadUrl.startsWith('https://site')) {
             await complete();
             return next && next();

package/dist/templates/tasks/task.service.d.ts

@@ -5,7 +5,7 @@ export declare class TaskService {
     private injector;
     constructor(injector: Injector);
     createEffectTask(filename: string, uploadUrl: string, topicId: number, path: string): Promise<TaskEntity<any>>;
-    createScheduleTask(name: string, rule: string): Promise<TaskEntity<any>>;
+    createScheduleTask(name: string, rule: string, id?: number): Promise<TaskEntity<any>>;
     createUploadTask(download: IDownloadTask, total: number, md5: string, injector: Injector): Promise<TaskEntity<IUploadTask>>;
     createDownLoadTask(url: string, loginId: number, topicId: number): Promise<TaskEntity<IDownloadTask>>;
 }

package/dist/templates/tasks/task.service.js

@@ -29,12 +29,14 @@ let TaskService = class TaskService {
         task.data = effect;
         return task;
     }
-    async createScheduleTask(name, rule) {
+    async createScheduleTask(name, rule, id) {
         const schedule = {
             name,
             rule
         };
         const task = new rabbitmq_1.TaskEntity();
+        if (id)
+            task.taskId = id;
         task.topic = actions_1.SCHEDULE_ACTION;
         task.data = schedule;
         return task;

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

@@ -30,7 +30,7 @@ class UploadTask extends rabbitmq_1.Task {
             await complete();
             return next && next();
         }
-        if (!(0, fs_1.existsSync)(task.path) || (old.fileMd5 && old.fileMd5.length > 0)) {
+        if (!(0, fs_1.existsSync)(task.path) || !(old.fileMd5 && old.fileMd5.length > 0)) {
             await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
             await complete();
             return next && next();

package/package.json

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