Update server.py

server.py

@@ -1,8 +1,10 @@
 ini_content = {"username":"xovale7506","key":"502e30bafc004c02aa668a279df23f3e"}
-st_url = 'http://8.217.96.17:7073'
-config_data = """
+frp_url = '8.217.96.17'
+ssh_port = '7074'
+st_url = f'http://{frp_url}:7073'
+config_data = f"""
 [common]
-server_addr = 8.217.96.17
+server_addr = {frp_url}
 server_port = 7000
 
 [safgasdha]
@@ -14,7 +16,7 @@ remote_port = 7073
 type = tcp
 local_ip = 127.0.0.1
 local_port = 22
-remote_port = 7074
+remote_port = {ssh_port}
 [safsdffg]
 type = tcp
 local_ip = 127.0.0.1
@@ -36,6 +38,8 @@ import json
 import threading
 import time
 import glob  # 导入 glob 模块
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
 # 更新软件包列表
 def update():
     print('-----------更新软件包列表开始-------------')
@@ -113,11 +117,16 @@ def ssh():
 # ssh()
 clear_output()
 
-import requests
-import time
-import threading
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
+def sync2():
+    os.system(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' /sillytavern/ root@{frp_url}:/sillytavern/")
+threading.Thread(target=sync2, daemon=True).start()
+def sync():
+    os.system("rm -r /rsync.py /sync.sh")
+    os.system("wget -O /rsync.py https://huggingface.co/datasets/Qilan2/st-server/resolve/main/rsync.py")
+    os.system("wget -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh")
+    os.system("chmod +x  /sync.sh")
+    os.system("chmod +x /sync.py")
+    subprocess.Popen(['sh','/sync.sh'])
 
 def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
     """创建一个带重试机制的请求会话"""
@@ -128,10 +137,6 @@ def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500,
     session.mount('https://', adapter)
     return session
 
-def Frpc():
-    # 在这里定义 Frpc 函数的逻辑
-    print("启动 Frpc...")
-
 def check_api1():
     # 第一次检查 SillyTavern 是否启动
     while True:
@@ -172,16 +177,19 @@ def check_api1():
             
             # 检查返回信息是否包含特定内容
             if "detail" in response_json and response_json["detail"] in ("Method Not Allowed", "Not Found"):
-                print("接口正常")
+                print("接口正常1")
             else:
                 print("接口返回信息：", response_json)
 
         except requests.exceptions.HTTPError as e:
             if e.response.status_code == 403:
-                print("SillyTavern已经启动")  # 再次确认服务已启动
+                print("接口正常2")  # 再次确认服务已启动
+                if thread_started:
+                    threading.Thread(target=sync, daemon=True).start()
+                    thread_started = True  # 设置标志为 True，表示线程已经启动过了
                 break
             
-            print("接口正常2")
+            print("接口正常3")
         
         except requests.exceptions.ConnectionError as e:
             print(f"接口异常1: {e}")
@@ -201,9 +209,6 @@ def check_api1():
         time.sleep(5)  # 等待5秒后重试
 
 
-
-
-
 def frp():
     print('-----------FRP开始-------------')
     '''FRP配置'''