diff --git a/src/main.rs b/src/main.rs index 43c1261..358d785 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,5 @@ use std::{thread, time::Duration}; -use chrono::format; use clokwerk::{Scheduler, TimeUnits, Job}; use log::{info, error}; @@ -19,12 +18,12 @@ fn main() { let res = get_data_from_500_com("pls").await; let msg; match res { - Ok(_) => { - msg = format!("{}: 排列3数据采集完毕", chrono::Local::now().format(fmt)); + Ok(val) => { + msg = format!("{}: 排列3数据采集完毕, 最新数据为: {}!", chrono::Local::now().format(fmt), val); info!("{}", msg); }, Err(e) => { - msg = format!("{}: 排列3数据采集失败: {}", chrono::Local::now().format(fmt), e); + msg = format!("{}: 排列3数据采集失败: {}!", chrono::Local::now().format(fmt), e); error!("{}", msg); } } @@ -43,12 +42,12 @@ fn main() { let res = get_data_from_500_com("plw").await; let msg; match res { - Ok(_) => { - msg = format!("{}: 排列5数据采集完毕", chrono::Local::now().format(fmt)); + Ok(val) => { + msg = format!("{}: 排列5数据采集完毕, 最新数据为: {}!", chrono::Local::now().format(fmt), val); info!("{}", msg); }, Err(e) => { - msg = format!("{}: 排列5数据采集失败: {}", chrono::Local::now().format(fmt), e); + msg = format!("{}: 排列5数据采集失败: {}!", chrono::Local::now().format(fmt), e); error!("{}", msg); } } @@ -67,12 +66,12 @@ fn main() { let res = get_data_from_500_com("sd").await; let msg; match res { - Ok(_) => { - msg = format!("{}: 福彩3D数据采集完毕", chrono::Local::now().format(fmt)); + Ok(val) => { + msg = format!("{}: 福彩3D数据采集完毕, 最新数据为: {}!", chrono::Local::now().format(fmt), val); info!("{}", msg); }, Err(e) => { - msg = format!("{}: 福彩3D数据采集失败: {}", chrono::Local::now().format(fmt), e); + msg = format!("{}: 福彩3D数据采集失败: {}!", chrono::Local::now().format(fmt), e); error!("{}", msg); } } diff --git a/src/tasks/get_data.rs b/src/tasks/get_data.rs index a99e7ee..1e9f107 100644 --- a/src/tasks/get_data.rs +++ b/src/tasks/get_data.rs @@ -8,7 +8,7 @@ use sea_orm::{ActiveModelTrait, ActiveValue::Set, ConnectOptions, Database}; use crate::model::{sd, pls, plw}; -pub async fn get_data_from_500_com(issue_type: &str) -> Result<(), String> { +pub async fn get_data_from_500_com(issue_type: &str) -> Result { // 数据库连接操作 let db_url; @@ -53,6 +53,7 @@ pub async fn get_data_from_500_com(issue_type: &str) -> Result<(), String> { let ball_selector = Selector::parse(r#"li.ball_orange"#).expect("selector error"); let ball_iter = html.select(&ball_selector).map(|x| {x.inner_html()}); let ball: String = ball_iter.collect(); + let ret_val = ball.clone(); let numbers : Vec = ball.chars().map(|c| c.to_digit(10).unwrap() as i32).collect(); let mut seen = std::collections::HashSet::new(); @@ -134,7 +135,8 @@ pub async fn get_data_from_500_com(issue_type: &str) -> Result<(), String> { }; new_model.insert(&db).await.expect("insert error"); } - Ok(()) + // 返回获取的数据 + Ok(ret_val) } else { Err(String::from("获取数据失败")) }