component-shipinlv 2.1.0 → 2.1.2

package/dist/ActiveAccountMode/task/index.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
@@ -18,13 +18,12 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   function ActiveAccountModeTask(env) {
     var _this = this;
     _classCallCheck(this, ActiveAccountModeTask);
-    _defineProperty(this, "timer", void 0);
-    _defineProperty(this, "loopSecond", 20);
+    _defineProperty(this, "loopSecond", 1 * 30);
     _defineProperty(this, "modeSetting", {
       dayTimeHourList: [],
-      dayPublishMaxAmount: 5,
-      timeAreaRandOffsetPercent: 10,
-      publishMaxDay: 3,
+      dayPublishMaxAmount: 6,
+      timeAreaRandOffsetPercent: 15,
+      publishMaxDay: 2,
       enabled: true,
       isPublishFinishDelVideo: true
     });
@@ -32,85 +31,118 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
     _defineProperty(this, "accountList", []);
     _defineProperty(this, "planDict", {});
     this.env = env;
-    this.timer = setInterval(function () {
+    // this.timer = setInterval(() => {
+    //   this.loop();
+    // }, this.loopSecond * 1e3 )
+    //
+    setTimeout(function () {
       _this.loop();
-    }, this.loopSecond * 1e3);
+    }, 5e3);
   }
   _createClass(ActiveAccountModeTask, [{
     key: "destroy",
     value: function destroy() {}
   }, {
-    key: "loop",
+    key: "onLoop",
     value: function () {
-      var _loop = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var setting, accountList, dayIndex, day, startTime, endTime, list, _iterator, _step, items, _iterator2, _step2, _this$planDict$accoun, accountItem, count;
+      var _onLoop = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
+              return sleep(this.loopSecond * 1e3);
+            case 2:
+              this.loop();
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function onLoop() {
+        return _onLoop.apply(this, arguments);
+      }
+      return onLoop;
+    }()
+  }, {
+    key: "loop",
+    value: function () {
+      var _loop = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var setting, accountList, dayIndex, day, startTime, endTime, list, _iterator, _step, items, _iterator2, _step2, _this$planDict$accoun, accountItem, count;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
               return this.getSetting().catch(function (err) {
                 toastError('获取设置错误：' + (err === null || err === void 0 ? void 0 : err.message));
               });
             case 2:
-              setting = _context.sent;
+              setting = _context2.sent;
               if (setting) {
-                _context.next = 5;
+                _context2.next = 6;
                 break;
               }
-              return _context.abrupt("return");
-            case 5:
+              this.onLoop();
+              return _context2.abrupt("return");
+            case 6:
               this.modeSetting = setting;
               if (setting.enabled) {
-                _context.next = 9;
+                _context2.next = 11;
                 break;
               }
               console.log('setting disabled!');
-              return _context.abrupt("return");
-            case 9:
-              _context.next = 11;
+              this.onLoop();
+              return _context2.abrupt("return");
+            case 11:
+              _context2.next = 13;
               return this.getAccountList().catch(function (err) {
                 toastError('获取视频账户错误：' + (err === null || err === void 0 ? void 0 : err.message));
               });
-            case 11:
-              accountList = _context.sent;
+            case 13:
+              accountList = _context2.sent;
               if (accountList) {
-                _context.next = 14;
+                _context2.next = 17;
                 break;
               }
-              return _context.abrupt("return");
-            case 14:
+              this.onLoop();
+              return _context2.abrupt("return");
+            case 17:
               this.accountList = accountList.list;
               if (!(this.accountList.length === 0)) {
-                _context.next = 17;
+                _context2.next = 21;
                 break;
               }
-              return _context.abrupt("return");
-            case 17:
+              this.onLoop();
+              return _context2.abrupt("return");
+            case 21:
               dayIndex = 0;
-            case 18:
+            case 22:
               if (!(dayIndex < setting.publishMaxDay)) {
-                _context.next = 63;
+                _context2.next = 69;
                 break;
               }
               console.log('publishMaxDay:', dayIndex);
               day = dayjs().add(dayIndex, 'day');
               startTime = Math.floor(day.startOf('day').valueOf() * 0.001);
-              endTime = Math.floor(day.endOf('day').valueOf() * 0.001); // 获取用户列表；
-              _context.next = 25;
+              endTime = Math.floor(day.endOf('day').valueOf() * 0.001);
+              console.log("startTime:", dayIndex, new Date(startTime * 1000), new Date(endTime * 1000));
+
+              // 获取用户列表；
+              _context2.next = 30;
               return this.getTaskPlanStatisticList(startTime, endTime).catch(function (err) {
                 toastError('获取账户列表失败：' + (err === null || err === void 0 ? void 0 : err.message));
               });
-            case 25:
-              list = _context.sent;
+            case 30:
+              list = _context2.sent;
               if (list) {
-                _context.next = 30;
+                _context2.next = 35;
                 break;
               }
-              _context.next = 29;
+              _context2.next = 34;
               return sleep(20e3);
-            case 29:
-              return _context.abrupt("continue", 60);
-            case 30:
+            case 34:
+              return _context2.abrupt("continue", 66);
+            case 35:
               // 把发布过的，做一个字段
               this.planDict = {};
               _iterator = _createForOfIteratorHelper(list);
@@ -130,63 +162,66 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                 _iterator.f();
               }
               _iterator2 = _createForOfIteratorHelper(this.accountList);
-              _context.prev = 34;
+              _context2.prev = 39;
               _iterator2.s();
-            case 36:
+            case 41:
               if ((_step2 = _iterator2.n()).done) {
-                _context.next = 52;
+                _context2.next = 58;
                 break;
               }
               accountItem = _step2.value;
               count = ((_this$planDict$accoun = this.planDict[accountItem.id]) === null || _this$planDict$accoun === void 0 ? void 0 : _this$planDict$accoun.length) || 0; // 需要指定路径
               if (accountItem.videoFromFolder) {
-                _context.next = 42;
+                _context2.next = 47;
                 break;
               }
               console.log('no videoFromFolder :', accountItem.nickname);
-              return _context.abrupt("continue", 50);
-            case 42:
+              return _context2.abrupt("continue", 56);
+            case 47:
               // 删除 此账户下面，所有已经发布的视频
               this.checkDelFile(accountItem.id, accountItem.videoFromFolder);
-              if (!(count >= setting.publishMaxDay)) {
-                _context.next = 45;
+              if (!(count >= setting.dayPublishMaxAmount)) {
+                _context2.next = 51;
                 break;
               }
-              return _context.abrupt("continue", 50);
-            case 45:
-              console.log('makePublishTask in:', accountItem.id, setting.publishMaxDay - count, dayIndex);
+              console.log('count 2:', count, setting.dayPublishMaxAmount);
+              return _context2.abrupt("continue", 56);
+            case 51:
+              console.log('makePublishTask in:', accountItem.id, setting.dayPublishMaxAmount - count, dayIndex);
 
               // 生成任务
-              _context.next = 48;
-              return this.makePublishTask(accountItem.id, setting.publishMaxDay - count, dayIndex).catch(function (err) {
+              _context2.next = 54;
+              return this.makePublishTask(accountItem.id, setting.dayPublishMaxAmount - count, dayIndex).catch(function (err) {
                 console.log('makePublishTask err:', err);
               });
-            case 48:
-              _context.next = 50;
-              return sleep(1e3);
-            case 50:
-              _context.next = 36;
+            case 54:
+              _context2.next = 56;
+              return sleep(3e3);
+            case 56:
+              _context2.next = 41;
               break;
-            case 52:
-              _context.next = 57;
+            case 58:
+              _context2.next = 63;
               break;
-            case 54:
-              _context.prev = 54;
-              _context.t0 = _context["catch"](34);
-              _iterator2.e(_context.t0);
-            case 57:
-              _context.prev = 57;
-              _iterator2.f();
-              return _context.finish(57);
             case 60:
+              _context2.prev = 60;
+              _context2.t0 = _context2["catch"](39);
+              _iterator2.e(_context2.t0);
+            case 63:
+              _context2.prev = 63;
+              _iterator2.f();
+              return _context2.finish(63);
+            case 66:
               dayIndex++;
-              _context.next = 18;
+              _context2.next = 22;
               break;
-            case 63:
+            case 69:
+              this.onLoop();
+            case 70:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[34, 54, 57, 60]]);
+        }, _callee2, this, [[39, 60, 63, 66]]);
       }));
       function loop() {
         return _loop.apply(this, arguments);
@@ -196,11 +231,11 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "makePublishTask",
     value: function () {
-      var _makePublishTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(videoAccountId, needTaskCount, dayIndex) {
+      var _makePublishTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(videoAccountId, needTaskCount, dayIndex) {
         var _this$accountList$fil;
         var videoFromFolder, fileListInfo;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // 先不管 每天做了一部分的，假设 每次都是 做完整
               // 到这里来，肯定没做够
@@ -208,29 +243,29 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                 return item.id;
               })) === null || _this$accountList$fil === void 0 || (_this$accountList$fil = _this$accountList$fil[0]) === null || _this$accountList$fil === void 0 ? void 0 : _this$accountList$fil.videoFromFolder;
               if (videoFromFolder) {
-                _context2.next = 4;
+                _context3.next = 4;
                 break;
               }
               console.log('没有设置 videoFromFolder，跳过：', videoAccountId);
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 4:
-              _context2.next = 6;
+              _context3.next = 6;
               return this.getFileList(videoAccountId, needTaskCount, videoFromFolder).catch(function (err) {});
             case 6:
-              fileListInfo = _context2.sent;
+              fileListInfo = _context3.sent;
               if (fileListInfo) {
-                _context2.next = 10;
+                _context3.next = 10;
                 break;
               }
               console.log('no fileListInfo :', videoAccountId, needTaskCount, dayIndex);
-              return _context2.abrupt("return");
+              return _context3.abrupt("return");
             case 10:
-              return _context2.abrupt("return", this.postTask(videoAccountId, fileListInfo.videoList || [], fileListInfo.topicList || [], dayIndex));
+              return _context3.abrupt("return", this.postTask(videoAccountId, fileListInfo.videoList || [], fileListInfo.topicList || [], dayIndex));
             case 11:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function makePublishTask(_x, _x2, _x3) {
         return _makePublishTask.apply(this, arguments);
@@ -240,18 +275,18 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "postTask",
     value: function () {
-      var _postTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(videoAccountId, videoList, topicList, dayIndex) {
+      var _postTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(videoAccountId, videoList, topicList, dayIndex) {
         var _this2 = this;
-        var dayStartTime, _this$modeSetting, dayPublishMaxAmount, dayTimeHourList, timeAreaRandOffsetPercent, oneVideoByMinute, publishTimeList, i, hourIndex, dayHour, hourMinute, stepTime, stepMin, stepMax;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        var dayStartTime, _this$modeSetting, dayPublishMaxAmount, dayTimeHourList, timeAreaRandOffsetPercent, oneVideoByMinute, publishTimeList, i, hourIndex, dayHour, hourMinute, stepTime, stepOffsetMinute;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (!(((videoList === null || videoList === void 0 ? void 0 : videoList.length) || 0) <= 0)) {
-                _context4.next = 3;
+                _context5.next = 3;
                 break;
               }
               console.log('no videoList :', videoAccountId);
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 3:
               dayStartTime = dayjs().startOf('day').valueOf() + dayIndex * 86400e3; // 计算发视频间隔；
               // const planList = this.planDict[ videoAccountId ];
@@ -259,68 +294,72 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               //   return ;
               // }
               if (!(videoList.length == 0)) {
-                _context4.next = 7;
+                _context5.next = 7;
                 break;
               }
               console.log('postTask 没视频');
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 7:
               _this$modeSetting = this.modeSetting, dayPublishMaxAmount = _this$modeSetting.dayPublishMaxAmount, dayTimeHourList = _this$modeSetting.dayTimeHourList, timeAreaRandOffsetPercent = _this$modeSetting.timeAreaRandOffsetPercent;
               oneVideoByMinute = dayTimeHourList.length * 60 / dayPublishMaxAmount;
+              console.log('oneVideoByMinute:', oneVideoByMinute, dayPublishMaxAmount, videoList);
               publishTimeList = [];
               i = 0;
-            case 11:
+            case 12:
               if (!(i < dayPublishMaxAmount)) {
-                _context4.next = 28;
+                _context5.next = 29;
                 break;
               }
               if (!(i < dayPublishMaxAmount - videoList.length)) {
-                _context4.next = 15;
+                _context5.next = 16;
                 break;
               }
               console.log('for dayPublishMaxAmount :', i, dayPublishMaxAmount, videoList);
-              return _context4.abrupt("continue", 25);
-            case 15:
+              return _context5.abrupt("continue", 26);
+            case 16:
               // 到多少分钟了
               hourIndex = Math.floor(i * oneVideoByMinute / 60);
               dayHour = parseInt(dayTimeHourList[hourIndex]);
+              console.log('dayPublishMaxAmount 2:', i, hourIndex, dayHour);
               if (dayHour) {
-                _context4.next = 20;
+                _context5.next = 22;
                 break;
               }
               console.log('postTask not dayHour:', i, hourIndex, oneVideoByMinute);
-              return _context4.abrupt("continue", 25);
-            case 20:
+              return _context5.abrupt("continue", 26);
+            case 22:
               hourMinute = i * oneVideoByMinute % 60;
-              stepTime = dayStartTime + dayHour * 3600e3 + hourMinute * 60e3;
-              stepMin = stepTime - 3600e3 * 0.01 * timeAreaRandOffsetPercent;
-              stepMax = stepTime + 3600e3 * 0.01 * timeAreaRandOffsetPercent;
-              publishTimeList.push(Tool.math.randInt(stepMin, stepMax));
-            case 25:
+              stepTime = dayStartTime + dayHour * 3600e3 + hourMinute * 60e3; // const stepMin = stepTime - 3600e3 * 0.01 * timeAreaRandOffsetPercent;
+              stepOffsetMinute = oneVideoByMinute * 0.01 * Tool.math.randInt(0, timeAreaRandOffsetPercent); // 偏移量， 不能超过 30分钟
+              // if( stepOffsetMinute > 30 ){
+              //   stepOffsetMinute = 30
+              // }
+              publishTimeList.push(stepTime + stepOffsetMinute * 60e3);
+            case 26:
               i++;
-              _context4.next = 11;
+              _context5.next = 12;
               break;
-            case 28:
+            case 29:
               if (!(publishTimeList.length == 0)) {
-                _context4.next = 31;
+                _context5.next = 32;
                 break;
               }
               console.log('publishTimeList empty!');
-              return _context4.abrupt("return");
-            case 31:
-              return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
+              return _context5.abrupt("return");
+            case 32:
+              return _context5.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(resolve) {
                   var videoIndex, _iterator3, _step3, videoPath, introduction, startTime, newVideoPath, publishResult;
-                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
                       case 0:
                         videoIndex = -1;
                         _iterator3 = _createForOfIteratorHelper(videoList);
-                        _context3.prev = 2;
+                        _context4.prev = 2;
                         _iterator3.s();
                       case 4:
                         if ((_step3 = _iterator3.n()).done) {
-                          _context3.next = 28;
+                          _context4.next = 28;
                           break;
                         }
                         videoPath = _step3.value;
@@ -330,50 +369,50 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                         }).join(' ');
                         startTime = publishTimeList[videoIndex];
                         if (startTime) {
-                          _context3.next = 12;
+                          _context4.next = 12;
                           break;
                         }
                         console.log('视频没有匹配到 发布时间：', videoIndex, videoList, publishTimeList);
-                        return _context3.abrupt("continue", 26);
+                        return _context4.abrupt("continue", 26);
                       case 12:
-                        if (!(startTime <= Date.now())) {
-                          _context3.next = 16;
+                        if (!(startTime + 86400e3 * 2 <= Date.now())) {
+                          _context4.next = 16;
                           break;
                         }
                         // 抛弃
 
                         console.log('已经过了时间了 0。。。', dayIndex, videoAccountId);
                         console.log('已经过了时间了 1。。。', videoIndex, videoList, publishTimeList);
-                        return _context3.abrupt("continue", 26);
+                        return _context4.abrupt("continue", 26);
                       case 16:
-                        _context3.next = 18;
+                        _context4.next = 18;
                         return _this2.videoRename(videoPath).catch(function (err) {
                           // reject( err );
                         });
                       case 18:
-                        newVideoPath = _context3.sent;
+                        newVideoPath = _context4.sent;
                         if (newVideoPath) {
-                          _context3.next = 21;
+                          _context4.next = 21;
                           break;
                         }
-                        return _context3.abrupt("continue", 26);
+                        return _context4.abrupt("continue", 26);
                       case 21:
-                        _context3.next = 23;
+                        _context4.next = 23;
                         return VideoPublishController.taskCreate({
                           "videoFrom": "local",
                           "taskFromProductType": "",
                           "accountList": ["account-".concat(videoAccountId)],
                           "normalVideoRate": 1,
-                          "normalVideoRateType": "hour",
-                          "normalDayMaxCount": 1,
+                          "normalVideoRateType": "day",
+                          "normalDayMaxCount": _this2.modeSetting.dayPublishMaxAmount,
                           "normalVideoKindRateType": "",
                           "whoCanView": "0",
                           "noTopicIsUserRecommendTopic": true,
                           startTime: Math.floor(startTime * 0.001),
                           "publishOrder": "",
-                          "salesVideoRate": 2,
-                          "salesVideoRateType": "hour",
-                          "salesDayMaxCount": 2,
+                          "salesVideoRate": 1,
+                          "salesVideoRateType": "day",
+                          "salesDayMaxCount": _this2.modeSetting.dayPublishMaxAmount,
                           "salesVideoKindRateType": "",
                           "hourEnabled": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
                           "videoList": [{
@@ -392,40 +431,40 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                           // reject( err );
                         });
                       case 23:
-                        publishResult = _context3.sent;
-                        _context3.next = 26;
-                        return sleep(2e3);
+                        publishResult = _context4.sent;
+                        _context4.next = 26;
+                        return sleep(3e3);
                       case 26:
-                        _context3.next = 4;
+                        _context4.next = 4;
                         break;
                       case 28:
-                        _context3.next = 33;
+                        _context4.next = 33;
                         break;
                       case 30:
-                        _context3.prev = 30;
-                        _context3.t0 = _context3["catch"](2);
-                        _iterator3.e(_context3.t0);
+                        _context4.prev = 30;
+                        _context4.t0 = _context4["catch"](2);
+                        _iterator3.e(_context4.t0);
                       case 33:
-                        _context3.prev = 33;
+                        _context4.prev = 33;
                         _iterator3.f();
-                        return _context3.finish(33);
+                        return _context4.finish(33);
                       case 36:
                         resolve(true);
                       case 37:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
-                  }, _callee3, null, [[2, 30, 33, 36]]);
+                  }, _callee4, null, [[2, 30, 33, 36]]);
                 }));
                 return function (_x8) {
                   return _ref.apply(this, arguments);
                 };
               }()));
-            case 32:
+            case 33:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function postTask(_x4, _x5, _x6, _x7) {
         return _postTask.apply(this, arguments);
@@ -435,18 +474,18 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "getSetting",
     value: function () {
-      var _getSetting = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _getSetting = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context5.abrupt("return", ActiveAccountModeSettingController.detail({}, {
+              return _context6.abrupt("return", ActiveAccountModeSettingController.detail({}, {
                 env: this.env
               }));
             case 1:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function getSetting() {
         return _getSetting.apply(this, arguments);
@@ -456,25 +495,25 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "getTopicList",
     value: function () {
-      var _getTopicList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(dir) {
+      var _getTopicList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(dir) {
         var _window$getBridge;
         var text, list, topicList;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.getFileText("".concat(dir, "/\u8BDD\u9898.txt")).catch(function (err) {
                 console.log('getTopicList err:', err);
                 return '';
               });
             case 2:
-              text = _context6.sent;
+              text = _context7.sent;
               if (text) {
-                _context6.next = 6;
+                _context7.next = 6;
                 break;
               }
               console.log('getTopicList empty:', dir);
-              return _context6.abrupt("return", []);
+              return _context7.abrupt("return", []);
             case 6:
               list = text.split(/[\s\n#]/g) || [];
               topicList = [];
@@ -484,12 +523,12 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                 }
                 topicList.push(topic);
               });
-              return _context6.abrupt("return", topicList);
+              return _context7.abrupt("return", topicList);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6);
+        }, _callee7);
       }));
       function getTopicList(_x9) {
         return _getTopicList.apply(this, arguments);
@@ -499,11 +538,11 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "getAccountList",
     value: function () {
-      var _getAccountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _getAccountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              return _context7.abrupt("return", VideoPublishVideoAccountController.list({
+              return _context8.abrupt("return", VideoPublishVideoAccountController.list({
                 current: 1,
                 pageSize: 100
               }, {
@@ -511,9 +550,9 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               }));
             case 1:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function getAccountList() {
         return _getAccountList.apply(this, arguments);
@@ -523,11 +562,11 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "getTaskPlanStatisticList",
     value: function () {
-      var _getTaskPlanStatisticList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(startTime, endTime) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _getTaskPlanStatisticList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(startTime, endTime) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              return _context8.abrupt("return", PublishTaskPlanStatisticController.list({
+              return _context9.abrupt("return", PublishTaskPlanStatisticController.list({
                 productType: 'active-account-mode',
                 platform: 'douyin',
                 startTime: startTime,
@@ -537,9 +576,9 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               }));
             case 1:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
       function getTaskPlanStatisticList(_x10, _x11) {
         return _getTaskPlanStatisticList.apply(this, arguments);
@@ -552,7 +591,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
       if ((list === null || list === void 0 ? void 0 : list.length) < count) {
         return list;
       }
-      return this.removeFiveUniqueItems(list, count).slice(0, count);
+      return this.removeFiveUniqueItems(list, count).slice(0, count + 1);
     }
   }, {
     key: "removeFiveUniqueItems",
@@ -566,7 +605,7 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
       var copyArr = _toConsumableArray(arr);
       var removedItems = [];
       var uniqueSet = new Set();
-      while (uniqueSet.size < 5 && copyArr.length > 0) {
+      while (uniqueSet.size < count && copyArr.length > 0) {
         // 获取随机索引
         var randomIndex = Math.floor(Math.random() * copyArr.length);
         // 移除并获取该项
@@ -582,91 +621,91 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "getFileList",
     value: function () {
-      var _getFileList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(videoAccountId, needTaskCount, videoFromFolder) {
+      var _getFileList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(videoAccountId, needTaskCount, videoFromFolder) {
         var fileList, videoList, _iterator4, _step4, filePath, _this$getCommandByPat, command, topicList;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               fileList = fsDirVideoList(videoFromFolder);
               if (!(fileList.length === 0)) {
-                _context9.next = 4;
+                _context10.next = 4;
                 break;
               }
               console.log('文件夹没视频，跳过：', videoAccountId, videoFromFolder);
-              return _context9.abrupt("return", {
+              return _context10.abrupt("return", {
                 videoList: [],
                 topicList: []
               });
             case 4:
-              console.log('fileList:', fileList);
+              console.log('fileList:', fileList.length, needTaskCount, videoFromFolder);
               videoList = []; // 获取视频
               _iterator4 = _createForOfIteratorHelper(fileList);
-              _context9.prev = 7;
+              _context10.prev = 7;
               _iterator4.s();
             case 9:
               if ((_step4 = _iterator4.n()).done) {
-                _context9.next = 25;
+                _context10.next = 25;
                 break;
               }
               filePath = _step4.value;
               _this$getCommandByPat = this.getCommandByPath(filePath), command = _this$getCommandByPat.command;
               if (command) {
-                _context9.next = 16;
+                _context10.next = 16;
                 break;
               }
               videoList.push(filePath);
-              _context9.next = 23;
+              _context10.next = 23;
               break;
             case 16:
-              _context9.t0 = command;
-              _context9.next = _context9.t0 === 'needDel' ? 19 : _context9.t0 === 'waitPublish' ? 21 : 23;
+              _context10.t0 = command;
+              _context10.next = _context10.t0 === 'needDel' ? 19 : _context10.t0 === 'waitPublish' ? 21 : 23;
               break;
             case 19:
               delFile(filePath);
-              return _context9.abrupt("break", 23);
+              return _context10.abrupt("break", 23);
             case 21:
               this.fileTimeTooLongNeedDel(filePath);
-              return _context9.abrupt("break", 23);
+              return _context10.abrupt("break", 23);
             case 23:
-              _context9.next = 9;
+              _context10.next = 9;
               break;
             case 25:
-              _context9.next = 30;
+              _context10.next = 30;
               break;
             case 27:
-              _context9.prev = 27;
-              _context9.t1 = _context9["catch"](7);
-              _iterator4.e(_context9.t1);
+              _context10.prev = 27;
+              _context10.t1 = _context10["catch"](7);
+              _iterator4.e(_context10.t1);
             case 30:
-              _context9.prev = 30;
+              _context10.prev = 30;
               _iterator4.f();
-              return _context9.finish(30);
+              return _context10.finish(30);
             case 33:
               if (!(videoList.length === 0)) {
-                _context9.next = 36;
+                _context10.next = 36;
                 break;
               }
               console.log('文件夹 没 可用的视频，跳过 2：', videoAccountId, videoFromFolder);
-              return _context9.abrupt("return", {
+              return _context10.abrupt("return", {
                 videoList: videoList,
                 topicList: []
               });
             case 36:
-              _context9.next = 38;
+              _context10.next = 38;
               return this.getTopicList(videoFromFolder).catch(function () {
                 return [];
               });
             case 38:
-              topicList = _context9.sent;
-              return _context9.abrupt("return", {
+              topicList = _context10.sent;
+              return _context10.abrupt("return", {
                 videoList: this.getaArrayRandList(videoList, needTaskCount),
                 topicList: this.getaArrayRandList(topicList, 5)
               });
             case 40:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[7, 27, 30, 33]]);
+        }, _callee10, this, [[7, 27, 30, 33]]);
       }));
       function getFileList(_x12, _x13, _x14) {
         return _getFileList.apply(this, arguments);
@@ -704,19 +743,19 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "videoRename",
     value: function () {
-      var _videoRename = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(videoPath) {
+      var _videoRename = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(videoPath) {
         var videoPathInfo, newName, newFilePath;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               videoPathInfo = videoPath.split(/[\/\\]/g);
               newName = "\u25C0waitPublish-".concat(Math.floor(Date.now() * 0.001), "\u25B6") + this.getFileName(videoPath);
               newFilePath = videoPathInfo.slice(0, -1).join('/') + "/".concat(newName);
               console.log('newFilePath:', newFilePath);
-              return _context11.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(resolve, reject) {
-                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                    while (1) switch (_context10.prev = _context10.next) {
+              return _context12.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(resolve, reject) {
+                  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                    while (1) switch (_context11.prev = _context11.next) {
                       case 0:
                         window.getBridge().fs.rename(videoPath, newFilePath, function (err) {
                           if (err) {
@@ -728,9 +767,9 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                         });
                       case 1:
                       case "end":
-                        return _context10.stop();
+                        return _context11.stop();
                     }
-                  }, _callee10);
+                  }, _callee11);
                 }));
                 return function (_x16, _x17) {
                   return _ref2.apply(this, arguments);
@@ -738,9 +777,9 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               }()));
             case 5:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function videoRename(_x15) {
         return _videoRename.apply(this, arguments);
@@ -765,11 +804,11 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
   }, {
     key: "checkDelFile",
     value: function () {
-      var _checkDelFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(accountId, videoFromFolder) {
+      var _checkDelFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(accountId, videoFromFolder) {
         var _this3 = this;
         var folderVideoList, planList;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               folderVideoList = this.getLocalVideoList(videoFromFolder).map(function (filePath) {
                 return filePath.replace(/\\/g, '/');
@@ -796,9 +835,9 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               });
             case 3:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function checkDelFile(_x18, _x19) {
         return _checkDelFile.apply(this, arguments);