@nger/fk-upload 1.0.163 → 1.0.167

package/dist/electon.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
 const tslib_1 = require("tslib");
 const electron_1 = require("electron");
+const path_1 = require("path");
 require("reflect-metadata");
-require('dotenv').config();
+require('dotenv').config({ path: (0, path_1.join)(__dirname, '../env.env') });
 const core_1 = require("@nger/core");
 const fk_upload_module_1 = require("./fk-upload.module");
 const http_1 = require("@nger/http");
@@ -55,8 +56,8 @@ async function createWindow() {
     win.webContents.closeDevTools();
     electron_1.Menu.setApplicationMenu(null);
     setTimeout(() => {
-        win.loadURL('http://0.0.0.0:8081/@nger/fk-upload/help');
-    }, 200);
+        win.loadURL('http://localhost:8081/@nger/fk-upload/help');
+    }, 400);
 }
 // 
 electron_1.app.whenReady().then(() => {

package/dist/templates/add-task.js

@@ -50,7 +50,7 @@ let AddTaskController = class AddTaskController {
                     react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "we7Username", value: data.username, className: 'form-control', id: "w7Username" })),
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("label", { htmlFor: "w7Username" }, "topicId"),
-                    react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "topicId", value: "{data.id}", className: 'form-control', id: "topicId" })),
+                    react_1.default.createElement("input", { type: "text", onChange: e => { }, name: "topicId", value: data.id, className: 'form-control', id: "topicId" })),
                 react_1.default.createElement("div", { className: "form-group" },
                     react_1.default.createElement("button", { type: "submit", className: "btn btn-primary" }, "\u63D0\u4EA4"),
                     react_1.default.createElement("button", { type: "reset", className: "btn" }, "\u91CD\u7F6E"))));

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

@@ -166,7 +166,7 @@ let FkService = class FkService {
                         ...headers,
                         Cookie: task.cookies
                     },
-                    timeout: 8000
+                    timeout: 18000
                 }).then(res => {
                     return res.data;
                 }).catch((e) => {

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

@@ -29,9 +29,7 @@ class UploadTask extends rabbitmq_1.Task {
         const taskService = injector.get(task_service_1.TaskService);
         const manager = injector.get(rabbitmq_1.TaskManager);
         const db = injector.get(typeorm_1.Db);
-        if (!(0, fs_1.existsSync)(task.path)) {
-            throw new Error(`file ${task.path} not found`);
-        }
+        const fail = injector.get(rabbitmq_1.FAIL);
         // check file size
         const old = await db.manager.findOne(entities_1.FkDownloadTaskEntity, { where: { filename: task.filename } });
         // not exist
@@ -39,6 +37,9 @@ class UploadTask extends rabbitmq_1.Task {
             await complete();
             return next && next();
         }
+        if (!(0, fs_1.existsSync)(task.path)) {
+            throw new Error(`file ${task.path} not found`);
+        }
         // > 1G give up
         if (task.total >= 1024 * 1024 * 1024) {
             await complete();
@@ -47,11 +48,13 @@ class UploadTask extends rabbitmq_1.Task {
         const cloudSize = await fk.getSize(old.url);
         const localSize = fk.getLocalSize(old.path);
         if (cloudSize != localSize) {
-            await db.manager.update(entities_1.FkDownloadTaskEntity, task.filename, { status: 0 });
-            const download = await taskService.createDownLoadTask(old.url, old.loginId, old.topicId);
-            await manager.send(download);
-            await complete();
-            return next && next();
+            // not my task
+            throw new Error(`not mine task`);
+            // await db.manager.update(FkDownloadTaskEntity, task.filename, { status: 0 })
+            // const download = await taskService.createDownLoadTask(old.url, old.loginId, old.topicId);
+            // await manager.send(download);
+            // await complete();
+            // return next && next();
         }
         console.log(`receive upload task`, { filename: task.filename, status: old.status });
         if (old.status == 1) {

package/electron/.env

@@ -0,0 +1,32 @@
+
+
+
+
+DB_TYPE=mysql
+DB_HOST=sh-cdb-36cco5yk.sql.tencentcdb.com
+DB_PORT=59440
+DB_USERNAME=wx_jidujiaowang
+DB_PASSWORD=S4Gx3ScmdYf23Gbb
+DB_DATABASE=wx_jidujiaowang
+DB_SYNCHRONIZE=true
+
+REDIS_HOST=111.229.255.176
+REDIS_PORT=6379
+REDIS_PASS=123qwe
+
+HTTP_HOST=0.0.0.0
+HTTP_PORT=8081
+
+WS_HOST=0.0.0.0
+WS_PORT=8082
+
+RABBITMQ_HOST=111.229.255.176
+RABBITMQ_PORT=5672
+RABBITMQ_USERNAME=imeepos
+RABBITMQ_PASSWORD=123qwe
+
+CLOUD_URL=http://localhost:8081
+HOST_URL=http://111.229.255.176:8081
+
+
+

package/electron/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "@nger/fk-upload-electron",
+  "version": "1.0.0",
+  "description": "nger fk upload",
+  "main": "node_modules/@nger/fk-upload/dist/electon.js",
+  "scripts": {
+    "dist": "electron-builder --win --ia32",
+    "postinstall": "electron-builder install-app-deps"
+  },
+  "author": "imeepos",
+  "license": "ISC",
+  "dependencies": {
+    "@nger/core": "1.10.25",
+    "@nger/fk-upload": "^1.0.163",
+    "@nger/http": "^4.0.47",
+    "@nger/rabbitmq": "^1.0.27",
+    "@nger/redis": "^1.0.3",
+    "@nger/schedule": "^1.0.2",
+    "@nger/typeorm": "^1.0.9",
+    "@nger/utils": "^1.0.3",
+    "@nger/w7": "^1.0.5",
+    "@nger/ws": "^1.0.10",
+    "dotenv": "^16.0.1",
+    "pm2": "^5.2.0",
+    "reflect-metadata": "^0.1.13"
+  },
+  "devDependencies": {
+    "electron-builder": "^23.0.3",
+    "electron": "^18.2.3"
+  }
+}