|
@@ -23,11 +23,13 @@ async function processTask(){
|
|
let isInsertTask = false
|
|
let isInsertTask = false
|
|
let FilterConfig = await redis_help.getKeyValue("FilterConfig")
|
|
let FilterConfig = await redis_help.getKeyValue("FilterConfig")
|
|
FilterConfig = JSON.parse(FilterConfig)
|
|
FilterConfig = JSON.parse(FilterConfig)
|
|
- result = await filter_data_controllers.getFilterDataByStatus({ status: 0 ,tg_platform_id:config.platform_fanqie});
|
|
|
|
|
|
+ result = await filter_data_controllers.getFilterDataByStatus({ status: 0 ,tg_platform_id:config.platform_fanqiemf});
|
|
|
|
+
|
|
|
|
+ console.log("result:",result)
|
|
if(result.success){
|
|
if(result.success){
|
|
let tg_platform_id = result.data.tg_platform_id
|
|
let tg_platform_id = result.data.tg_platform_id
|
|
//判断是否存在这本书
|
|
//判断是否存在这本书
|
|
- if(tg_platform_id==config.platform_fanqie){ //番茄
|
|
|
|
|
|
+ if(tg_platform_id==config.platform_fanqiemf){ //番茄
|
|
//获取番茄书库的书
|
|
//获取番茄书库的书
|
|
let fq_book_result = await get_fq_mf_book_tab_controllers.getData({ book_id: result.data.book_id });
|
|
let fq_book_result = await get_fq_mf_book_tab_controllers.getData({ book_id: result.data.book_id });
|
|
if(fq_book_result.success){//如果番茄书库里有这本书
|
|
if(fq_book_result.success){//如果番茄书库里有这本书
|
|
@@ -85,21 +87,23 @@ async function processCreateTask(){
|
|
FilterConfig = JSON.parse(FilterConfig)
|
|
FilterConfig = JSON.parse(FilterConfig)
|
|
if(!product.success){
|
|
if(!product.success){
|
|
let tg_platform_id = result.data.tg_platform_id
|
|
let tg_platform_id = result.data.tg_platform_id
|
|
- if(tg_platform_id==config.platform_fanqie){
|
|
|
|
|
|
+ if(tg_platform_id==config.platform_fanqiemf){
|
|
let client = new HttpClient()
|
|
let client = new HttpClient()
|
|
- let sid_tt = await tools.getFqSidtt()
|
|
|
|
- let response = await client.proxyRequest( helper.getFqRequestOpt(result.data.book_id,sid_tt))
|
|
|
|
|
|
+ let sid_tt = await tools.getFqMfSidtt()
|
|
|
|
+ console.log("sid_tt:",sid_tt,result.data.book_id)
|
|
|
|
+ let response = await client.proxyGet( helper.getMfFqRequestOpt(result.data.book_id,sid_tt))
|
|
|
|
+ console.log("response:",response)
|
|
let obj = response['data']
|
|
let obj = response['data']
|
|
- if (Object.keys(obj['novel_data']).length === 0) {
|
|
|
|
|
|
+ if (Object.keys(obj['book_info']).length === 0) {
|
|
result.data.words = 0
|
|
result.data.words = 0
|
|
result.data.genre = 999
|
|
result.data.genre = 999
|
|
result.data.book_id = result.data.book_id
|
|
result.data.book_id = result.data.book_id
|
|
result.data.book_name = "没有找到这本书"
|
|
result.data.book_name = "没有找到这本书"
|
|
}else{
|
|
}else{
|
|
- let book_name = obj['novel_data'].book_name
|
|
|
|
- let book_id = obj['novel_data'].book_id
|
|
|
|
- let genre = CMD.getFqGenre(obj['novel_data'].genre)
|
|
|
|
- let words = obj['novel_data'].word_number
|
|
|
|
|
|
+ let book_name = obj['book_info'].book_name
|
|
|
|
+ let book_id = obj['book_info'].book_id
|
|
|
|
+ let genre = 1
|
|
|
|
+ let words = 0
|
|
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_data = {book_name:book_name,book_id:book_id,genre:genre,words:words,info:JSON.stringify(obj['novel_data'])}
|
|
let fq_book = {}
|
|
let fq_book = {}
|
|
fq_book.key = result.data.book_id
|
|
fq_book.key = result.data.book_id
|
|
@@ -109,10 +113,8 @@ async function processCreateTask(){
|
|
if(!product_result.success){ //如果书库也没有
|
|
if(!product_result.success){ //如果书库也没有
|
|
fq_book.tg_platform_id = result.data.tg_platform_id
|
|
fq_book.tg_platform_id = result.data.tg_platform_id
|
|
|
|
|
|
- if(CMD.isGenre(FilterConfig,fq_book_data.genre)){
|
|
|
|
- fq_book_data.tg_platform_id = result.data.tg_platform_id
|
|
|
|
- await CMD.insert_product(fq_book_data)
|
|
|
|
- }
|
|
|
|
|
|
+ fq_book_data.tg_platform_id = result.data.tg_platform_id
|
|
|
|
+ await CMD.insert_product(fq_book_data)
|
|
}
|
|
}
|
|
result.data.words = words
|
|
result.data.words = words
|
|
result.data.genre = fq_book_data.genre
|
|
result.data.genre = fq_book_data.genre
|
|
@@ -202,9 +204,8 @@ CMD.isGenre = function(FilterConfig,genre){
|
|
}
|
|
}
|
|
|
|
|
|
CMD.update_filter_data = async function(FilterConfig,data) {
|
|
CMD.update_filter_data = async function(FilterConfig,data) {
|
|
- let isGenre = CMD.isGenre(FilterConfig,data.genre)
|
|
|
|
- // console.log("data.genre:",data.genre,data,isGenre)
|
|
|
|
- if(isGenre){
|
|
|
|
|
|
+
|
|
|
|
+ try{
|
|
await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words,material_sync_status:0})
|
|
await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words,material_sync_status:0})
|
|
//创建一个小程序
|
|
//创建一个小程序
|
|
let AppConfig = await redis_help.getKeyValue("AppConfig")
|
|
let AppConfig = await redis_help.getKeyValue("AppConfig")
|
|
@@ -270,10 +271,11 @@ CMD.update_filter_data = async function(FilterConfig,data) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
|
|
+ }catch(e){
|
|
await other_book_controllers.createData({product_id:data.book_id,product_name:data.book_name,tg_platform_id:data.tg_platform_id})
|
|
await other_book_controllers.createData({product_id:data.book_id,product_name:data.book_name,tg_platform_id:data.tg_platform_id})
|
|
await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre,material_sync_status:2})
|
|
await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre,material_sync_status:2})
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -289,19 +291,8 @@ CMD.insert_product = async function(data){
|
|
CMD.add_fq_book = async function(data,response){
|
|
CMD.add_fq_book = async function(data,response){
|
|
let book_name = response.book_name
|
|
let book_name = response.book_name
|
|
let book_id = response.book_id
|
|
let book_id = response.book_id
|
|
- let genre = response.genre
|
|
|
|
- let words = response.word_number
|
|
|
|
- data.genre = 0
|
|
|
|
- if(genre=="0"){
|
|
|
|
- data.genre = 1;
|
|
|
|
- }
|
|
|
|
- if(genre=="8"){
|
|
|
|
- data.genre = 3;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if(genre=="202"){
|
|
|
|
- data.genre = 202;
|
|
|
|
- }
|
|
|
|
|
|
+ let words = 0
|
|
|
|
+ data.genre = 1;
|
|
data.words = words
|
|
data.words = words
|
|
data.book_name = book_name
|
|
data.book_name = book_name
|
|
data.book_id = book_id
|
|
data.book_id = book_id
|