Merge branch 'main' of https://github.com/Toperlock/sing-box-subscribe

README.md

@@ -19,7 +19,7 @@ https://xxxxxxx.vercel.app/config/https://xxxxxxsubscribe?token=123456&file=2
 python main.py
 ```
 
-或者你可以直接带template_index参数选定模板，0表示第一个模板
+或者你可以直接带template_index参数选定模板，0表示第一个模板(no flask不支持此参数)
 
 ```
 python main.py --template_index=0

api/app.py

@@ -1,10 +1,9 @@
-from flask import Flask, render_template, request, redirect, url_for, flash, send_file, jsonify, Response
-from urllib.parse import quote, urlparse, parse_qs, unquote
+from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, Response
+from urllib.parse import quote, urlparse, unquote
 import json
 import os
 import sys
 import subprocess
-import argparse  # 添加 argparse 模块
 import tempfile
 import shutil
 import tempfile  # 导入 tempfile 模块

instructions/README.md

@@ -165,7 +165,7 @@ pip install -r requirements.txt
 python main.py
 ```
 
-or you can directly select the template with the  `template_index`, `0` means the first template
+or you can directly select the template with the  `template_index`, `0` means the first template(no flask doesn't support)
 
 ```
 python main.py --template_index=0

main.py

@@ -1,4 +1,4 @@
-import json, os, tool, time, requests, sys, urllib, importlib, argparse, yaml, ruamel.yaml
+import json, os, tool, time, requests, sys, importlib, argparse, yaml, ruamel.yaml
 import re
 from datetime import datetime
 from urllib.parse import urlparse

parsers/http.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 def parse(data):
     info = data[:]

parsers/https.py

@@ -1,5 +1,5 @@
-import tool,json,re,urllib,sys
-from urllib.parse import urlparse, parse_qs, unquote
+import tool,re
+from urllib.parse import urlparse,unquote
 def parse(data):
     info = data[:]
     server_info = urlparse(info)

parsers/hysteria.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 
 def parse(data):

parsers/hysteria2.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 
 def parse(data):

parsers/socks.py

@@ -1,5 +1,5 @@
-import tool,json,re,urllib,sys
-from urllib.parse import urlparse, parse_qs, unquote
+import tool,re
+from urllib.parse import urlparse,unquote
 def parse(data):
     info = data[:]
     server_info = urlparse(info)

parsers/ss.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,json,re,urllib
 from urllib.parse import parse_qs
 def parse(data):
     param = data[5:]

parsers/ssr.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool
 def parse(data):
     info = data[6:]
     if not info or info.isspace():

parsers/trojan.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 def parse(data):
     info = data[:]

parsers/tuic.py

@@ -1,5 +1,5 @@
-import tool,json,re,urllib,sys
-from urllib.parse import urlparse, parse_qs, unquote
+import tool,re
+from urllib.parse import urlparse, parse_qs
 def parse(data):
     info = data[:]
     server_info = urlparse(info)

parsers/vless.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 def parse(data):
     info = data[:]

parsers/vmess.py

@@ -1,5 +1,5 @@
-import tool,json,re,urllib,sys
-from urllib.parse import urlparse, parse_qs, unquote
+import tool,json,re
+from urllib.parse import urlparse, parse_qs
 def parse(data):
     info = data[8:]
     if not info or info.isspace():

parsers/wg.py

@@ -1,4 +1,4 @@
-import tool,json,re,urllib,sys
+import tool,re
 from urllib.parse import urlparse, parse_qs, unquote
 def parse(data):
     info = data[:]

tool.py

@@ -1,5 +1,8 @@
-import urllib.parse,base64,requests,paramiko,random,string,re,chardet
-from paramiko import SSHClient
+import base64,requests,random,string,re,chardet
+import warnings
+from cryptography.utils import CryptographyDeprecationWarning
+with warnings.catch_warnings(action="ignore", category=CryptographyDeprecationWarning):
+    import paramiko
 from scp import SCPClient
 
 def get_encoding(file):
@@ -311,7 +314,7 @@ def __init__(self,server:dict) -> None:
             if k in server.keys():
                 self.server[k] = server[k]
     def connect(self):
-        ssh = SSHClient()
+        ssh = paramiko.SSHClient()
         ssh.load_system_host_keys()
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         ssh.connect(hostname=self.server['ip'],port=22, username=self.server['user'], password=self.server['password'])