904118851 vor 6 Monaten
Ursprung
Commit
3feebb7a5f
6 geänderte Dateien mit 77 neuen und 16 gelöschten Zeilen
  1. 44 9
      0_RECEIVE_FACTORY/RECEIVE_FACTORY.js
  2. 5 6
      2_PRODUCT_FACTORY/fq_mf_factory.js
  3. BIN
      dump.rdb
  4. 2 1
      etc/config.json
  5. 13 0
      logs/combined.log
  6. 13 0
      logs/out.log

+ 44 - 9
0_RECEIVE_FACTORY/RECEIVE_FACTORY.js

@@ -221,19 +221,16 @@ CMD.get_fq_rechargeTemplate = function(res,distributor_id){
 // - 抖音短剧 = 7
 // - 抖小网文 = 8
 // - 微小网文 = 12
-CMD.get_fq_package_list = function(res){
-    var distributorId = config.fanqie_config.distributorId
+CMD.get_fq_package_list = function(res,distributorId,app_type){
     var secretKey = config.fanqie_config.secretKey;
     const postData = {
         distributor_id: distributorId,
         ts: helper.getCurrentUnixTimestamp(),
         sign: helper.getSign(distributorId,secretKey),
-        page_size: 100,
+        page_size: 50,
         page_index:0,
-        app_id:"40017687",
-        app_type:"8"
+        app_type:app_type
     };
-    // console.log("get_recharge_template:")
     var url = config.fanqie_config.get_fq_package_list
     var base_params = `/?distributor_id=${postData.distributor_id}&ts=${postData.ts}&sign=${postData.sign}&app_type=${postData.app_type}`
     var other_params = `&page_size=${postData.page_size}&page_index=${postData.page_index}`
@@ -245,8 +242,7 @@ CMD.get_fq_package_list = function(res){
         let data  = response.data
         res.writeHead(200, {'Content-Type': 'application/json'});
         if(data.code==200){
-            let list = data.data
-            res.end(JSON.stringify({ message:"成功!",data:list,code:10000}));
+            res.end(JSON.stringify({ message:"成功!",data:data.package_info_open_list,code:10000}));
         }else{
             res.end(JSON.stringify({ message:"fail!",data:data,code:data.code}));
         }
@@ -258,6 +254,39 @@ CMD.get_fq_package_list = function(res){
     });
 }
 
+CMD.get_fq_bound_package_list = function(res,distributorId,app_id){
+    var secretKey = config.fanqie_config.secretKey;
+    const postData = {
+        distributor_id: distributorId,
+        ts: helper.getCurrentUnixTimestamp(),
+        sign: helper.getSign(distributorId,secretKey),
+        page_size: 50,
+        page_index:0,
+        app_id:app_id
+    };
+    var url = config.fanqie_config.get_bound_package_list
+    var base_params = `/?distributor_id=${postData.distributor_id}&ts=${postData.ts}&sign=${postData.sign}&app_id=${postData.app_id}`
+    var other_params = `&page_size=${postData.page_size}&page_index=${postData.page_index}`
+
+    console.log("url:",`${url}${base_params}${other_params}`)
+    axios.get(`${url}${base_params}${other_params}`)
+    .then(response => {
+        // console.log('Response data:', response.data );
+        let data  = response.data
+        res.writeHead(200, {'Content-Type': 'application/json'});
+        if(data.code==200){
+            res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
+        }else{
+            res.end(JSON.stringify({ message:"fail!",data:data,code:data.code}));
+        }
+        console.log("get_fq_bound_package_list:",data)
+    })
+    .catch(error => {
+        console.error('Error:', error);
+        res.end(JSON.stringify({ message:"fail!",data:data,code:data.code}));
+    });
+}
+
 CMD.get_pull_token = async function(res){
     let token =  await redis_help.getKeyValue("pull_data_token")
     res.writeHead(200, {'Content-Type': 'application/json'});
@@ -399,7 +428,13 @@ var server = http.createServer(function(req,res){
                         let distributor_id = jsonData['data']['distributor_id']
                         CMD.get_fq_rechargeTemplate(res,distributor_id) 
                     }else if(jsonData['fun']=="get_fq_package_list"&&jsonData['cmd']=="fq_link"){
-                        CMD.get_fq_package_list(res) 
+                        let app_type = jsonData['data']['app_type']
+                        // let distributor_id = jsonData['data']['distributor_id']
+                        CMD.get_fq_package_list(res,config.fanqie_config.distributorId,app_type) 
+                    }else if(jsonData['fun']=="get_fq_bound_package_list"&&jsonData['cmd']=="fq_link"){
+                        let app_id = jsonData['data']['app_id']
+                        // let distributor_id = jsonData['data']['distributor_id']
+                        CMD.get_fq_bound_package_list(res,config.fanqie_config.distributorId,app_id) 
                     }else if(jsonData['fun']=="get_pull_token"&&jsonData['cmd']=="pull_data_config"){
                         CMD.get_pull_token(res) 
                     }else if(jsonData['fun']=="get_dz_book"&&jsonData['cmd']=="dz_link"){

+ 5 - 6
2_PRODUCT_FACTORY/fq_mf_factory.js

@@ -39,7 +39,7 @@ async function processTask(){
                     result.data.genre = fq_book_result.data.info.genre
                     result.data.book_id = fq_book_result.data.book_id
                     result.data.book_name = fq_book_result.data.info.book_name
-                    result.data.words = fq_book_result.data.info.word_number==undefined?0:fq_book_result.data.info.word_number
+                    result.data.words = fq_book_result.data.info.words==undefined?0:fq_book_result.data.info.words
                     //获取商品库的商品
                     let product_result = await video_product_controllers.getProductData({ book_id: fq_book_result.data.book_id });
                     //如果商品库没有这个商品
@@ -49,7 +49,6 @@ async function processTask(){
                     }
                 }else{
                     isInsertTask = true
-              
                 }
             }
             if(!isInsertTask){
@@ -101,8 +100,8 @@ async function processCreateTask(){
                     }else{
                         let book_name =  obj['book_info'].book_name
                         let book_id = obj['book_info'].book_id
-                        let genre = 1
-                        let words = 0
+                        let genre = CMD.getFqGenre(obj['book_info'].genre==undefined?"0":obj['book_info'].genre)
+                        let words = obj['book_info'].word_number==undefined?0:obj['book_info'].word_number
                         let fq_book_data = {book_name:book_name,book_id:book_id,genre:genre,words:words,info:JSON.stringify(obj['novel_data'])}
                         let fq_book = {} 
                         fq_book.key = result.data.book_id
@@ -279,8 +278,8 @@ CMD.insert_product = async function(data){
 CMD.add_fq_book = async function(data,response){
     let book_name =  response.book_name
     let book_id = response.book_id
-    let words = 0
-    data.genre = 1;
+    let words = response.words==undefined?0:response.words;
+    data.genre = response.genre==undefined?0:response.genre;
     data.words = words
     data.book_name = book_name
     data.book_id = book_id

BIN
dump.rdb


+ 2 - 1
etc/config.json

@@ -28,7 +28,8 @@
         "create_link_host": "https://www.changdunovel.com/novelsale/openapi/promotion/create/v1",
         "distributorId": 1814786227164169,
         "secretKey": "CN6KQ8Bauo8JXg5fFPk86EHdRFIUVnyV",
-        "get_fq_package_list":"https://www.changdunovel.com/novelsale/openapi/wx/get_package_list/v2"
+        "get_fq_package_list":"https://www.changdunovel.com/novelsale/openapi/wx/get_package_list/v2",
+        "get_bound_package_list":"https://www.changdunovel.com/novelsale/openapi/wx/get_bound_package_list/v1"
     },
     "dianzhong_config": {
         "clientId": 10003204,

+ 13 - 0
logs/combined.log

@@ -1,4 +1,17 @@
+<<<<<<< HEAD
 2025-02-08T20:07:40: 
 2025-02-08T20:07:40: > heiyan@1.0.0 start
 2025-02-08T20:07:40: > node tg_factory_main.js
 2025-02-08T20:07:40: 
+=======
+2025-02-11T15:13:03: 
+2025-02-11T15:13:03: > heiyan@1.0.0 start
+2025-02-11T15:13:03: > node tg_factory_main.js
+2025-02-11T15:13:03: 
+2025-02-11T15:13:07: Connected to Redis
+2025-02-11T15:57:27: 
+2025-02-11T15:57:27: > heiyan@1.0.0 start
+2025-02-11T15:57:27: > node tg_factory_main.js
+2025-02-11T15:57:27: 
+2025-02-11T15:57:30: Connected to Redis
+>>>>>>> e06f264c4bf8de763fa3f85da3205ddc108c436d

+ 13 - 0
logs/out.log

@@ -1,4 +1,17 @@
+<<<<<<< HEAD
 2025-02-08T20:07:40: 
 2025-02-08T20:07:40: > heiyan@1.0.0 start
 2025-02-08T20:07:40: > node tg_factory_main.js
 2025-02-08T20:07:40: 
+=======
+2025-02-11T15:13:03: 
+2025-02-11T15:13:03: > heiyan@1.0.0 start
+2025-02-11T15:13:03: > node tg_factory_main.js
+2025-02-11T15:13:03: 
+2025-02-11T15:13:07: Connected to Redis
+2025-02-11T15:57:27: 
+2025-02-11T15:57:27: > heiyan@1.0.0 start
+2025-02-11T15:57:27: > node tg_factory_main.js
+2025-02-11T15:57:27: 
+2025-02-11T15:57:30: Connected to Redis
+>>>>>>> e06f264c4bf8de763fa3f85da3205ddc108c436d