From 02b4f98a3e6765570adfe22928a2cae614a0818a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 7 Feb 2022 15:24:54 +0800
Subject: [PATCH] 1

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

diff --git a/server/notifyserver/src/main.rs b/server/notifyserver/src/main.rs
index 29501e5..7e567ae 100755
--- a/server/notifyserver/src/main.rs
+++ b/server/notifyserver/src/main.rs
@@ -1,6 +1,5 @@
 use std::rc::Rc;
 use std::cell::RefCell;
-use std::fs::File;
 use protobuf::Message;
 use protobuf::descriptor::FieldDescriptorProto_Type;
 
@@ -35,7 +34,7 @@ impl r9::ProtoMsg for MessagesUnion {
                         Some(v) => {
                             match field_desc.get_field_type() {
                                 FieldDescriptorProto_Type::TYPE_STRING => {
-                                    os.write_string(field_desc.get_number() as u32, "hello");
+                                    os.write_string(field_desc.get_number() as u32, v.as_str().unwrap());
                                 },
                                 _ => {
 
@@ -74,8 +73,6 @@ macro_rules! getMeta {
 
 fn main() {
     let mut metamgr = MetaMgr::new();
-    let c = metamgr.get_metalist(1);
-    let idx = 0;
     let p = metawrap::MtwAliKeyConf{
         p: RefCell::new(crate::mt::AliKeyConf::new())
     };
@@ -88,10 +85,9 @@ fn main() {
         MessagesUnion::MtwAliKeyConf(dummy)
     );
     metamgr.load();
-    let b = getMeta!(metamgr, MtwAliKeyConf, idx);
+    let b = getMeta!(metamgr, MtwAliKeyConf, 0);
     match b {
         Some(v) => {
-            println!("abcde22222");
             println!("{}", v.p.borrow().get_access_keyid());
             println!("{}", v.p.borrow().get_access_secret());
         }
diff --git a/third_party/r9 b/third_party/r9
index bd11c11..9f8a1d6 160000
--- a/third_party/r9
+++ b/third_party/r9
@@ -1 +1 @@
-Subproject commit bd11c1108eb78ada3b27c56b762cc31e3c3ad029
+Subproject commit 9f8a1d68897f7c86a606b3cfa70f5fd0612e26f7