904118851 8 сар өмнө
parent
commit
29665c1815

+ 24 - 5
PULL_DATA_FACTORY/PULL_DATA.js

@@ -97,7 +97,6 @@ async function processDetailTask() {
             let task_item = detail_task.shift()
             let materialId_list = task_item.materialId_list
             let materialId_data_list = task_item.materialId_data_list
-            await pullDataService.getToken()
             let response = await pullDataService.get_detail(materialId_list)
             if(!response.success){
                 console.log("get_detail:",response)
@@ -214,9 +213,18 @@ async function finish_material_list(response,page) {
         detail_task.push(detail_item)
     }
 }
+async function process_update_token() {
+    try{
+        let response = await pullDataService.getToken()
+        console.log("token:",response.data.token)
+    }catch(e){
+        console.error("process_update_token:",e)
+    }finally{
+        setTimeout(process_update_token,200)
+    }
+}
 async function processTask(timeRange){
     try{
-        await pullDataService.getToken()
         let FilterConfig = await redis_help.getKeyValue("FilterConfig")
         FilterConfig = JSON.parse(FilterConfig)
         let response = await pullDataService.get_novel_material_list(cur_timeRange,0,500)
@@ -227,9 +235,20 @@ async function processTask(timeRange){
         detail_task.push(detail_item)
         for (let index = 1; index < params.length; index++) {
             const element = params[index];
-            let pull_task_item = get_pull_data_task()
-            pull_task_item.runTask(finish_material_list,cur_timeRange,element.page,element.limit)
+            // setTimeout(()=>{
+            //     let pull_task_item = get_pull_data_task()
+            //     pull_task_item.runTask(finish_material_list,cur_timeRange,element.page,element.limit)
+            // },200*index)
+            await new Promise(resolve => setTimeout(resolve, 200));
+            const pull_task_item = get_pull_data_task();
+            await pull_task_item.runTask(
+                finish_material_list,
+                cur_timeRange,
+                element.page,
+                element.limit
+            );
         }
+        
         console.log("processTask over!")
         // response = await pullDataService.get_detail(materialId_list)
         // if(!response.success){
@@ -324,7 +343,7 @@ CMD.init = async function(){
          // 启动调度器
         CMD.startScheduler(taskCallback);
         processDetailTask()
-
+        process_update_token()
     })
 }
 

+ 1 - 1
PULL_DATA_FACTORY/pull_data_task_item.js

@@ -2,11 +2,11 @@ const PullDataService = require('../src/PullDataService');
 class pull_data_task_item {
     constructor(redis_help) {
         this.isRun = false
+        this.redis = redis_help
         this.pullDataService = new PullDataService(redis_help)
     }
     async runTask(call_back,cur_timeRange,page,size){
         this.isRun = true
-        await this.pullDataService.getToken()
         let response = await this.pullDataService.get_novel_material_list(cur_timeRange,page,size)
         if(response.success){
             call_back(response,page)

+ 2 - 2
src/PullDataService.js

@@ -72,7 +72,7 @@ class PullDataService {
                 console.log(url,data)
                 var response = await this.session.post(url,data, {
                     headers: {
-                        'token':this.token
+                        'token':this.mRedis.getKeyValue("pull_data_token")
                     }
                 });
                 if(!response.data.success){
@@ -99,7 +99,7 @@ class PullDataService {
                 }
                 const response = await this.session.post(config.pull_data_config.get_detail,data, {
                     headers: {
-                        'token':this.token
+                        'token':this.mRedis.getKeyValue("pull_data_token")
                     }
                 });
                 if(!response.data.success){