From 246fb38af6f385c545d29fdbf23e12bbe930c9ec Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 29 Oct 2023 14:44:03 +0800
Subject: [PATCH] 1

---
 server/notifyserver/Cargo.toml  | 9 ++++++---
 server/notifyserver/src/main.rs | 8 ++++----
 third_party/r9                  | 2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/server/notifyserver/Cargo.toml b/server/notifyserver/Cargo.toml
index 44c63a5..9cc09e5 100644
--- a/server/notifyserver/Cargo.toml
+++ b/server/notifyserver/Cargo.toml
@@ -6,11 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-protobuf = "2.9.0"
+#protobuf = "2.9.0"
 serde = "*"
 serde_derive = "*"
 serde_json = "*"
-r9 = { path = "../../third_party/r9" }
+r9 = { path = "../../third_party/r9/r9" }
+r9_macro = { path = "../../third_party/r9/r9_macro" }
+r9_macro_derive = { path = "../../third_party/r9/r9_macro_derive" }
+f9 = { path = "../../third_party/r9/f9" }
 
 [build-dependencies]
-protobuf-codegen-pure = "2.9.0"
+#protobuf-codegen-pure = "2.9.0"
diff --git a/server/notifyserver/src/main.rs b/server/notifyserver/src/main.rs
index 5d0fd05..76916aa 100755
--- a/server/notifyserver/src/main.rs
+++ b/server/notifyserver/src/main.rs
@@ -1,7 +1,7 @@
-use std::rc::{Rc, Weak};
-use std::cell::RefCell;
-
-use r9;
+use f9::app::App;
 
 fn main() {
+    App::instance().borrow_mut().init();
+    App::instance().borrow_mut().run();
+    App::instance().borrow_mut().uninit();
 }
diff --git a/third_party/r9 b/third_party/r9
index b3b93c6..7d22204 160000
--- a/third_party/r9
+++ b/third_party/r9
@@ -1 +1 @@
-Subproject commit b3b93c650eea2a9564acd680f647ba19cd6c6a66
+Subproject commit 7d222040b1c4a6c00d15e0186e3e848e06d8aec8