refactor: 重命名授权字段并优化令牌处理逻辑
- 将数据库中的授权字段从 `key` 重命名为 `token` 并调整相关查询和插入逻辑,同时修改 `get_token_info` 方法返回类型为 `Option<Authorize>` 以直接返回结构体而非 JSON 字符串。 - 添加令牌验证和信息查询功能,重构路由处理逻辑并优化数据结构
This commit is contained in:
106
src/main.rs
106
src/main.rs
@@ -43,7 +43,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
};
|
||||
|
||||
let db = Arc::new(db::Db::new(db_path).await?);
|
||||
|
||||
let generator = Arc::new(
|
||||
generate::TokenGenerator::new()
|
||||
.with_uppercase(true)
|
||||
@@ -52,23 +51,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
);
|
||||
|
||||
let state = AppState { db, generator };
|
||||
|
||||
// build our application with a single route
|
||||
let app = Router::new()
|
||||
.route("/create", get(create_token))
|
||||
.route("/verify", get(verify_token))
|
||||
.route("/info", get(get_token_info))
|
||||
.with_state(state);
|
||||
|
||||
// run our app with hyper, listening globally on port 3009
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:3009")
|
||||
.await
|
||||
.unwrap();
|
||||
axum::serve(listener, app).await.unwrap();
|
||||
|
||||
// let token = generator.generate(16);
|
||||
// println!("token: {}", token);
|
||||
|
||||
// let result = db.get_token_info("TestKey1").await.unwrap();
|
||||
// println!("{:?}", result);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -76,17 +68,17 @@ async fn create_token(
|
||||
State(state): State<AppState>,
|
||||
Query(args): Query<CreateToken>,
|
||||
) -> (StatusCode, Json<CreateResult>) {
|
||||
let current = get_current_datetime();
|
||||
let exp_time = add_day(¤t, 7).unwrap();
|
||||
let str_time = get_current_datetime();
|
||||
let exp_time = add_day(&str_time, 7).unwrap();
|
||||
|
||||
let token: String = state.generator.generate(16);
|
||||
let _ = state
|
||||
let _token_id = state
|
||||
.db
|
||||
.insert_authorize(db::InsertArgs {
|
||||
project: args.project,
|
||||
key: token,
|
||||
device_id: args.device_id,
|
||||
expire: current,
|
||||
project: args.project.clone(),
|
||||
token: token.clone(),
|
||||
device_id: args.device_id.clone(),
|
||||
expire: str_time,
|
||||
insert_time: exp_time,
|
||||
})
|
||||
.await;
|
||||
@@ -95,11 +87,53 @@ async fn create_token(
|
||||
StatusCode::OK,
|
||||
Json(CreateResult {
|
||||
code: 200,
|
||||
msg: "创建成功".to_owned(),
|
||||
project: args.project,
|
||||
device_id: args.device_id,
|
||||
token: token,
|
||||
msg: "token创建成功".to_owned(),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
async fn verify_token(
|
||||
State(state): State<AppState>,
|
||||
Query(args): Query<VerifyToken>,
|
||||
) -> (StatusCode, Json<VerifyResult>) {
|
||||
if state.db.verify_token(&args.token).await.unwrap() {
|
||||
(StatusCode::OK, Json(VerifyResult { code: 200 }))
|
||||
} else {
|
||||
(StatusCode::OK, Json(VerifyResult { code: 404 }))
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_token_info(
|
||||
State(state): State<AppState>,
|
||||
Query(args): Query<VerifyToken>,
|
||||
) -> (StatusCode, Json<TokenResponse>) {
|
||||
let ruth_info = state.db.get_token_info(&args.token).await.unwrap();
|
||||
|
||||
match ruth_info {
|
||||
Some(v) => (
|
||||
StatusCode::OK,
|
||||
Json(TokenResponse::Success(TokenInfo {
|
||||
code: 200,
|
||||
project: v.project,
|
||||
token: v.token,
|
||||
device_id: v.device_id,
|
||||
expire: v.expire,
|
||||
insert_time: v.insert_time,
|
||||
})),
|
||||
),
|
||||
None => (
|
||||
StatusCode::OK,
|
||||
Json(TokenResponse::Error(QueryError {
|
||||
code: 200,
|
||||
msg: "未查询token相关信息".to_owned(),
|
||||
})),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
fn get_current_datetime() -> String {
|
||||
Local::now().format("%Y-%m-%d %H:%M:%S").to_string()
|
||||
}
|
||||
@@ -119,6 +153,9 @@ struct CreateToken {
|
||||
#[derive(Serialize)]
|
||||
struct CreateResult {
|
||||
code: i16,
|
||||
project: String,
|
||||
device_id: String,
|
||||
token: String,
|
||||
msg: String,
|
||||
}
|
||||
|
||||
@@ -127,3 +164,36 @@ struct AppState {
|
||||
db: Arc<db::Db>,
|
||||
generator: Arc<generate::TokenGenerator>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct VerifyToken {
|
||||
token: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct VerifyResult {
|
||||
code: i16,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct TokenInfo {
|
||||
code: i16,
|
||||
project: String,
|
||||
token: String,
|
||||
device_id: String,
|
||||
expire: String,
|
||||
insert_time: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct QueryError {
|
||||
code: i16,
|
||||
msg: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(untagged)]
|
||||
enum TokenResponse {
|
||||
Success(TokenInfo),
|
||||
Error(QueryError),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user