Merge branch 'master' of http://120.79.128.142:3000/904118851/tg_factory

PULL_DATA_FACTORY/PULL_DATA.js

@@ -93,33 +93,33 @@ async function processTask(timeRange){
             cur_page = -1
             throw "没有数据了"
         }
-        if(response.result == undefined){
+        if(response.data == undefined){
             cur_page = -1
             throw "没有数据了"
         }
-        if(response.result.list == undefined){
+        if(response.data.list == undefined){
             cur_page = -1
             throw "没有数据了"
         }
-        if(response.result.list.length<=0){
+        if(response.data.list.length<=0){
             cur_page = -1
             throw "没有数据了"
         }
         if(timeRange!=null){
             const today = new Date().toISOString().slice(0, 10);
-            console.log("response.result:",response.result,today)
+            console.log("response.data:",response.data,today)
             if(cur_day_data.get(today)[timeRange.start]){
-                console.log("response.result.count:",response.result.count)
+                console.log("response.data.count:",response.data.count)
                 console.log("(cur_day_data[today][timeRange.start]:",cur_day_data.get(today)[timeRange.start])
-                cur_day_data.get(today)[timeRange.start].count = response.result.count
+                cur_day_data.get(today)[timeRange.start].count = response.data.count
             }else{
                 console.log("cur_day_data空")
             }
             const updateResult = await manager.updateRecord(today,cur_day_data.get(today));
         }
 
-        for (let index = 0; index < response.result.list.length; index++) {
-            const origin_element = response.result.list[index];
+        for (let index = 0; index < response.data.list.length; index++) {
+            const origin_element = response.data.list[index];
             const result = await origin_data_controllers.getOriginData({
                 materialId:origin_element.materialId})
             if(result.success){
@@ -145,8 +145,8 @@ async function processTask(timeRange){
 
 
         response = await CMD.get_detail(materialId_list)
-        for (let index = 0; index < response.result.list.length; index++) {
-            const element = response.result.list[index];
+        for (let index = 0; index < response.data.list.length; index++) {
+            const element = response.data.list[index];
             const info = materialId_data_list[element.materialId]
             if(element.hasAnchorInfo){
                 await origin_data_controllers.createOriginData(
@@ -268,7 +268,7 @@ CMD.init = async function(){
         let PullDataConfig = await redis_help.getKeyValue("PullDataConfig")
         PullDataConfig = JSON.parse(PullDataConfig)
         let response = await CMD.getToken()
-        await redis_help.setKeyValue("pull_data_token",response.result.token)
+        await redis_help.setKeyValue("pull_data_token",response.data.token)
         // processTask()
         _24HourRanges = PullDataConfig
         // 定义任务回调函数