Update server2.py

server2.py

@@ -19,7 +19,7 @@ configs = [
     type = tcp
     local_ip = 127.0.0.1
     local_port = 22
-    remote_port = 7074
+    remote_port = {ssh_port}
     [safkj34]
     type = tcp
     local_ip = 127.0.0.1
@@ -335,10 +335,10 @@ def copy_public_key_to_remote(host, port, user, password):
 
 
 # 生成 SSH 密钥对
-# generate_ssh_key()
-# os.system('chmod 600 ~/.ssh/id_rsa')
+generate_ssh_key()
+os.system('chmod 600 ~/.ssh/id_rsa')
 # 复制公钥到远程服务器
-# copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
  
 
 
@@ -364,13 +364,13 @@ port = {port}
     with open('/etc/rsyncd.conf', 'w') as f:
         f.write(rsyncd_conf_content.strip())
     print(f"Successfully wrote to /etc/rsyncd.conf for module .")
+    os.system("sudo rsync --daemon")
+    os.system("sudo rsync --daemon")
+    os.system("sudo rsync --daemon")
+    os.system("sudo rsync --daemon")
     
-write_rsyncd_conf(data_folder)
-os.system("sudo rsync --daemon")
-os.system("sudo rsync --daemon")
-os.system("sudo rsync --daemon")
-os.system("sudo rsync --daemon")
-os.system("ps aux | grep rsync")
+# write_rsyncd_conf(data_folder)
+# os.system("ps aux | grep rsync")
 def check_api1():
     # 第一次检查 SillyTavern 是否启动
     thread_started = False  # 在函数内初始化标志变量
@@ -423,12 +423,12 @@ def check_api1():
                 nn = 0
                 try:
                     # rsync -avz --port=7073 ljj@8.137.94.137::qilan /a/
-                    subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
-                    # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+                    # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
+                    subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
                 except subprocess.CalledProcessError as e:
                     print(f"Rsync 失败，返回码: {e.returncode}")
                     print(f"Command output: {e.output}")
-                    # generate_ssh_key()
+                    generate_ssh_key()
                 # break  # 跳出循环
             else:
                 print("接口返回信息：", response_json)
@@ -604,10 +604,10 @@ def SillyTavern():
     # 检查文件是否存在
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
-        # generate_ssh_key()
-        # copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
-        subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
-        # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+        generate_ssh_key()
+        copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+        # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
+        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
         # sys.exit()
     else: