修复配置文件没有读取加密方式的问题

2024-07-30 22:54:17 +08:00
parent 352f322f61
commit fa9903ace1
1 changed files with 4 additions and 4 deletions
@@ -126,12 +126,12 @@ pub fn read_config(file_path: &str) -> anyhow::Result<(Config, Vec<String>, bool
        None => None,
        Some(r) => Some(r.map_err(|e| anyhow!("ip {:?} error:{}", &file_conf.ip, e))?),
    };
-    let cipher_model = {
+    let cipher_model = if let Some(v) = file_conf.cipher_model {
+        CipherModel::from_str(&v).map_err(|e| anyhow!("{}", e))?
+    } else {
        #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
-        if file_conf.password.is_some() && file_conf.cipher_model.is_none() {
+        if file_conf.password.is_some() {
            Err(anyhow!("cipher_model undefined"))?
-        } else if let Some(v) = file_conf.cipher_model {
-            CipherModel::from_str(&v).map_err(|e| anyhow!("{}", e))?
        } else {
            CipherModel::None
        }