Update server.py

server.py

@@ -1,27 +1,37 @@
 ini_content = {"username":"xovale7506","key":"502e30bafc004c02aa668a279df23f3e"}
-frp_url = '8.217.96.17'
-ssh_port = '7074'
+frp_url = '47.237.156.222'
+ssh_port = '7072'
 st_url = f'http://{frp_url}:7073'
 config_data = f"""
 [common]
 server_addr = {frp_url}
 server_port = 7000
 
-[safgasdha]
+[safgha]
 type = tcp
 local_ip = 127.0.0.1
 local_port = 8000
-remote_port = 7073
-[safabdfsf]
+remote_port = 7070
+[safabf]
 type = tcp
 local_ip = 127.0.0.1
 local_port = 22
 remote_port = {ssh_port}
-[safsdffg]
+[saffg]
 type = tcp
 local_ip = 127.0.0.1
-local_port = 873
-remote_port = 7075
+local_port = 3000
+remote_port = 7071
+"""
+config_data2 = """
+[common]
+server_addr = 8.137.94.137
+server_port = 7000
+[safgha]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 8000
+remote_port = 7070
 """
 
 kaggle_metadata = {
@@ -59,7 +69,7 @@ def update():
     os.system("pip install ruamel.yaml") # install ruamel.yaml to solve the import issue
     os.system("pip install pexpect")
     print('-----------更新软件包列表结束-------------')
-# update()
+update()
 from ruamel.yaml import YAML
 clear_output(wait=True)  # 清除输出
 
@@ -126,7 +136,7 @@ def ssh():
     os.system("service ssh restart ")
     os.system("export LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | tr ':' '\n' | grep -v '/opt/conda/lib' | paste -sd ':') ")
     print('-----------SSH结束-------------')
-# ssh()
+ssh()
 clear_output()
 
 
@@ -328,21 +338,24 @@ def check_api1():
         time.sleep(5)  # 等待5秒后重试
 
 
-def frp():
+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'
+    # config_file_path = '/content/frp/frpc.ini'
     with open(config_file_path, 'w') as config_file:
-        config_file.write(config_data)
+        config_file.write(config_data1)
     # frpc 启动命令和参数
     frpc_cmd = ['/content/frp/frpc', '-c', config_file_path]
-    # subprocess.Popen(frpc_cmd)
+    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
-    subprocess.run('/content/frp/frpc -c /content/frp/frpc.ini', shell=True, check=True)
+    
 
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
@@ -390,5 +403,6 @@ threading.Thread(target=SillyTavern, daemon=True).start()
 check_api1()
 # threading.Thread(target=repeat_task, daemon=True).start #压缩备份
 print("开始衔接")
-frp()
+frp(config_data2,'/content/frp/frpc2.ini',True)
+frp(config_data,'/content/frp/frpc.ini',False)
 # sync()