@nger/fk-upload 1.0.7 → 1.0.8

package/dist/fk-upload.module.js

@@ -9,12 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FkUploadModule = void 0;
 const core_1 = require("@nger/core");
 const typeorm_1 = require("@nger/typeorm");
-const utils_1 = require("@nger/utils");
 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 add_fk_login_1 = require("./templates/add-fk-login");
 const add_task_1 = require("./templates/add-task");
@@ -33,13 +29,10 @@ 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
         ],
         controllers: [
-            fk_upload_controller_1.FkAjaxController,
             code_1.FkUploadCodeController,
             login_controller_1.LoginController,
             verify_1.VerifyController,
@@ -58,8 +51,7 @@ FkUploadModule = __decorate([
                 entities_1.FkLoginCookieEntity,
                 entities_1.FkDownloadTaskEntity,
                 fk_login_account_entity_1.FkLoginAccountEntity
-            ]),
-            utils_1.UtilsModule
+            ])
         ]
     })
 ], FkUploadModule);

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

@@ -15,6 +15,7 @@ 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");
 let AppModule = class AppModule {
 };
 AppModule = __decorate([
@@ -27,7 +28,8 @@ AppModule = __decorate([
             fk_upload_module_1.FkUploadModule,
             http_1.HttpModule.forEnv(),
             typeorm_1.TypeormModule.forEnv(),
-            api_1.ApiModule
+            api_1.ApiModule,
+            utils_1.UtilsModule
         ],
         controllers: []
     })

package/dist/templates/upload.service.d.ts

@@ -1,9 +1,11 @@
 import { FkDownloadTaskEntity } from '../entities';
 import { Db } from '@nger/typeorm';
 import { Observable } from 'rxjs';
+import { Injector } from '@nger/core';
 export declare class UploadService {
     private db;
-    constructor(db: Db);
+    private injector;
+    constructor(db: Db, injector: Injector);
     createDownLoadTask(url: string, fkLoginId: number): Promise<import("rxjs").Subscription>;
     getUploadUrl(token: any, forceDirect?: boolean): string;
     getUploadInfourl(token: any): string;

package/dist/templates/upload.service.js

@@ -25,10 +25,13 @@ const md5_file_1 = __importDefault(require("md5-file"));
 const core_1 = require("@nger/core");
 const axios_1 = __importDefault(require("axios"));
 const form_data_1 = __importDefault(require("form-data"));
+const fs_extra_1 = require("fs-extra");
 let UploadService = class UploadService {
     db;
-    constructor(db) {
+    injector;
+    constructor(db, injector) {
         this.db = db;
+        this.injector = injector;
     }
     async createDownLoadTask(url, fkLoginId) {
         const observable = await this.createObservable(url);
@@ -229,11 +232,13 @@ let UploadService = class UploadService {
             return { listen: observable, filename };
         }
         ;
+        const root = this.injector.get(core_1.APP_ROOT);
         const observable = new rxjs_1.Observable((sub) => {
             let task = new entities_1.FkDownloadTaskEntity();
             task.url = url;
             const req = (0, request_1.get)(url);
-            const path = (0, path_1.join)(__dirname, 'dist', encodeURIComponent(filename));
+            (0, fs_extra_1.ensureDirSync)((0, path_1.join)(root, 'attachments/fk-upload'));
+            const path = (0, path_1.join)(root, 'attachments/fk-upload', encodeURIComponent(filename));
             const writeStream = (0, fs_1.createWriteStream)(path);
             task.path = path;
             let total = 0;
@@ -267,7 +272,7 @@ let UploadService = class UploadService {
 };
 UploadService = __decorate([
     (0, core_1.Injectable)(),
-    __metadata("design:paramtypes", [typeorm_1.Db])
+    __metadata("design:paramtypes", [typeorm_1.Db, core_1.Injector])
 ], UploadService);
 exports.UploadService = UploadService;
 function decode(base64Str) {

package/package.json

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