From 854c1d018b9a5f1079f387101c62f86009c3baac Mon Sep 17 00:00:00 2001
From: Super User <root@localhost.localdomain>
Date: Mon, 21 Aug 2023 16:19:47 +0800
Subject: [PATCH] fix export error and no migration details issue

---
 ut-Migration-tools/index.py                    | 4 ++--
 ut-Migration-tools/templates/MT_migration.html | 3 ++-
 ut-Migration-tools/views/migration.py          | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ut-Migration-tools/index.py b/ut-Migration-tools/index.py
index 59e6830..635c5ac 100644
--- a/ut-Migration-tools/index.py
+++ b/ut-Migration-tools/index.py
@@ -218,7 +218,7 @@ def MT_export_migration_reports():
     :return:
     """
     mod = check_methods()
-    f = open("/usr/lib/migration-tools-agent/.passwd.txt","r")
+    f = open("/usr/lib/migration-tools-server/.passwd.txt","r")
     password = f.read()
     f.close()
     if mod:
@@ -234,7 +234,7 @@ def MT_export_migration_reports():
                 print("export report mkdir error:%s" % mkdir_log_pwd)
 
         info = mod.split(',')
-        scp_log = "sshpass -p %s" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \
+        scp_log = "sshpass -p '%s'" % password + " scp -r %s" % json_data.get('info').split("|")[0] + "@%s" % info[1] \
                   + ":/var/tmp/uos-migration/UOS*.tar.gz /var/uos-migration/"
         try:
             os.system(scp_log)
diff --git a/ut-Migration-tools/templates/MT_migration.html b/ut-Migration-tools/templates/MT_migration.html
index 39bed0b..77bf56a 100644
--- a/ut-Migration-tools/templates/MT_migration.html
+++ b/ut-Migration-tools/templates/MT_migration.html
@@ -65,7 +65,8 @@
 <script>
 
 	$(document).ready(function() {
-        progress = setInterval("check_progress()",2000);
+		progress = setInterval("check_progress()",2000);
+		log_info = setInterval("migration_details()",2000);
 		setInterval("system_migration()",36000);
     });
 
diff --git a/ut-Migration-tools/views/migration.py b/ut-Migration-tools/views/migration.py
index 33c4b19..2e9c0c5 100644
--- a/ut-Migration-tools/views/migration.py
+++ b/ut-Migration-tools/views/migration.py
@@ -38,6 +38,10 @@ def close_tool(data):
 def check_user(data):
     services = check_services(data, '/check_user')
     if services:
+        json_data = json.loads(data)
+        with open('/usr/lib/migration-tools-server/.passwd.txt','w',encoding='utf-8') as f:
+            text = json_data['passwd']
+            f.write(text)
         return services
 
 def check_repo(data):
@@ -85,4 +89,4 @@ def system_migration(data):
 def migration_details(data):
     services = check_services(data, '/migration_details')
     if services:
-        return services
\ No newline at end of file
+        return services
-- 
2.41.0

