From 74680b91b537ba5e60ba6f63130ccb2d0e0b2532 Mon Sep 17 00:00:00 2001
From: likun <likun@dobest.com>
Date: Tue, 16 Jul 2024 20:32:32 +0800
Subject: [PATCH] commit

---
 src/apps/account/domain/repo/mod.rs | 0
 src/apps/account/mod.rs             | 2 +-
 src/apps/account/server/mod.rs      | 2 +-
 src/apps/account/server/server.rs   | 4 ++++
 src/apps/mod.rs                     | 2 ++
 src/{cmd => bin}/all_in_one/boot.rs | 1 +
 src/{cmd => bin}/all_in_one/mod.rs  | 0
 src/bin/mod.rs                      | 1 +
 src/lib.rs                          | 2 --
 src/main.rs                         | 8 +++++---
 10 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 src/apps/account/domain/repo/mod.rs
 create mode 100644 src/apps/mod.rs
 rename src/{cmd => bin}/all_in_one/boot.rs (98%)
 rename src/{cmd => bin}/all_in_one/mod.rs (100%)
 create mode 100644 src/bin/mod.rs
 delete mode 100644 src/lib.rs

diff --git a/src/apps/account/domain/repo/mod.rs b/src/apps/account/domain/repo/mod.rs
deleted file mode 100644
index e69de29..0000000
diff --git a/src/apps/account/mod.rs b/src/apps/account/mod.rs
index 5b6b20e..3348a55 100644
--- a/src/apps/account/mod.rs
+++ b/src/apps/account/mod.rs
@@ -2,5 +2,5 @@ mod service;
 mod server;
 
 pub fn boot() {
-    start_server();
+    server::start_server();
 }
\ No newline at end of file
diff --git a/src/apps/account/server/mod.rs b/src/apps/account/server/mod.rs
index 7a54be7..8723c83 100644
--- a/src/apps/account/server/mod.rs
+++ b/src/apps/account/server/mod.rs
@@ -1,5 +1,5 @@
 mod server;
 
 pub fn start_server() {
-    server::start_server()
+    server::start_server();
 }
\ No newline at end of file
diff --git a/src/apps/account/server/server.rs b/src/apps/account/server/server.rs
index 4d95c35..dbdaa58 100644
--- a/src/apps/account/server/server.rs
+++ b/src/apps/account/server/server.rs
@@ -6,6 +6,10 @@ async fn greet(name: web::Path<String>) -> impl Responder {
 }
 
 
+pub fn test_start_server() {
+    println!("test start account server")
+}
+
 pub fn start_server() -> std::io::Result<()> {
     HttpServer::new(|| {
         App::new().service(greet)
diff --git a/src/apps/mod.rs b/src/apps/mod.rs
new file mode 100644
index 0000000..ff0d9dd
--- /dev/null
+++ b/src/apps/mod.rs
@@ -0,0 +1,2 @@
+pub mod account;
+pub mod order;
\ No newline at end of file
diff --git a/src/cmd/all_in_one/boot.rs b/src/bin/all_in_one/boot.rs
similarity index 98%
rename from src/cmd/all_in_one/boot.rs
rename to src/bin/all_in_one/boot.rs
index 2656ba4..4564b31 100644
--- a/src/cmd/all_in_one/boot.rs
+++ b/src/bin/all_in_one/boot.rs
@@ -1,5 +1,6 @@
 use crate::apps::account as account;
 
+
 fn start_apps() {
     account::boot()
 }
\ No newline at end of file
diff --git a/src/cmd/all_in_one/mod.rs b/src/bin/all_in_one/mod.rs
similarity index 100%
rename from src/cmd/all_in_one/mod.rs
rename to src/bin/all_in_one/mod.rs
diff --git a/src/bin/mod.rs b/src/bin/mod.rs
new file mode 100644
index 0000000..4c6a9ea
--- /dev/null
+++ b/src/bin/mod.rs
@@ -0,0 +1 @@
+pub mod all_in_one;
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 60020e7..0000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod all_in_one;
-use apps::account;
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 5aa916c..c182dfd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,9 @@
-use crate::account;
-use apps::account;
+
+pub mod apps;
+pub mod bin;
+use crate::apps::account;
 
 #[actix_web::main] // or #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    println!("Hello, world!");
+    bin::all_in_one::boot();
 }