Sync to VersionControl(commit:bac88ab)

6 files changed, 11 insertions, 11 deletions

diff --git a/src/bin/jv.rs b/src/bin/jv.rs
index 4effe66..355e205 100644
--- a/src/bin/jv.rs
+++ b/src/bin/jv.rs
@@ -18,27 +18,27 @@ use just_enough_vcs::{
             CLIENT_FILE_TODOLIST, CLIENT_FILE_WORKSPACE, CLIENT_FOLDER_WORKSPACE_ROOT_NAME,
             CLIENT_PATH_WORKSPACE_ROOT, PORT, VAULT_HOST_NAME,
         },
-        current::{correct_current_dir, current_cfg_dir, current_local_path},
         data::{
             local::{
                 LocalWorkspace,
-                align::{AlignTaskName, AlignTasks},
+                align_tasks::{AlignTaskName, AlignTasks},
                 cached_sheet::CachedSheet,
-                config::LocalConfig,
                 latest_file_data::LatestFileData,
                 latest_info::LatestInfo,
-                vault_modified::check_vault_modified,
+                modified_status::check_vault_modified,
                 workspace_analyzer::{AnalyzeResult, FromRelativePathBuf},
+                workspace_config::LocalConfig,
             },
             member::{Member, MemberId},
             sheet::{SheetData, SheetMappingMetadata},
             user::UserDirectory,
             vault::{
-                sheet_share::{Share, ShareMergeMode},
+                mapping_share::{Share, ShareMergeMode},
                 virtual_file::{VirtualFileId, VirtualFileVersion},
             },
         },
         docs::{ASCII_YIZI, document, documents},
+        env::{correct_current_dir, current_cfg_dir, current_local_path},
         registry::client_registry,
         remote_actions::{
             content_manage::track::{
diff --git a/src/bin/jvv.rs b/src/bin/jvv.rs
index 412eebe..0e1eaa5 100644
--- a/src/bin/jvv.rs
+++ b/src/bin/jvv.rs
@@ -8,11 +8,11 @@ use just_enough_vcs::{
     vcs::{
         connection::action_service::server_entry,
         constants::SERVER_FILE_VAULT,
-        current::current_vault_path,
         data::{
             member::Member,
-            vault::{Vault, config::VaultConfig},
+            vault::{Vault, vault_config::VaultConfig},
         },
+        env::current_vault_path,
     },
 };
 use just_enough_vcs_cli::{
diff --git a/src/data/ipaddress_history.rs b/src/data/ipaddress_history.rs
index 2787c36..c100fc9 100644
--- a/src/data/ipaddress_history.rs
+++ b/src/data/ipaddress_history.rs
@@ -1,4 +1,4 @@
-use just_enough_vcs::vcs::current::current_cfg_dir;
+use just_enough_vcs::vcs::env::current_cfg_dir;
 
 const IP_HISTORY_NAME: &str = "ip_history.txt";
 
diff --git a/src/output/align.rs b/src/output/align.rs
index eae1fa7..2c6bfc4 100644
--- a/src/output/align.rs
+++ b/src/output/align.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, path::PathBuf};
 
-use just_enough_vcs::vcs::data::local::align::AlignTaskName;
+use just_enough_vcs::vcs::data::local::align_tasks::AlignTaskName;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Default, Serialize, Deserialize)]
diff --git a/src/output/share.rs b/src/output/share.rs
index 6fbfc3f..53282ea 100644
--- a/src/output/share.rs
+++ b/src/output/share.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use just_enough_vcs::vcs::data::{
     member::MemberId,
     sheet::{SheetMappingMetadata, SheetPathBuf},
-    vault::sheet_share::SheetShareId,
+    vault::mapping_share::SheetShareId,
 };
 use serde::{Deserialize, Serialize};
 
diff --git a/src/utils/logger.rs b/src/utils/logger.rs
index 5871094..7dd4f62 100644
--- a/src/utils/logger.rs
+++ b/src/utils/logger.rs
@@ -3,7 +3,7 @@ use std::path::Path;
 use colored::Colorize;
 use env_logger::{Builder, Target};
 use just_enough_vcs::{
-    utils::string_proc::format_path::format_path, vcs::data::vault::config::LoggerLevel,
+    utils::string_proc::format_path::format_path, vcs::data::vault::vault_config::LoggerLevel,
 };
 use log::{Level, LevelFilter};