htyproc: replace local HtyResp with HtyResponse from htycommons
This commit is contained in:
@@ -2,8 +2,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use htycommons::cert::encrypt_text_with_private_key;
|
||||
use htycommons::common::HtyResponse;
|
||||
use htyts_models::{ReqTask, TaskStatus, TaskType};
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
|
||||
use crate::clients::{merge_row_status, ngx_combine_image, ngx_convert_audio, TsClient};
|
||||
@@ -11,12 +11,6 @@ use crate::config;
|
||||
use crate::redis_task::RedisTask;
|
||||
use crate::tasks;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct HtyResp {
|
||||
r: bool,
|
||||
d: Option<serde_json::Value>,
|
||||
}
|
||||
|
||||
pub static PROCESSING: AtomicUsize = AtomicUsize::new(0);
|
||||
|
||||
/// Mirrors Java `ProcessorHelper.Status`.
|
||||
@@ -125,7 +119,7 @@ impl ProcessorRuntime {
|
||||
.json(&json!({"encrypted_data": encrypted}))
|
||||
.send()
|
||||
.await?;
|
||||
let login_body: HtyResp = login_resp.json().await?;
|
||||
let login_body: HtyResponse<serde_json::Value> = login_resp.json().await?;
|
||||
let login_jwt = login_body
|
||||
.d
|
||||
.and_then(|v| v.as_str().map(String::from))
|
||||
@@ -141,7 +135,7 @@ impl ProcessorRuntime {
|
||||
.header("Authorization", &login_jwt)
|
||||
.send()
|
||||
.await?;
|
||||
let sudo_body: HtyResp = sudo_resp.json().await?;
|
||||
let sudo_body: HtyResponse<serde_json::Value> = sudo_resp.json().await?;
|
||||
let sudoer_token = sudo_body
|
||||
.d
|
||||
.and_then(|v| v.as_str().map(String::from))
|
||||
|
||||
Reference in New Issue
Block a user