diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 758383d..c40925f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -50,6 +50,7 @@ jobs:
       run: |
         cd src
         cargo build -p code-dao-service --release
+        cargo build -p square-service --release
       
     - name: Achive(windows)
       if: matrix.os == 'windows-latest'
@@ -57,14 +58,18 @@ jobs:
       run: |
         echo "ASSET=./src/target/release/code-dao-service.exe" >> $GITHUB_ENV
         echo "ASSET_NAME=code-dao-service.exe" >> $GITHUB_ENV
+        echo "ASSET_SQUARE=./src/target/release/square-service.exe" >> $GITHUB_ENV
+        echo "ASSET_SQUARE_NAME=square-service.exe" >> $GITHUB_ENV
 
     - name: Achive(linux)
       if: matrix.os == 'ubuntu-latest'
       run: |
         echo "ASSET=./src/target/release/code-dao-service" >> $GITHUB_ENV
         echo "ASSET_NAME=code-dao-service" >> $GITHUB_ENV
+        echo "ASSET_SQUARE=./src/target/release/square-service" >> $GITHUB_ENV
+        echo "ASSET_SQUARE_NAME=square-service" >> $GITHUB_ENV
         
-    - name: Upload Release Asset
+    - name: Upload Release Asset(dec-service)
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,3 +79,14 @@ jobs:
         asset_name: ${{ env.ASSET_NAME }}
         asset_content_type: application/octet-stream
 
+    - name: Upload Release Asset(square-service)      
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create-release.outputs.upload_url }}
+        asset_path: ${{ env.ASSET_SQUARE }}
+        asset_name: ${{ env.ASSET_SQUARE_NAME }}
+        asset_content_type: application/octet-stream
+
+
diff --git a/src/code-dao-cli/src/push.rs b/src/code-dao-cli/src/push.rs
index 99229a0..445228b 100644
--- a/src/code-dao-cli/src/push.rs
+++ b/src/code-dao-cli/src/push.rs
@@ -124,7 +124,7 @@ impl Push {
                 .root_state_stub(Some(self.ood), Some(dec_id()))
                 .create_path_op_env()
                 .await?;
-            let commit_path = rootstate_repo_commit2(&self.name, commit_object.object_id());
+            let commit_path = rootstate_repo_commit(&self.name, commit_object.object_id());
             env.set_with_path(
                 commit_path,
                 &commit_object.desc().calculate_id(),
diff --git a/src/code-dao-service/src/controller/commit.rs b/src/code-dao-service/src/controller/commit.rs
index dfd7b72..7497317 100644
--- a/src/code-dao-service/src/controller/commit.rs
+++ b/src/code-dao-service/src/controller/commit.rs
@@ -1,17 +1,14 @@
-
-use cyfs_lib::*;
+use async_std::sync::Arc;
 use cyfs_base::*;
+use cyfs_git_base::*;
+use cyfs_lib::*;
 use log::*;
-use async_std::sync::Arc;
 use serde::{Deserialize, Serialize};
-use serde_json::{json};
-use cyfs_git_base::*;
+use serde_json::json;
 
 // use std::str::FromStr;
 // use super::repository::*;
 
-
-
 #[derive(Serialize, Deserialize)]
 struct RequestRepositoryCommits {
     author_name: String,
@@ -19,7 +16,6 @@ struct RequestRepositoryCommits {
     branch: String,
 }
 
-
 #[derive(Serialize, Deserialize)]
 struct RequestRepositoryCommit {
     author_name: String,
@@ -36,7 +32,8 @@ pub async fn repository_commits(ctx: Arc<PostContext>) -> BuckyResult<NONPostObj
         return Ok(result);
     }
 
-    let repository = RepositoryHelper::get_repository_object(&ctx.stack, &data.author_name, &data.name).await?;
+    let repository =
+        RepositoryHelper::get_repository_object(&ctx.stack, &data.author_name, &data.name).await?;
     // let commit_object_path = RepositoryHelper::commit_object_map_path(&data.author_name, &data.name);
     let env = ctx.stack_env().await?;
 
@@ -44,7 +41,10 @@ pub async fn repository_commits(ctx: Arc<PostContext>) -> BuckyResult<NONPostObj
 
     let mut result_data: Vec<serde_json::Value> = Vec::new();
     for item in commits {
-        let key = commit_object_map_key(&data.author_name, &data.name, &item.object_id);
+        let key = rootstate_repo_commit(
+            &format!("{}/{}", data.author_name, data.name),
+            &item.object_id,
+        );
         info!("commit full path {}", key);
         let commit_object_id = env.get_by_path(&key).await?;
         if commit_object_id.is_none() {
@@ -56,12 +56,12 @@ pub async fn repository_commits(ctx: Arc<PostContext>) -> BuckyResult<NONPostObj
             "id": commit.id(),
             "oid": commit.object_id(),
             "object_id": commit.object_id(),
-            "parent": commit.parent(),
-            "tree": commit.tree_oid(),
+            "parents": commit.parents(),
+            "tree_id": commit.tree_id(),
             "payload": commit.payload(),
             "message": commit.payload(),
-            "author": commit.author(),
-            "committer": commit.committer(),
+            //"author": commit.author(),
+            //"committer": commit.committer(),
         }));
     }
     // loop {
@@ -73,7 +73,7 @@ pub async fn repository_commits(ctx: Arc<PostContext>) -> BuckyResult<NONPostObj
     //         // println!("item: {:?}", item);
     //         let (oid, _) = item.into_map_item();
     //         let commit_id = env.get_by_key(oid).await?;
-    //         if commit_id.is_some() { 
+    //         if commit_id.is_some() {
     //             let buf = get_object(stack, commit_id.unwrap()).await?;
     //             let commit = Commit::clone_from_slice(&buf)? as Commit;
     //             data.push(json!({
@@ -91,10 +91,9 @@ pub async fn repository_commits(ctx: Arc<PostContext>) -> BuckyResult<NONPostObj
     //     }
     // }
 
-    Ok(success(json!({"data": result_data})))
+    Ok(success(json!({ "data": result_data })))
 }
 
-
 /// # repository_commit
 /// commit 详细信息
 pub async fn repository_commit(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
@@ -103,38 +102,48 @@ pub async fn repository_commit(ctx: Arc<PostContext>) -> BuckyResult<NONPostObje
         return Ok(result);
     }
 
-    let repository = RepositoryHelper::get_repository_object(&ctx.stack, &data.author_name, &data.name).await?;
-
+    let repository =
+        RepositoryHelper::get_repository_object(&ctx.stack, &data.author_name, &data.name).await?;
 
     let env = ctx.stack_env().await?;
-    let commit_object_path = commit_object_map_key(&data.author_name, &data.name, &data.commit_id);
+    let commit_object_path = rootstate_repo_commit(
+        &format!("{}/{}", data.author_name, data.name),
+        &data.commit_id,
+    );
 
     let result = env.get_by_path(commit_object_path).await?;
     if result.is_none() {
-        return Ok(failed("没有找到对应的 commit"))
+        return Ok(failed("没有找到对应的 commit"));
     }
 
     let commit_id = result.unwrap();
     let buf = get_object(&ctx.stack, commit_id).await?;
     let commit = Commit::clone_from_slice(&buf)? as Commit;
 
-    info!("git_show_commit_diff {:?} {:?}", commit.parent(), commit.object_id());
-    
-    let diff = git_show_commit_diff(repository.repo_dir(), commit.parent(), commit.object_id())?;
+    info!(
+        "git_show_commit_diff {:?} {:?}",
+        commit.parents(),
+        commit.object_id()
+    );
+
+    let diff = git_show_commit_diff(
+        repository.repo_dir(),
+        &commit.parents()[0],
+        commit.object_id(),
+    )?;
 
     Ok(success(json!({"data": {
         "header_info": {
             "id": commit.id(),
             "oid": commit.object_id(),
             "object_id": commit.object_id(),
-            "parent": commit.parent(),
-            "tree": commit.tree_oid(),
+            "parents": commit.parents(),
+            "tree_id": commit.tree_id(),
             "payload": commit.payload(),
             "message": commit.payload(),
-            "author": commit.author(),
-            "committer": commit.committer(),
+            //"author": commit.author(),
+            //"committer": commit.committer(),
         },
         "diff": diff,
     }})))
 }
-
diff --git a/src/code-dao-service/src/controller/merge.rs b/src/code-dao-service/src/controller/merge.rs
index 4e28f4a..57ed0c9 100644
--- a/src/code-dao-service/src/controller/merge.rs
+++ b/src/code-dao-service/src/controller/merge.rs
@@ -1,22 +1,19 @@
-
-use cyfs_lib::*;
-use cyfs_base::*;
+use crate::*;
 use async_std::sync::Arc;
-use serde::{Deserialize, Serialize};
-use serde_json::{json};
+use cyfs_base::*;
 use cyfs_git_base::*;
+use cyfs_lib::*;
 use log::*;
-use crate::*;
-
-
+use serde::{Deserialize, Serialize};
+use serde_json::json;
 
 #[derive(Serialize, Deserialize)]
 struct RequestRepositoryMergeCompare {
     author_name: String,
     name: String,
     // 目标分支
-    target: String,   
-    // 源分支      
+    target: String,
+    // 源分支
     origin: String,
 }
 
@@ -25,8 +22,8 @@ struct RequestRepositoryMergeCreate {
     author_name: String,
     name: String,
     // 目标分支
-    target: String,   
-    // 源分支      
+    target: String,
+    // 源分支
     origin: String,
     title: String,
     merge_type: String,
@@ -56,19 +53,18 @@ struct RequestRepositoryMergeAccept {
 struct RequestRepositoryMergeCompareFile {
     author_name: String,
     name: String,
-    target: String,   
+    target: String,
     origin: String,
     file_name: String,
 }
 
-
-
-
-
 /// # repository_merge_compare   
 /// 合并 比对分支差异情况
-pub async fn repository_merge_compare(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeCompare = serde_json::from_str(&ctx.data).map_err(transform_err)?;
+pub async fn repository_merge_compare(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeCompare =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
 
@@ -76,15 +72,13 @@ pub async fn repository_merge_compare(ctx: Arc<PostContext>) -> BuckyResult<NONP
         return Ok(result);
     }
 
-
     let repository = RepositoryHelper::get_repository_object(&ctx.stack, &space, &name).await?;
 
     if repository.init() == 0 {
-        return Ok(failed("current repository no init"))
+        return Ok(failed("current repository no init"));
     }
     let repository_dir = repository.repo_dir();
 
-    
     info!("to get compare result");
     let result = git_compare_no_merge(repository_dir.clone(), &data.origin, &data.target)?;
     info!("git compare result {:?}", result);
@@ -100,19 +94,21 @@ pub async fn repository_merge_compare(ctx: Arc<PostContext>) -> BuckyResult<NONP
     })))
 }
 
-
 /// # repository_merge_create
 /// 创建合并请求
-pub async fn repository_merge_create(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeCreate = serde_json::from_str(&ctx.data).map_err(transform_err)?;
-    
-    if let Some(result) = ctx.check_space_proxy_request(&data.author_name,).await? {
+pub async fn repository_merge_create(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeCreate =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
+
+    if let Some(result) = ctx.check_space_proxy_request(&data.author_name).await? {
         return Ok(result);
     }
 
     // 获取 用户名字
     let user_name = get_user_name_by_owner(&ctx.caller.to_string()).await?;
-    info!("get user name[{}  {}] ",&ctx.caller.to_string(), user_name);
+    info!("get user name[{}  {}] ", &ctx.caller.to_string(), user_name);
     let owner = get_owner(&ctx.stack).await;
 
     // 创建 merge request 对象
@@ -132,7 +128,8 @@ pub async fn repository_merge_create(ctx: Arc<PostContext>) -> BuckyResult<NONPo
     let env = ctx.stack_env().await?;
     let object_id = merge.desc().calculate_id();
 
-    let merge_key = RepositoryHelper::merge_key(&data.author_name, &data.name, &object_id.to_string());
+    let merge_key =
+        RepositoryHelper::merge_key(&data.author_name, &data.name, &object_id.to_string());
     let r = env.insert_with_path(&merge_key, &object_id).await?;
     info!("insert_with_key: {:?}", r);
 
@@ -141,11 +138,13 @@ pub async fn repository_merge_create(ctx: Arc<PostContext>) -> BuckyResult<NONPo
     Ok(success(json!({"message": "ok"})))
 }
 
-
 /// # repository_merge_list
 /// 合并请求的列表
-pub async fn repository_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeList = serde_json::from_str(&ctx.data).map_err(transform_err)?;
+pub async fn repository_merge_list(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeList =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
 
@@ -181,14 +180,16 @@ pub async fn repository_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPost
         }
     }
 
-    Ok(success(json!({"data": response_data})))
+    Ok(success(json!({ "data": response_data })))
 }
 
-
 /// # repository_merge_detail
 /// 合并请求的详情
-pub async fn repository_merge_detail(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeDetail = serde_json::from_str(&ctx.data).map_err(transform_err)?;
+pub async fn repository_merge_detail(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeDetail =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
 
@@ -196,7 +197,6 @@ pub async fn repository_merge_detail(ctx: Arc<PostContext>) -> BuckyResult<NONPo
         return Ok(result);
     }
 
-
     let env = ctx.stack_env().await?;
     let merge_key = RepositoryHelper::merge_key(&space, &name, &data.merge_id);
     info!("merge/detail merge key {}", merge_key);
@@ -224,8 +224,11 @@ pub async fn repository_merge_detail(ctx: Arc<PostContext>) -> BuckyResult<NONPo
 
 /// # repository_merge_accept
 /// 处理合并请求
-pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeAccept =  serde_json::from_str(&ctx.data).map_err(transform_err)?;
+pub async fn repository_merge_accept(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeAccept =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
 
@@ -249,10 +252,12 @@ pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPo
     let repository = RepositoryHelper::get_repository_object(&ctx.stack, &space, &name).await?;
     let repository_dir = repository.repo_dir();
 
-
     // set user info
     let user = UserHelper::get_current_user(&ctx.stack).await?;
-    git_exec_base(repository_dir.clone(), ["config", "user.email", user.email()])?;
+    git_exec_base(
+        repository_dir.clone(),
+        ["config", "user.email", user.email()],
+    )?;
     git_exec_base(repository_dir.clone(), ["config", "user.name", user.name()])?;
     // TODO? check: 是否在同一个分支线上。
 
@@ -260,23 +265,36 @@ pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPo
     // TODO 并发的时候要lock这个文件的处理，现在先这样吧
     let _ = std::fs::remove_file(repository_dir.clone().join(".git/index"));
 
-    let new_hash = git_merge(repository_dir.clone(), merge.origin_branch(), merge.target_branch())?;
-    info!("git_merge[{}] result new_hash: {:?}",merge.target_branch(), new_hash);
+    let new_hash = git_merge(
+        repository_dir.clone(),
+        merge.origin_branch(),
+        merge.target_branch(),
+    )?;
+    info!(
+        "git_merge[{}] result new_hash: {:?}",
+        merge.target_branch(),
+        new_hash
+    );
 
     let commit = git_read_commit_object(repository_dir, &new_hash)?;
     info!("git_read the new merged commit: {:?}", commit);
 
-
-    // TODO  commit save to object
     let commit_object = Commit::create(
-        get_owner(&ctx.stack).await,
+        ctx.caller,
         commit.object_id.clone(),
-        commit.parent,  
-        commit.tree,  
+        vec![commit.parent, commit.parent2],
+        commit.tree.clone(),
         commit.payload,
-        serde_json::to_string(&commit.author).unwrap(),   // 转换成json str
-        serde_json::to_string(&commit.committer).unwrap(),  
-        commit.parent2,
+        Some(CommitSignature {
+            name: commit.author.name,
+            email: commit.author.email,
+            when: commit.author.date,
+        }),
+        Some(CommitSignature {
+            name: commit.committer.name,
+            email: commit.committer.email,
+            when: commit.committer.date,
+        }),
     );
     let commit_object_id = commit_object.desc().object_id();
     put_object(&ctx.stack, &commit_object).await?;
@@ -284,20 +302,31 @@ pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPo
     info!("commit_obj object id: {:?}", commit_object_id);
     let env = ctx.stack_env().await?;
     let commit_path = RepositoryHelper::commit_object_map_path(&space, &name);
-    let _r = env.set_with_key(&commit_path, &commit.object_id, &commit_object_id, None, true).await?;
+    let _r = env
+        .set_with_key(
+            &commit_path,
+            &commit.object_id,
+            &commit_object_id,
+            None,
+            true,
+        )
+        .await?;
     let root = env.commit().await;
-    info!("repository_merge_accept after create commit object dec root is: {:?}", root);
+    info!(
+        "repository_merge_accept after create commit object dec root is: {:?}",
+        root
+    );
 
     // update-ref
     let repo_ref = RepositoryBranch::create(
-        get_owner(&ctx.stack).await, 
-        space.clone(), 
-        name.clone(), 
-        merge.target_branch().to_string().clone(), 
-        new_hash.clone());
+        get_owner(&ctx.stack).await,
+        space.clone(),
+        name.clone(),
+        merge.target_branch().to_string().clone(),
+        new_hash.clone(),
+    );
     repo_ref.insert_ref(&ctx.stack).await?;
 
-
     // change status
     let new_merge = MergeRequest::create(
         merge.desc().owner().unwrap(),
@@ -315,7 +344,9 @@ pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPo
 
     // 可能可以优化这个 env
     let env = ctx.stack_env().await?;
-    let _r = env.set_with_path(merge_key, &new_merge_id, None, true).await?;
+    let _r = env
+        .set_with_path(merge_key, &new_merge_id, None, true)
+        .await?;
     let _root = env.commit().await;
 
     Ok(success(json!({"data": "ok"})))
@@ -323,8 +354,11 @@ pub async fn repository_merge_accept(ctx: Arc<PostContext>) -> BuckyResult<NONPo
 
 /// # repository_merge_compare_file
 /// 合并请求的文件(逐个)比对
-pub async fn repository_merge_compare_file(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
-    let data: RequestRepositoryMergeCompareFile = serde_json::from_str(&ctx.data).map_err(transform_err)?;
+pub async fn repository_merge_compare_file(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
+    let data: RequestRepositoryMergeCompareFile =
+        serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
 
@@ -349,7 +383,6 @@ pub async fn repository_merge_compare_file(ctx: Arc<PostContext>) -> BuckyResult
     })))
 }
 
-
 /// # panel_merge_list
 /// 全局merge列表
 pub async fn panel_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
@@ -360,7 +393,7 @@ pub async fn panel_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjec
             "data": {
                 "merge_list": []
             }
-        })))
+        })));
     }
 
     let mut response_data: Vec<serde_json::Value> = Vec::new();
@@ -386,7 +419,7 @@ pub async fn panel_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjec
             for item in ret {
                 let (id, _) = item.into_map_item();
                 let object_id = ObjectId::from_str(&id)?;
-                let buf= get_object(&ctx.stack, object_id).await?;
+                let buf = get_object(&ctx.stack, object_id).await?;
                 let merge = MergeRequest::clone_from_slice(&buf)?;
                 response_data.push(json!({
                     "id": merge.id(),
@@ -406,5 +439,4 @@ pub async fn panel_merge_list(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjec
             "merge_list": response_data
         }
     })))
-
-}
\ No newline at end of file
+}
diff --git a/src/code-dao-service/src/controller/repository_push.rs b/src/code-dao-service/src/controller/repository_push.rs
index 9b29b28..bae1669 100644
--- a/src/code-dao-service/src/controller/repository_push.rs
+++ b/src/code-dao-service/src/controller/repository_push.rs
@@ -1,15 +1,14 @@
-use cyfs_lib::*;
+use crate::*;
+use async_std::sync::Arc;
 use cyfs_base::*;
+use cyfs_git_base::*;
+use cyfs_lib::*;
 use log::*;
-use async_std::sync::Arc;
 use serde::{Deserialize, Serialize};
-use serde_json::{json};
+use serde_json::json;
 use std::str::FromStr;
-use cyfs_git_base::*;
-use crate::*;
-
-type RequestRepositoryPushHead =  RequestRepositoryDelete;
 
+type RequestRepositoryPushHead = RequestRepositoryDelete;
 
 #[derive(Serialize, Deserialize)]
 struct RequestRepositoryPush {
@@ -33,12 +32,11 @@ struct RequestRepositoryPushTag {
     ref_hash: String,
 }
 
-
-
-
 /// # repository_push_head    
 /// git push head
-pub async fn repository_push_head(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
+pub async fn repository_push_head(
+    ctx: Arc<PostContext>,
+) -> BuckyResult<NONPostObjectInputResponse> {
     let data: RequestRepositoryPushHead = serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
     let name = data.name;
@@ -51,34 +49,34 @@ pub async fn repository_push_head(ctx: Arc<PostContext>) -> BuckyResult<NONPostO
         info!("others try to push, check member permission");
         let member_list = crate::member_list(&ctx.stack, &space, &name).await?;
         if member_list.len() == 0 {
-            return Ok(failed("target repo are not permission granted"))
+            return Ok(failed("target repo are not permission granted"));
         }
         // check 是否有权限push
         let is_permission = member_list.iter().any(|member| {
             let owner_id = member["user_id"].as_str().unwrap().to_string();
             if owner_id != ctx.caller.to_string() {
-                return false
-            } 
-            let role = RepositoryMemberRole::from_str(member["role"].as_str().unwrap()).expect("RepositoryMemberRole parse failed");
+                return false;
+            }
+            let role = RepositoryMemberRole::from_str(member["role"].as_str().unwrap())
+                .expect("RepositoryMemberRole parse failed");
             // member["role"].as_str().unwrap();
             role.push_allow()
         });
         if !is_permission {
-            return Ok(failed("target repo are not permission granted"))
+            return Ok(failed("target repo are not permission granted"));
         }
     }
 
     if repository.init() == 0 {
-        return Ok(success(json!({"refs": []})))
+        return Ok(success(json!({"refs": []})));
     }
 
-    let resp_refs =RepositoryBranch::read_refs(&ctx.stack, &space, &name).await?;
-    Ok(success(json!({"refs": resp_refs})))
+    let resp_refs = RepositoryBranch::read_refs(&ctx.stack, &space, &name).await?;
+    Ok(success(json!({ "refs": resp_refs })))
 }
 
-
 /// # repository_push
-/// git push 
+/// git push
 pub async fn repository_push(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
     let data: RequestRepositoryPush = serde_json::from_str(&ctx.data).map_err(transform_err)?;
     let space = data.author_name;
@@ -90,10 +88,17 @@ pub async fn repository_push(ctx: Arc<PostContext>) -> BuckyResult<NONPostObject
     let pack_file = ObjectId::from_str(&data.pack_file_id).unwrap();
 
     if !check_space_local(&ctx.stack, &space).await? {
-	info!("other runtime push into");
+        info!("other runtime push into");
         // A push to B
         // file:: A.runtime[publish_file] -> A.ood[create_task] -> B.ood[create_task]
-        let _ = file_task(&ctx.stack, pack_file, local_path.clone(), runtime_device.clone(), None).await?;
+        let _ = file_task(
+            &ctx.stack,
+            pack_file,
+            local_path.clone(),
+            runtime_device.clone(),
+            None,
+        )
+        .await?;
         info!("download file to my ood ok, then proxy push request");
         let result = request_other_ood(&ctx.stack, &space, &ctx.route, &ctx.data).await?;
         return Ok(result);
@@ -101,38 +106,44 @@ pub async fn repository_push(ctx: Arc<PostContext>) -> BuckyResult<NONPostObject
 
     let repository = RepositoryHelper::get_repository_object(&ctx.stack, &space, &name).await?;
     info!("get repository {:?}", repository.id());
-    let _ = file_task(&ctx.stack, pack_file, local_path.clone(), runtime_device, Some(ctx.caller)).await?;
-
+    let _ = file_task(
+        &ctx.stack,
+        pack_file,
+        local_path.clone(),
+        runtime_device,
+        Some(ctx.caller),
+    )
+    .await?;
 
     info!("repo push local_file path  {:?}", local_path);
     let repo_dir = repository.repo_dir();
     let _ = git_unbundle_and_unpack_objects(
-        repo_dir.clone(), 
+        repo_dir.clone(),
         local_path.to_str().unwrap(),
         &data.branch,
         &data.ref_hash,
     )?;
 
-
     let repo_ref = RepositoryBranch::create(
-        get_owner(&ctx.stack).await, 
-        space.clone(), 
-        name.clone(), 
-        data.branch.clone(), 
-        data.ref_hash);
+        get_owner(&ctx.stack).await,
+        space.clone(),
+        name.clone(),
+        data.branch.clone(),
+        data.ref_hash,
+    );
     repo_ref.insert_ref(&ctx.stack).await?;
 
-
     // update repository的init字段
     if repository.init() == 0 {
         Repository::update(
-            repository, 
-            &ctx.stack, 
+            repository,
+            &ctx.stack,
             json!({
                 "target": "init",
                 "value": 1
-            })
-        ).await?;
+            }),
+        )
+        .await?;
         info!("change repository column init 0 => 1 ");
     }
 
@@ -142,22 +153,39 @@ pub async fn repository_push(ctx: Arc<PostContext>) -> BuckyResult<NONPostObject
     // let branch = refs["branch"].as_str();
     let commits = git_commits(repo_dir.clone(), &data.branch)?;
 
-
     for commit in commits {
         let commit_object = Commit::create(
             ctx.caller,
             commit.object_id.clone(),
-            commit.parent,  
-            commit.tree.clone(),  
+            vec![commit.parent, commit.parent2],
+            commit.tree.clone(),
             commit.payload,
-            serde_json::to_string(&commit.author).unwrap(),   // 转换成json str
-            serde_json::to_string(&commit.committer).unwrap(),  
-            commit.parent2,
+            Some(CommitSignature {
+                name: commit.author.name,
+                email: commit.author.email,
+                when: commit.author.date,
+            }),
+            Some(CommitSignature {
+                name: commit.committer.name,
+                email: commit.committer.email,
+                when: commit.committer.date,
+            }),
+            //serde_json::to_string(&commit.author).unwrap(), // 转换成json str
+            //serde_json::to_string(&commit.committer).unwrap(),
+            //commit.parent2,
         );
         let commit_object_id = commit_object.desc().object_id();
         println!("commit_obj object id: {:?}", commit_object_id);
         let env = ctx.stack_env().await?;
-        let _r = env.set_with_key(&commit_path, &commit.object_id, &commit_object_id, None, true).await?;
+        let _r = env
+            .set_with_key(
+                &commit_path,
+                &commit.object_id,
+                &commit_object_id,
+                None,
+                true,
+            )
+            .await?;
         let root = env.commit().await;
         println!("new dec root is: {:?}", root);
 
@@ -172,7 +200,6 @@ pub async fn repository_push(ctx: Arc<PostContext>) -> BuckyResult<NONPostObject
     Ok(success(json!({})))
 }
 
-
 /// # repository_push_tag
 /// git push only tag
 pub async fn repository_push_tag(ctx: Arc<PostContext>) -> BuckyResult<NONPostObjectInputResponse> {
@@ -192,22 +219,27 @@ pub async fn repository_push_tag(ctx: Arc<PostContext>) -> BuckyResult<NONPostOb
     let repo_dir = repository.repo_dir();
 
     let repo_ref = RepositoryBranch::create(
-        get_owner(&ctx.stack).await, 
-        space.clone(), 
-        name.clone(), 
-        branch.clone(), 
-        ref_hash.clone());
+        get_owner(&ctx.stack).await,
+        space.clone(),
+        name.clone(),
+        branch.clone(),
+        ref_hash.clone(),
+    );
     repo_ref.insert_ref(&ctx.stack).await?;
-    info!("[{}/{}] update map ref {} {}", space, name,branch, ref_hash);
-    
+    info!(
+        "[{}/{}] update map ref {} {}",
+        space, name, branch, ref_hash
+    );
+
     git_update_ref(repo_dir, &branch, &ref_hash);
-    info!("[{}/{}] update repostiroy dir ref {} {}", space, name, branch, ref_hash);
+    info!(
+        "[{}/{}] update repostiroy dir ref {} {}",
+        space, name, branch, ref_hash
+    );
 
     Ok(success(json!({})))
 }
 
-
-
 // struct CommitHelper<'a> {
 //     env: &'a  SingleOpEnvStub,
 // }
@@ -219,16 +251,16 @@ pub async fn repository_push_tag(ctx: Arc<PostContext>) -> BuckyResult<NONPostOb
 
 //     pub async fn insert(&'a self, repo_dir: std::path::PathBuf, branch: &str, owner:ObjectId) ->BuckyResult<()> {
 //         let commits = git_commits(repo_dir, branch)?;
-        
+
 //         for commit in commits {
 //             let commit_object = Commit::create(
 //                 owner,
 //                 commit.object_id.clone(),
-//                 commit.parent,  
-//                 commit.tree,  
-//                 commit.payload,  
-//                 commit.author,  
-//                 commit.committer,  
+//                 commit.parent,
+//                 commit.tree,
+//                 commit.payload,
+//                 commit.author,
+//                 commit.committer,
 //             );
 //             let commit_object_id = commit_object.desc().object_id();
 //             println!("commit_obj object id: {:?}", commit_object_id);
@@ -237,7 +269,6 @@ pub async fn repository_push_tag(ctx: Arc<PostContext>) -> BuckyResult<NONPostOb
 //             println!("new dec root is: {:?}", root);
 //         }
 
-
 //         println!("commit_path object map ok");
 
 //         Ok(())
diff --git a/src/cyfs-git-base/src/path.rs b/src/cyfs-git-base/src/path.rs
index cf0dbe2..250f08f 100644
--- a/src/cyfs-git-base/src/path.rs
+++ b/src/cyfs-git-base/src/path.rs
@@ -26,13 +26,9 @@ pub fn rootstate_repo_refs_list(author_name: &str, repo_name: &str) -> String {
 /// commit
 /// name <full_name>
 /// path /app/<space>/<name>/commit/<oid>
-pub fn rootstate_repo_commit2(name: &str, oid: &str) -> String {
+pub fn rootstate_repo_commit(name: &str, oid: &str) -> String {
     format!("{}{}/commit/{}", REPOSITORY_PATH, name, oid)
 }
-/// path /app/<space>/<name>/commit/<oid>
-pub fn rootstate_repo_commit(author_name: &str, name: &str, oid: &str) -> String {
-    format!("{}{}/{}/commit/{}", REPOSITORY_PATH, author_name, name, oid)
-}
 
 /// tree
 pub fn rootstate_repo_tree(author_name: &str, repo_name: &str, tree_id: &str) -> String {