添加持久化层

Cargo.toml

@@ -16,14 +16,11 @@ strip = true
 [workspace]
 members = [
     "libs/*",
-    "./models/*",
-    "./migrate/*",
-    "./database/*",
+    "persistence/persistence",
     "./macros/*",
     "./middle-server/*",
     "./logic/*",
     "./global/*",
-    "./dao/*",
     "./service/*"
 ]
 
@@ -76,23 +73,17 @@ redis = { version = "0.22", features = [
 ] }
 general-request-client = { path = "./middle-server/general-request-client" }
 scheduler-notifier = { version = "0.1.0", path = "middle-server/scheduler-notifier" }
-db-ops-prelude = { version = "0.1.0", path = "database/db-ops-prelude" }
+db-ops-prelude = { version = "0.1.0", path = "persistence/database/db-ops-prelude" }
 bool_or = {version = "0.1.0", path = "./libs/bool_or"}
-abstract_database = { version = "0.1.0", path = "database/abstract_database" }
-ceobe-user = { version = "0.1.0", path = "dao/ceobe-user" }
-ceobe-operate = { version = "0.1.0", path = "dao/ceobe-operate" }
-fetcher = { version = "0.1.0", path = "dao/fetcher" }
-bakery = { version = "0.1.0", path = "dao/bakery" }
-admin = { version = "0.1.0", path = "dao/admin" }
-ceobe-cookie = { version = "0.1.0", path = "dao/ceobe-cookie" }
+abstract_database = { version = "0.1.0", path = "persistence/database/abstract_database" }
 page_size =  { version = "0.1.0", path = "./libs/page_size" }
 mysql_func = { version = "0.1.0", path = "./libs/mysql_func" }
 bitmap-convert = { version = "0.1.0", path = "./libs/bitmap-convert" }
 bitmaps = "3.2.0"
 qiniu-cdn-upload = { version = "0.1.0", path = "middle-server/qiniu-cdn-upload" }
 mob-push-server = { version = "0.1.0", path = "middle-server/mob-push-server" }
 qiniu_service = { version = "0.1.0", path = "service/qiniu_service" }
-
+persistence = { version = "0.1.0", path = "persistence/persistence" }
 
 [dependencies]
 # Xss
@@ -145,19 +136,14 @@ uuid = { version = "1.2.2", features = ["v4"] }
 request-clients = { version = "0.1.0", path = "middle-server/request-clients" }
 general-request-client.workspace = true
 scheduler-notifier.workspace = true
-ceobe-operate.workspace = true
 bool_or.workspace = true
-ceobe-user.workspace = true
 page_size.workspace = true
-fetcher.workspace = true
-bakery.workspace = true
-admin.workspace = true
-ceobe-cookie.workspace = true
 qiniu-cdn-upload.workspace = true
 mob-push-server.workspace = true
 qq-channel-warning = { version = "0.1.0", path = "middle-server/qq-channel-warning" }
 bitmap-convert.workspace = true
 bitmaps.workspace = true
+persistence = { workspace = true, features = ["prelude", "migrate"] }
 
 [dependencies.tokio]
 workspace = true
@@ -187,21 +173,11 @@ workspace = true
 [dependencies.checker]
 path = "./libs/checker"
 
-[dependencies.orm-migrate]
-package = "migration"
-path = "./migrate/sql-migration"
 
-[dependencies.mongo-migration]
-path = "./migrate/mongo-migration"
 
 [dependencies.modify-cache]
 path = "./libs/modify-cache"
 
-[dependencies.database_traits]
-path = "./database/database_traits"
-
-[dependencies.redis_connection]
-path = "./database/redis_connection"
 
 [dependencies.fetcher_logic]
 path = "./logic/fetcher_logic"

libs/checker/src/lib.rs

@@ -1,12 +1,3 @@
-mod check_fut;
-mod check_prehandle;
-mod checker;
-mod checker_impls;
-mod codegen;
-mod lite_args;
-pub mod prefabs;
-mod require_check;
-
 pub use check_fut::CheckFut;
 pub use check_obj_macro::{check_obj, check_obj as check_gen};
 pub use check_prehandle::{
@@ -19,5 +10,14 @@ pub use require_check::{CheckRequire, ToCheckRequire};
 
 pub use crate::checker::{Checker, LiteChecker, RefChecker};
 
+mod check_fut;
+mod check_prehandle;
+mod checker;
+mod checker_impls;
+mod codegen;
+mod lite_args;
+pub mod prefabs;
+mod require_check;
+
 pub type Checked<C> = <C as Checker>::Checked;
 pub type Uncheck<C> = <C as Checker>::Unchecked;

libs/checker/src/prefabs/collect_checkers/slice_checker.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code)]
+
 use std::{fmt::Debug, marker::PhantomData, pin::Pin, task::Poll};
 
 use futures::Future;

libs/checker/src/prefabs/collect_checkers/stream_checker.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code)]
+
 use std::{
     convert::Infallible,
     marker::PhantomData,

libs/checker/src/prefabs/post_checker.rs

@@ -8,6 +8,7 @@ use futures::{ready, Future};
 use pin_project::pin_project;
 
 use crate::Checker;
+
 /// 追加checker
 ///
 /// 执行完成 `C::check` 后使用 `P::ref_check` 进行追加checker

libs/crypto_str/src/encoders/bcrypt.rs

@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 
 use crate::Encoder;
+
 #[derive(Default, Debug, Clone)]
 pub struct BcryptEncoder<const COST: u32>;
 

libs/crypto_str/src/lib.rs

@@ -1,26 +1,29 @@
+pub use crypto::CryptoString;
+pub use encoders::Encoder;
+#[cfg(feature = "wrap")]
+pub use wrap::{Crypto, CryptoWarp, Raw};
+
 mod crypto;
 mod encoders;
 #[cfg(feature = "serde")] mod serde;
 #[cfg(feature = "trans")] mod trans;
 #[cfg(feature = "wrap")] mod wrap;
 
-pub use encoders::Encoder;
 pub mod inner_encoders {
     #[cfg(feature = "bcrypt")]
     pub mod bcrypt {
+        pub use bcrypt_::BcryptError;
+
         pub use crate::encoders::bcrypt::BcryptEncoder;
+
         pub type DefaultBcryptEncoder = BcryptEncoder<12>;
         pub type BcryptString = crate::CryptoString<DefaultBcryptEncoder>;
-        pub use bcrypt_::BcryptError;
     }
 
     #[cfg(feature = "none")]
     pub mod none {
         pub use crate::encoders::none::NoCrypto;
+
         pub type NoCrtpyoString = crate::CryptoString<NoCrypto>;
     }
 }
-
-pub use crypto::CryptoString;
-#[cfg(feature = "wrap")]
-pub use wrap::{Crypto, CryptoWarp, Raw};

libs/logger/src/lib.rs

@@ -1,13 +1,14 @@
-mod error;
-mod log_init;
-mod log_to;
 pub use error::Error;
 pub use log_init::{GetLogLevel, LogInit};
 pub use log_to::{
     file::{FileLoggerInfo, LogToFile},
     stdout::LogToStdout,
 };
 
+mod error;
+mod log_init;
+mod log_to;
+
 #[cfg(test)]
 mod test {
     use tracing::{debug, error, info, trace, warn};

libs/logger/src/log_init.rs

@@ -6,6 +6,7 @@ use tracing_subscriber::{
 };
 
 use crate::{LogToFile, LogToStdout};
+
 pub struct LogInit<S>(S);
 pub trait GetLogLevel {
     fn get_level(&self) -> LevelFilter { LevelFilter::TRACE }

libs/modify-cache/src/cache_ctrl/control.rs

@@ -131,7 +131,6 @@ impl<'c> Add<&'c CacheControl> for ExtraFlags {
 
 #[cfg(test)]
 mod test {
-
     use std::time::Duration;
 
     use super::CacheControl;

libs/modify-cache/src/cache_ctrl/mod.rs

@@ -1,4 +1,3 @@
-pub mod control;
 use std::{borrow::Cow, ops::Add};
 
 use http::{
@@ -8,6 +7,9 @@ use http::{
 use resp_result::{ExtraFlag, ExtraFlags};
 
 use self::control::CacheControl;
+
+pub mod control;
+
 #[derive(Debug, Default)]
 pub struct CacheHeaders {
     pub(crate) content_local: Option<Uri>,

libs/modify-cache/src/lib.rs

@@ -1,15 +1,15 @@
-mod cache_ctrl;
-mod check_modify;
-mod encode;
-mod error;
-mod headers;
-mod time_format;
-mod traits;
-
 pub use cache_ctrl::{
     control::{CacheControl, CacheMode, Revalidate, Transform},
     CacheHeaders,
 };
 pub use check_modify::CheckModify;
 pub use error::Error;
 pub use traits::{CacheState, ModifyState};
+
+mod cache_ctrl;
+mod check_modify;
+mod encode;
+mod error;
+mod headers;
+mod time_format;
+mod traits;

libs/mongo-migrate-util/src/lib.rs

@@ -1,9 +1,9 @@
-mod collect_manage;
-mod manager;
-mod migration;
-mod migrator;
-
 pub use collect_manage::CollectManage;
 pub use manager::Manager;
 pub use migration::MigrationTrait;
 pub use migrator::{DbManager, MigratorTrait};
+
+mod collect_manage;
+mod manager;
+mod migration;
+mod migrator;

libs/qiniu-manager/examples/server-uploader.rs

@@ -18,6 +18,7 @@ use ceobe_qiniu_upload::{
 };
 use log::SetLoggerError;
 use url::Url;
+
 #[tokio::main]
 async fn main() {
     let path = std::fs::read_to_string("./qiniu_example.json")

libs/qiniu-manager/src/axum_starter.rs

@@ -50,6 +50,7 @@ impl QiniuManager {
 #[cfg(test)]
 mod test {
     use url::Url;
+
     #[test]
     fn test_url_concat() {
         let mut url = Url::parse("https://example.net").unwrap();

libs/qiniu-manager/src/error.rs

@@ -1,6 +1,7 @@
 use axum::extract::multipart::MultipartError;
 use qiniu_upload_manager::apis::http_client::ResponseError;
 use status_err::ErrPrefix;
+
 #[derive(Debug, thiserror::Error, status_err::StatusErr)]
 pub enum Error {
     #[error(transparent)]

libs/qiniu-manager/src/lib.rs

@@ -1,9 +1,3 @@
-mod axum_starter;
-mod error;
-
-mod config;
-mod manager;
-
 pub use config::{BaseUrl, GetBucket, SecretConfig};
 pub use error::{Error, UploaderNotFound};
 pub use manager::{
@@ -17,3 +11,9 @@ pub use mime_guess;
 pub use crate::axum_starter::{
     QiniuBaseUrl, QiniuManager, QiniuUpload, QiniuUploadState,
 };
+
+mod axum_starter;
+mod error;
+
+mod config;
+mod manager;

libs/qiniu-manager/src/manager/mod.rs

@@ -1,6 +1,3 @@
-mod builder;
-pub mod delete;
-pub mod upload;
 use std::fmt::Debug;
 
 use qiniu_objects_manager::Bucket;
@@ -13,6 +10,11 @@ pub use self::{
     },
 };
 use crate::SecretConfig;
+
+mod builder;
+pub mod delete;
+pub mod upload;
+
 #[derive(Debug)]
 pub struct Manager {
     pub(crate) uploader: ManagedUploader,

libs/range-limit/src/lib.rs

@@ -1,8 +1,8 @@
-mod error;
-pub mod measurable;
-pub mod range_limit;
-
 pub use crate::{
     error::Error,
     range_limit::{limits, range_limit_core::RangeBoundLimit, RangeBound},
 };
+
+mod error;
+pub mod measurable;
+pub mod range_limit;

libs/status-err/examples/code_gen.rs

@@ -1,3 +1,5 @@
+use status_err::{ErrPrefix, HttpCode, StatusErr};
+
 fn main() {
     let e = TestErr::Else {
         start: String::from("Abc"),
@@ -6,7 +8,7 @@ fn main() {
     println!("{}", e.information());
     println!("{}", e.respond_msg())
 }
-use status_err::{ErrPrefix, HttpCode, StatusErr};
+
 #[derive(Debug, status_err::ThisError, status_err::StatusErr)]
 #[status_err(resp_err)]
 pub enum TestErr {