Merge pull request #682 from midoks/dev

反向代理优化

plugins/alist/init.d/alist.tpl

@@ -23,7 +23,7 @@ app_start(){
 
 app_stop(){
 	echo "dztasks stopped"
-	ps -ef| grep alist | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill
+	ps -ef| grep alist | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill -9
 }
 
 

web/utils/site.py

@@ -1489,13 +1489,14 @@ class sites(object):
             return mw.returnData(False, "错误的目标地址!")
 
         # get host from url
-        try:
-            if host == "$host":
-                host_tmp = urlparse(to)
-                host = host_tmp.netloc
+        # try:
+        #     if host == "$host":
+        #         host_tmp = urlparse(to)
+        #         host = host_tmp.netloc
 
-        except Exception as e:
-            return mw.returnData(False, "错误的目标地址")
+        # except Exception as e:
+        #     return mw.returnData(False, "错误的目标地址")
+        # print(host)
 
         proxy_site_path = self.getProxyDataPath(site_name)
         data_content = mw.readFile(proxy_site_path) if os.path.exists(proxy_site_path) else ""