@nger/fk-upload 1.0.38 → 1.0.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core.js +2 -15
- package/dist/entities/fk-download-task.entity.js +26 -34
- package/dist/entities/fk-login-cookie.entity.js +12 -20
- package/dist/entities/fk-login.entity.js +22 -30
- package/dist/entities/index.js +4 -17
- package/dist/fk-upload.module.js +2 -7
- package/dist/login.controller.js +17 -31
- package/dist/main.js +7 -10
- package/dist/templates/add-fk-login.js +28 -42
- package/dist/templates/add-task.js +26 -32
- package/dist/templates/code.js +8 -22
- package/dist/templates/component.js +7 -9
- package/dist/templates/error.js +8 -22
- package/dist/templates/help.js +13 -24
- package/dist/templates/player.js +7 -18
- package/dist/templates/setting.js +18 -32
- package/dist/templates/task-manage.js +19 -33
- package/dist/templates/tasks/download-task.js +14 -5
- package/dist/templates/tasks/effect-task.js +1 -1
- package/dist/templates/tasks/fk.service.js +6 -16
- package/dist/templates/tasks/task.service.js +17 -17
- package/dist/templates/upload-task.js +10 -24
- package/dist/templates/upload.js +31 -45
- package/dist/templates/verify.js +18 -32
- package/dist/urlSafeBase64Decode.js +2 -7
- package/docs.md +1 -0
- package/package.json +8 -6
- package/pnpm-lock.yaml +43 -1
@@ -1,25 +1,11 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
-
};
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
16
|
-
};
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
3
|
exports.AddTaskController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
19
5
|
const core_1 = require("@nger/core");
|
20
6
|
const http_1 = require("@nger/http");
|
21
7
|
const component_1 = require("./component");
|
22
|
-
const react_1 = __importDefault(require("react"));
|
8
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
23
9
|
const typeorm_1 = require("@nger/typeorm");
|
24
10
|
const entities_1 = require("../entities");
|
25
11
|
const task_service_1 = require("./tasks/task.service");
|
@@ -38,6 +24,14 @@ let AddTaskController = class AddTaskController {
|
|
38
24
|
const loginEntity = await this.db.manager.findOne(entities_1.FkLoginEntity, { where: { w7Username: we7Username } });
|
39
25
|
if (loginEntity) {
|
40
26
|
const task = await this.taskService.createDownLoadTask(url, loginEntity.fkLoginId, 0);
|
27
|
+
const download = task.data;
|
28
|
+
const fkdownloadTask = new entities_1.FkDownloadTaskEntity();
|
29
|
+
fkdownloadTask.filename = download.filename;
|
30
|
+
fkdownloadTask.loginId = download.loginId;
|
31
|
+
fkdownloadTask.path = download.path;
|
32
|
+
fkdownloadTask.url = download.url;
|
33
|
+
fkdownloadTask.topicId = download.topicId;
|
34
|
+
await this.db.manager.save(entities_1.FkDownloadTaskEntity, fkdownloadTask);
|
41
35
|
await this.task.send(task);
|
42
36
|
}
|
43
37
|
ctx.redirect('/@nger/fk-upload/task-manage');
|
@@ -49,32 +43,32 @@ let AddTaskController = class AddTaskController {
|
|
49
43
|
react_1.default.createElement("div", { className: "card-body" },
|
50
44
|
react_1.default.createElement("form", { action: "/@nger/fk-upload/add-task", method: "post" },
|
51
45
|
react_1.default.createElement("div", { className: "form-group" },
|
52
|
-
react_1.default.createElement("label", { htmlFor: "url" }, "
|
46
|
+
react_1.default.createElement("label", { htmlFor: "url" }, "\u8FDE\u63A5"),
|
53
47
|
react_1.default.createElement("input", { type: "text", name: "url", className: 'form-control', id: "url" })),
|
54
48
|
react_1.default.createElement("div", { className: "form-group" },
|
55
|
-
react_1.default.createElement("label", { htmlFor: "w7Username" }, "
|
49
|
+
react_1.default.createElement("label", { htmlFor: "w7Username" }, "\u5FAE\u64CE\u8D26\u6237"),
|
56
50
|
react_1.default.createElement("input", { type: "text", name: "we7Username", className: 'form-control', id: "w7Username" })),
|
57
51
|
react_1.default.createElement("div", { className: "form-group" },
|
58
|
-
react_1.default.createElement("button", { type: "submit", className: "btn btn-primary" }, "
|
59
|
-
react_1.default.createElement("button", { type: "reset", className: "btn" }, "
|
52
|
+
react_1.default.createElement("button", { type: "submit", className: "btn btn-primary" }, "\u63D0\u4EA4"),
|
53
|
+
react_1.default.createElement("button", { type: "reset", className: "btn" }, "\u91CD\u7F6E"))))));
|
60
54
|
}
|
61
55
|
};
|
62
|
-
__decorate([
|
56
|
+
tslib_1.__decorate([
|
63
57
|
(0, http_1.Post)('add-task'),
|
64
|
-
__param(0, (0, http_1.Body)()),
|
65
|
-
__param(1, (0, core_1.Inject)(http_1.CONTEXT)),
|
66
|
-
__metadata("design:type", Function),
|
67
|
-
__metadata("design:paramtypes", [Object, Object]),
|
68
|
-
__metadata("design:returntype", Promise)
|
58
|
+
tslib_1.__param(0, (0, http_1.Body)()),
|
59
|
+
tslib_1.__param(1, (0, core_1.Inject)(http_1.CONTEXT)),
|
60
|
+
tslib_1.__metadata("design:type", Function),
|
61
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
62
|
+
tslib_1.__metadata("design:returntype", Promise)
|
69
63
|
], AddTaskController.prototype, "postAddTask", null);
|
70
|
-
__decorate([
|
64
|
+
tslib_1.__decorate([
|
71
65
|
(0, http_1.Get)('add-task'),
|
72
|
-
__metadata("design:type", Function),
|
73
|
-
__metadata("design:paramtypes", []),
|
74
|
-
__metadata("design:returntype", void 0)
|
66
|
+
tslib_1.__metadata("design:type", Function),
|
67
|
+
tslib_1.__metadata("design:paramtypes", []),
|
68
|
+
tslib_1.__metadata("design:returntype", void 0)
|
75
69
|
], AddTaskController.prototype, "addTask", null);
|
76
|
-
AddTaskController = __decorate([
|
70
|
+
AddTaskController = tslib_1.__decorate([
|
77
71
|
(0, core_1.Controller)('@nger/fk-upload'),
|
78
|
-
__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager, task_service_1.TaskService])
|
72
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, rabbitmq_1.TaskManager, task_service_1.TaskService])
|
79
73
|
], AddTaskController);
|
80
74
|
exports.AddTaskController = AddTaskController;
|
package/dist/templates/code.js
CHANGED
@@ -1,23 +1,9 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
-
};
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
16
|
-
};
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
3
|
exports.FkUploadCodeController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
19
5
|
const core_1 = require("@nger/core");
|
20
|
-
const react_1 = __importDefault(require("react"));
|
6
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
21
7
|
const http_1 = require("@nger/http");
|
22
8
|
let FkUploadCodeController = class FkUploadCodeController {
|
23
9
|
upload(loginId) {
|
@@ -38,14 +24,14 @@ initFaicaptcha({
|
|
38
24
|
} }));
|
39
25
|
}
|
40
26
|
};
|
41
|
-
__decorate([
|
27
|
+
tslib_1.__decorate([
|
42
28
|
(0, http_1.Get)('code'),
|
43
|
-
__param(0, (0, http_1.Query)('loginId')),
|
44
|
-
__metadata("design:type", Function),
|
45
|
-
__metadata("design:paramtypes", [String]),
|
46
|
-
__metadata("design:returntype", void 0)
|
29
|
+
tslib_1.__param(0, (0, http_1.Query)('loginId')),
|
30
|
+
tslib_1.__metadata("design:type", Function),
|
31
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
32
|
+
tslib_1.__metadata("design:returntype", void 0)
|
47
33
|
], FkUploadCodeController.prototype, "upload", null);
|
48
|
-
FkUploadCodeController = __decorate([
|
34
|
+
FkUploadCodeController = tslib_1.__decorate([
|
49
35
|
(0, core_1.Controller)('@nger/fk-upload')
|
50
36
|
], FkUploadCodeController);
|
51
37
|
exports.FkUploadCodeController = FkUploadCodeController;
|
@@ -1,26 +1,24 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
3
|
exports.Nav = void 0;
|
7
|
-
const
|
4
|
+
const tslib_1 = require("tslib");
|
5
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
8
6
|
function Nav(props) {
|
9
7
|
const navs = [{
|
10
8
|
link: '/@nger/fk-upload/help',
|
11
|
-
title: '
|
9
|
+
title: '账户'
|
12
10
|
}, {
|
13
11
|
link: '/@nger/fk-upload/add-fk-login',
|
14
|
-
title: '
|
12
|
+
title: '添加账户'
|
15
13
|
}, {
|
16
14
|
link: '/@nger/fk-upload/task-manage',
|
17
|
-
title: '
|
15
|
+
title: '任务'
|
18
16
|
}, {
|
19
17
|
link: '/@nger/fk-upload/add-task',
|
20
|
-
title: '
|
18
|
+
title: '添加任务'
|
21
19
|
}, {
|
22
20
|
link: '/@nger/fk-upload/setting',
|
23
|
-
title: '
|
21
|
+
title: '设置'
|
24
22
|
}];
|
25
23
|
return react_1.default.createElement("div", null,
|
26
24
|
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/error.js
CHANGED
@@ -1,25 +1,11 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
-
};
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
16
|
-
};
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
3
|
exports.ErrorController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
19
5
|
const core_1 = require("@nger/core");
|
20
6
|
const http_1 = require("@nger/http");
|
21
7
|
const component_1 = require("./component");
|
22
|
-
const react_1 = __importDefault(require("react"));
|
8
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
23
9
|
let ErrorController = class ErrorController {
|
24
10
|
error(msg) {
|
25
11
|
return react_1.default.createElement(component_1.Nav, { active: -1 },
|
@@ -28,14 +14,14 @@ let ErrorController = class ErrorController {
|
|
28
14
|
react_1.default.createElement("div", { className: "alert alert-danger", role: "alert" }, msg))));
|
29
15
|
}
|
30
16
|
};
|
31
|
-
__decorate([
|
17
|
+
tslib_1.__decorate([
|
32
18
|
(0, http_1.Get)('error'),
|
33
|
-
__param(0, (0, http_1.Query)('msg')),
|
34
|
-
__metadata("design:type", Function),
|
35
|
-
__metadata("design:paramtypes", [String]),
|
36
|
-
__metadata("design:returntype", void 0)
|
19
|
+
tslib_1.__param(0, (0, http_1.Query)('msg')),
|
20
|
+
tslib_1.__metadata("design:type", Function),
|
21
|
+
tslib_1.__metadata("design:paramtypes", [String]),
|
22
|
+
tslib_1.__metadata("design:returntype", void 0)
|
37
23
|
], ErrorController.prototype, "error", null);
|
38
|
-
ErrorController = __decorate([
|
24
|
+
ErrorController = tslib_1.__decorate([
|
39
25
|
(0, core_1.Controller)('@nger/fk-upload')
|
40
26
|
], ErrorController);
|
41
27
|
exports.ErrorController = ErrorController;
|
package/dist/templates/help.js
CHANGED
@@ -1,22 +1,11 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
|
-
};
|
14
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
3
|
exports.HelpController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
16
5
|
const core_1 = require("@nger/core");
|
17
6
|
const http_1 = require("@nger/http");
|
18
7
|
const typeorm_1 = require("@nger/typeorm");
|
19
|
-
const react_1 = __importDefault(require("react"));
|
8
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
20
9
|
const fk_login_entity_1 = require("../entities/fk-login.entity");
|
21
10
|
const component_1 = require("./component");
|
22
11
|
let HelpController = class HelpController {
|
@@ -33,8 +22,8 @@ let HelpController = class HelpController {
|
|
33
22
|
react_1.default.createElement("table", { className: 'table' },
|
34
23
|
react_1.default.createElement("thead", null,
|
35
24
|
react_1.default.createElement("tr", null,
|
36
|
-
react_1.default.createElement("td", null, "
|
37
|
-
react_1.default.createElement("td", null, "
|
25
|
+
react_1.default.createElement("td", null, "\u7528\u6237\u540D"),
|
26
|
+
react_1.default.createElement("td", null, "\u5FAE\u64CE\u7528\u6237"),
|
38
27
|
react_1.default.createElement("td", null),
|
39
28
|
react_1.default.createElement("td", null))),
|
40
29
|
react_1.default.createElement("tbody", null, list.map((li, key) => {
|
@@ -47,20 +36,20 @@ let HelpController = class HelpController {
|
|
47
36
|
react_1.default.createElement("td", null, li.status ? 'binded' : 'unbind'),
|
48
37
|
react_1.default.createElement("td", null,
|
49
38
|
react_1.default.createElement("div", { className: "btn-group" },
|
50
|
-
react_1.default.createElement("a", { className: "btn btn-primary", href: url }, li.status ? '
|
51
|
-
react_1.default.createElement("a", { className: "btn btn-link", href: edit }, "
|
52
|
-
react_1.default.createElement("a", { className: "btn btn-danger", href: del }, "
|
39
|
+
react_1.default.createElement("a", { className: "btn btn-primary", href: url }, li.status ? '重新绑定' : '绑定'),
|
40
|
+
react_1.default.createElement("a", { className: "btn btn-link", href: edit }, "\u7F16\u8F91"),
|
41
|
+
react_1.default.createElement("a", { className: "btn btn-danger", href: del }, "\u5220\u9664"))));
|
53
42
|
}))))));
|
54
43
|
}
|
55
44
|
};
|
56
|
-
__decorate([
|
45
|
+
tslib_1.__decorate([
|
57
46
|
(0, http_1.Get)('help'),
|
58
|
-
__metadata("design:type", Function),
|
59
|
-
__metadata("design:paramtypes", []),
|
60
|
-
__metadata("design:returntype", Promise)
|
47
|
+
tslib_1.__metadata("design:type", Function),
|
48
|
+
tslib_1.__metadata("design:paramtypes", []),
|
49
|
+
tslib_1.__metadata("design:returntype", Promise)
|
61
50
|
], HelpController.prototype, "help", null);
|
62
|
-
HelpController = __decorate([
|
51
|
+
HelpController = tslib_1.__decorate([
|
63
52
|
(0, core_1.Controller)('@nger/fk-upload'),
|
64
|
-
__metadata("design:paramtypes", [typeorm_1.Db])
|
53
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_1.Db])
|
65
54
|
], HelpController);
|
66
55
|
exports.HelpController = HelpController;
|
package/dist/templates/player.js
CHANGED
@@ -1,34 +1,23 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
|
-
};
|
14
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
3
|
exports.Player = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
16
5
|
const core_1 = require("@nger/core");
|
17
6
|
const http_1 = require("@nger/http");
|
18
|
-
const react_1 = __importDefault(require("react"));
|
7
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
19
8
|
let Player = class Player {
|
20
9
|
player() {
|
21
10
|
return react_1.default.createElement("div", null,
|
22
11
|
react_1.default.createElement("video", { controls: true, autoPlay: true, src: "https://17854642.s21v.faiusr.com/58/ABUIABA6GAAg0___kwYozPPaiAI.mp4" }));
|
23
12
|
}
|
24
13
|
};
|
25
|
-
__decorate([
|
14
|
+
tslib_1.__decorate([
|
26
15
|
(0, http_1.Get)(`player`),
|
27
|
-
__metadata("design:type", Function),
|
28
|
-
__metadata("design:paramtypes", []),
|
29
|
-
__metadata("design:returntype", void 0)
|
16
|
+
tslib_1.__metadata("design:type", Function),
|
17
|
+
tslib_1.__metadata("design:paramtypes", []),
|
18
|
+
tslib_1.__metadata("design:returntype", void 0)
|
30
19
|
], Player.prototype, "player", null);
|
31
|
-
Player = __decorate([
|
20
|
+
Player = tslib_1.__decorate([
|
32
21
|
(0, core_1.Controller)(`@nger/fk-upload`)
|
33
22
|
], Player);
|
34
23
|
exports.Player = Player;
|
@@ -1,24 +1,10 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
-
};
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
16
|
-
};
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
3
|
exports.SettingController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
19
5
|
const core_1 = require("@nger/core");
|
20
6
|
const http_1 = require("@nger/http");
|
21
|
-
const react_1 = __importDefault(require("react"));
|
7
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
22
8
|
const component_1 = require("./component");
|
23
9
|
const task_service_1 = require("./tasks/task.service");
|
24
10
|
const redis_1 = require("@nger/redis");
|
@@ -53,32 +39,32 @@ let SettingController = class SettingController {
|
|
53
39
|
react_1.default.createElement("div", { className: "card-body" },
|
54
40
|
react_1.default.createElement("form", { action: "/@nger/fk-upload/setting", method: 'post', encType: 'application/x-www-form-urlencoded' },
|
55
41
|
react_1.default.createElement("div", { className: "form-group" },
|
56
|
-
react_1.default.createElement("label", { htmlFor: "name" }, "
|
42
|
+
react_1.default.createElement("label", { htmlFor: "name" }, "\u540D\u79F0"),
|
57
43
|
react_1.default.createElement("input", { type: "text", className: 'form-control', onChange: e => { }, value: setting.name, id: "name", name: "name" })),
|
58
44
|
react_1.default.createElement("div", { className: "form-group" },
|
59
|
-
react_1.default.createElement("label", { htmlFor: "rule" }, "
|
45
|
+
react_1.default.createElement("label", { htmlFor: "rule" }, "\u89C4\u5219"),
|
60
46
|
react_1.default.createElement("input", { type: "text", className: 'form-control', onChange: e => { }, value: setting.rule, id: "rule", name: "rule" })),
|
61
47
|
react_1.default.createElement("div", { className: "form-group" },
|
62
|
-
react_1.default.createElement("button", { type: "submit", className: 'btn btn-primary' }, "
|
63
|
-
react_1.default.createElement("button", { type: "reset", className: 'btn' }, "
|
48
|
+
react_1.default.createElement("button", { type: "submit", className: 'btn btn-primary' }, "\u4FDD\u5B58"),
|
49
|
+
react_1.default.createElement("button", { type: "reset", className: 'btn' }, "\u91CD\u7F6E"))))));
|
64
50
|
}
|
65
51
|
};
|
66
|
-
__decorate([
|
52
|
+
tslib_1.__decorate([
|
67
53
|
(0, http_1.Post)('setting'),
|
68
|
-
__param(0, (0, http_1.Body)()),
|
69
|
-
__param(1, (0, core_1.Inject)(http_1.CONTEXT)),
|
70
|
-
__metadata("design:type", Function),
|
71
|
-
__metadata("design:paramtypes", [Object, Object]),
|
72
|
-
__metadata("design:returntype", Promise)
|
54
|
+
tslib_1.__param(0, (0, http_1.Body)()),
|
55
|
+
tslib_1.__param(1, (0, core_1.Inject)(http_1.CONTEXT)),
|
56
|
+
tslib_1.__metadata("design:type", Function),
|
57
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
58
|
+
tslib_1.__metadata("design:returntype", Promise)
|
73
59
|
], SettingController.prototype, "saveSetting", null);
|
74
|
-
__decorate([
|
60
|
+
tslib_1.__decorate([
|
75
61
|
(0, http_1.Get)(`setting`),
|
76
|
-
__metadata("design:type", Function),
|
77
|
-
__metadata("design:paramtypes", []),
|
78
|
-
__metadata("design:returntype", Promise)
|
62
|
+
tslib_1.__metadata("design:type", Function),
|
63
|
+
tslib_1.__metadata("design:paramtypes", []),
|
64
|
+
tslib_1.__metadata("design:returntype", Promise)
|
79
65
|
], SettingController.prototype, "setting", null);
|
80
|
-
SettingController = __decorate([
|
66
|
+
SettingController = tslib_1.__decorate([
|
81
67
|
(0, core_1.Controller)(`@nger/fk-upload`),
|
82
|
-
__metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client, rabbitmq_1.TaskManager])
|
68
|
+
tslib_1.__metadata("design:paramtypes", [task_service_1.TaskService, redis_1.Client, rabbitmq_1.TaskManager])
|
83
69
|
], SettingController);
|
84
70
|
exports.SettingController = SettingController;
|
@@ -1,25 +1,11 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
13
|
-
};
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
16
|
-
};
|
17
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
18
3
|
exports.TaskManageController = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
19
5
|
const core_1 = require("@nger/core");
|
20
6
|
const http_1 = require("@nger/http");
|
21
7
|
const typeorm_1 = require("@nger/typeorm");
|
22
|
-
const react_1 = __importDefault(require("react"));
|
8
|
+
const react_1 = tslib_1.__importDefault(require("react"));
|
23
9
|
const entities_1 = require("../entities");
|
24
10
|
const component_1 = require("./component");
|
25
11
|
const fs_extra_1 = require("fs-extra");
|
@@ -54,12 +40,12 @@ let TaskManageController = class TaskManageController {
|
|
54
40
|
react_1.default.createElement("table", { className: 'table' },
|
55
41
|
react_1.default.createElement("thead", null,
|
56
42
|
react_1.default.createElement("tr", null,
|
57
|
-
react_1.default.createElement("td", { width: '180px' }, "
|
58
|
-
react_1.default.createElement("td", null, "
|
59
|
-
react_1.default.createElement("td", null, "
|
60
|
-
react_1.default.createElement("td", null, "
|
61
|
-
react_1.default.createElement("td", null, "
|
62
|
-
react_1.default.createElement("td", { width: '240px' }, "
|
43
|
+
react_1.default.createElement("td", { width: '180px' }, "\u6587\u4EF6\u540D"),
|
44
|
+
react_1.default.createElement("td", null, "\u72B6\u6001"),
|
45
|
+
react_1.default.createElement("td", null, "\u5927\u5C0F"),
|
46
|
+
react_1.default.createElement("td", null, "\u4E0B\u8F7D"),
|
47
|
+
react_1.default.createElement("td", null, "\u4E0A\u4F20"),
|
48
|
+
react_1.default.createElement("td", { width: '240px' }, "\u8FDE\u63A5"))),
|
63
49
|
react_1.default.createElement("tbody", null, tasks.map((task, key) => {
|
64
50
|
return react_1.default.createElement("tr", { key: key },
|
65
51
|
react_1.default.createElement("td", null, task.filename),
|
@@ -82,21 +68,21 @@ let TaskManageController = class TaskManageController {
|
|
82
68
|
}
|
83
69
|
}
|
84
70
|
};
|
85
|
-
__decorate([
|
71
|
+
tslib_1.__decorate([
|
86
72
|
(0, http_1.Get)('task-manage'),
|
87
|
-
__metadata("design:type", Function),
|
88
|
-
__metadata("design:paramtypes", []),
|
89
|
-
__metadata("design:returntype", Promise)
|
73
|
+
tslib_1.__metadata("design:type", Function),
|
74
|
+
tslib_1.__metadata("design:paramtypes", []),
|
75
|
+
tslib_1.__metadata("design:returntype", Promise)
|
90
76
|
], TaskManageController.prototype, "taskManage", null);
|
91
|
-
__decorate([
|
77
|
+
tslib_1.__decorate([
|
92
78
|
(0, http_1.Get)('static/task-manage.js'),
|
93
|
-
__param(0, (0, core_1.Inject)(http_1.CONTEXT)),
|
94
|
-
__metadata("design:type", Function),
|
95
|
-
__metadata("design:paramtypes", [Object]),
|
96
|
-
__metadata("design:returntype", void 0)
|
79
|
+
tslib_1.__param(0, (0, core_1.Inject)(http_1.CONTEXT)),
|
80
|
+
tslib_1.__metadata("design:type", Function),
|
81
|
+
tslib_1.__metadata("design:paramtypes", [Object]),
|
82
|
+
tslib_1.__metadata("design:returntype", void 0)
|
97
83
|
], TaskManageController.prototype, "staticTaskManage", null);
|
98
|
-
TaskManageController = __decorate([
|
84
|
+
TaskManageController = tslib_1.__decorate([
|
99
85
|
(0, core_1.Controller)(`@nger/fk-upload`),
|
100
|
-
__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config])
|
86
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_1.Db, core_1.Config])
|
101
87
|
], TaskManageController);
|
102
88
|
exports.TaskManageController = TaskManageController;
|
@@ -1,19 +1,19 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
3
|
exports.DownloadTask = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
7
5
|
const rabbitmq_1 = require("@nger/rabbitmq");
|
8
6
|
const actions_1 = require("./actions");
|
9
7
|
const request_1 = require("request");
|
10
8
|
const fs_1 = require("fs");
|
11
9
|
const fk_service_1 = require("./fk.service");
|
12
|
-
const md5_file_1 = __importDefault(require("md5-file"));
|
10
|
+
const md5_file_1 = tslib_1.__importDefault(require("md5-file"));
|
13
11
|
const fs_extra_1 = require("fs-extra");
|
14
12
|
const path_1 = require("path");
|
15
13
|
const typeorm_1 = require("@nger/typeorm");
|
16
14
|
const entities_1 = require("../../entities");
|
15
|
+
const rxjs_1 = require("rxjs");
|
16
|
+
const operators_1 = require("rxjs/operators");
|
17
17
|
/**
|
18
18
|
* upload and task
|
19
19
|
*/
|
@@ -22,6 +22,7 @@ class DownloadTask extends rabbitmq_1.Task {
|
|
22
22
|
super(actions_1.DOWNLOAD_ACTION);
|
23
23
|
}
|
24
24
|
async handle(injector, next) {
|
25
|
+
const db = injector.get(typeorm_1.Db);
|
25
26
|
const task = injector.get(rabbitmq_1.DATA);
|
26
27
|
const complete = injector.get(rabbitmq_1.COMPLETE);
|
27
28
|
const fail = injector.get(rabbitmq_1.FAIL);
|
@@ -34,12 +35,19 @@ class DownloadTask extends rabbitmq_1.Task {
|
|
34
35
|
'Content-Type': 'application/octet-stream'
|
35
36
|
}
|
36
37
|
});
|
37
|
-
let length = 0;
|
38
38
|
let total = 0;
|
39
|
+
let length = 0;
|
39
40
|
let md5 = ``;
|
41
|
+
console.log(`download ${url}`);
|
42
|
+
const sub = new rxjs_1.Subject();
|
43
|
+
sub.pipe((0, operators_1.throttleTime)(1000), (0, operators_1.switchMap)((size) => {
|
44
|
+
console.log(`download ${task.filename}: ${length}`);
|
45
|
+
return db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { size });
|
46
|
+
})).subscribe();
|
40
47
|
// get split size
|
41
48
|
req.on('data', (buf) => {
|
42
49
|
length += buf.length;
|
50
|
+
sub.next(length);
|
43
51
|
writeStream.write(buf, (err) => {
|
44
52
|
if (err)
|
45
53
|
fail();
|
@@ -47,6 +55,7 @@ class DownloadTask extends rabbitmq_1.Task {
|
|
47
55
|
});
|
48
56
|
req.on('end', async () => {
|
49
57
|
writeStream.end();
|
58
|
+
sub.complete();
|
50
59
|
const fileMd5 = await (0, md5_file_1.default)(task.path);
|
51
60
|
const isEqual = md5 === fileMd5;
|
52
61
|
console.log(`file download success ${task.filename}, check result is ${isEqual}`);
|
@@ -17,8 +17,8 @@ class EffectTask extends rabbitmq_1.Task {
|
|
17
17
|
const fail = injector.get(rabbitmq_1.FAIL);
|
18
18
|
const w7 = injector.get(w7_1.W7DataSource);
|
19
19
|
const db = injector.get(typeorm_1.Db);
|
20
|
+
await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
|
20
21
|
if (task.topicId) {
|
21
|
-
await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 3, uploadUrl: task.uploadUrl });
|
22
22
|
await (0, fs_extra_1.unlink)(task.path);
|
23
23
|
await w7.manager.update(w7_1.W7ChatTopicEntity, task.topicId, { thirdUrl: task.uploadUrl }).then(() => complete()).catch(() => fail());
|
24
24
|
}
|
@@ -1,24 +1,13 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
-
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;
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
-
};
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
10
|
-
};
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
|
-
};
|
14
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
3
|
exports.FkService = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
16
5
|
const typeorm_1 = require("@nger/typeorm");
|
17
6
|
const entities_1 = require("../../entities");
|
18
|
-
const axios_1 = __importDefault(require("axios"));
|
7
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
19
8
|
const core_1 = require("@nger/core");
|
20
9
|
const fs_extra_1 = require("fs-extra");
|
21
|
-
const form_data_1 = __importDefault(require("form-data"));
|
10
|
+
const form_data_1 = tslib_1.__importDefault(require("form-data"));
|
22
11
|
let FkService = class FkService {
|
23
12
|
db;
|
24
13
|
constructor(db) {
|
@@ -174,6 +163,7 @@ let FkService = class FkService {
|
|
174
163
|
task.uploadUrl = fullUrl;
|
175
164
|
}
|
176
165
|
}
|
166
|
+
console.log(`uploading ${index / task.totalChunks}`);
|
177
167
|
index = index + 1;
|
178
168
|
} while (!complete);
|
179
169
|
// upload complete
|
@@ -221,8 +211,8 @@ let FkService = class FkService {
|
|
221
211
|
return h.join('');
|
222
212
|
}
|
223
213
|
};
|
224
|
-
FkService = __decorate([
|
214
|
+
FkService = tslib_1.__decorate([
|
225
215
|
(0, core_1.Injectable)(),
|
226
|
-
__metadata("design:paramtypes", [typeorm_1.Db])
|
216
|
+
tslib_1.__metadata("design:paramtypes", [typeorm_1.Db])
|
227
217
|
], FkService);
|
228
218
|
exports.FkService = FkService;
|