Update server.py

server.py

@@ -4,57 +4,67 @@ ssh_port = '7072'
 st_url = f'http://{frp_url}:7070'
 huggingface_name = 'lixuhs875'
 huggingface_Data_name = 'qilan-st1'
-config_data = f"""
-[common]
-server_addr = {frp_url}
-server_port = 7000
-
-[safgha]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 8000
-remote_port = 7070
-[safabf]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 22
-remote_port = {ssh_port}
-[saffg]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 3000
-remote_port = 7071
-"""
-config_data2 = """
-[common]
-server_addr = 8.137.94.137
-server_port = 7000
-[safg541211ha]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 8000
-remote_port = 7070
-"""
-config_data3 = """
-[common]
-server_addr = 47.93.130.208
-server_port = 7000
-[sa211lkk1ha]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 8000
-remote_port = 7070
-"""
-config_data4 = """
-[common]
-server_addr = 175.178.165.186
-server_port = 7000
-[safg11ha]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 8000
-remote_port = 7070
-"""
+configs = [
+    (f"""
+    [common]
+    server_addr = {frp_url}
+    server_port = 7000
+
+    [safgha]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = 8000
+    remote_port = 7070
+    
+    [safabf]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = {ssh_port}
+    remote_port = {ssh_port}
+    
+    [saffg]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = 3000
+    remote_port = 7071
+    """, '/content/frp/frpc.ini'),
+
+   ("""
+   [common]
+   server_addr = 8.137.94.137 
+   server_port=7000 
+   
+   [safg541211ha] 
+   type=tcp 
+   local_ip=127 .0 .0 .1 
+   local_port=8000 
+   remote_port=7070  
+   """, '/content/frp/frpc2.ini'),
+
+   ("""
+   [common] 
+   server_addr=47.93.130.208 
+   server_port=7000 
+
+   [sa211lkk1ha] 
+   type=tcp 
+   local_ip=127 .0 .0 .1 
+   local_port=8000 
+   remote_port=7070  
+     """, '/content/frp/frpc3.ini'),
+
+     ("""
+     [common]  
+     server_addr=175.178.165.186  
+     server_port=7000  
+
+     [safg11ha]  
+     type=tcp  
+     local_ip=127 .0 .0 .1  
+     local_port=80000   
+     remote port=70700   
+       """, '/content/frp/frpc4.ini')
+]
 kaggle_metadata = {
     "title": "Your Dataset Title",
     "id": f"{huggingface_name}/{huggingface_Data_name}",
@@ -421,23 +431,29 @@ def check_api1():
         time.sleep(2)  # 等待5秒后重试
 
 
-def frp(config_data1,config_file_path,backstage):
-    print('-----------FRP开始-------------')
-    '''FRP配置'''
-    os.system("mkdir -p /content/frp")
-    os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
-    os.system("chmod +x /content/frp/frpc")
-    # config_file_path = '/content/frp/frpc.ini'
-    with open(config_file_path, 'w') as config_file:
-        config_file.write(config_data1)
-    # frpc 启动命令和参数
-    frpc_cmd = ['/content/frp/frpc', '-c', config_file_path]
-    if backstage:
-        subprocess.Popen(frpc_cmd)
-    else:
-        subprocess.run(f'/content/frp/frpc -c {config_file_path}', shell=True, check=True)
-    print('-----------FPR结束-------------')
-    # /content/frp/frpc -c /content/frp/frpc.ini
+def frp(configs, backstage):
+    
+     print('-----------FRP开始-------------')
+     
+     # 创建 FRP 文件夹并下载 frpc 可执行文件。
+     os.system("mkdir -p /content/frp")
+     os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
+     os.system("chmod +x /content/frp/frpc")
+
+     # 遍历所有配置并启动 FRP。
+     for config_data, config_file_path in configs:
+         with open(config_file_path, 'w') as config_file:
+             config_file.write(config_data)
+         
+         # 启动 frpc 命令和参数。
+         frpc_cmd=['/content/frp/frpc', '-c', config_file_path]
+
+         if backstage:
+             subprocess.Popen(frpc_cmd)
+         else:
+             subprocess.run(f'/content/frp/frpc -c {config_file_path}', shell=True, check=True)
+
+     print('-----------FRP结束-------------')
     
 import requests
 import re
@@ -621,10 +637,11 @@ if os.path.exists(f'{data_folder}/start.sh'):
     backup_thread.start()
     print("开始衔接")
     Service_status = True
-    frp(config_data2,'/content/frp/frpc2.ini',True)
-    frp(config_data,'/content/frp/frpc.ini',True)
-    frp(config_data3,'/content/frp/frpc3.ini',True)
-    frp(config_data4,'/content/frp/frpc4.ini',True)
+    frp(configs, True)
+    # frp(config_data2,'/content/frp/frpc2.ini',True)
+    # frp(config_data,'/content/frp/frpc.ini',True)
+    # frp(config_data3,'/content/frp/frpc3.ini',True)
+    # frp(config_data4,'/content/frp/frpc4.ini',True)
     # 以线程的形式运行 frp 任务
     # frp_thread1 = threading.Thread(target=frp, args=(config_data2, '/content/frp/frpc2.ini', True))
     # frp_thread1.start()