update

class/core/public.py

@@ -313,39 +313,90 @@ def writeFile(filename, str):
         return False
 
 
-def httpGet(url, timeout=30):
+def HttpGet(url, timeout=10):
-    # 发送GET请求
+    """
-    try:
+    发送GET请求
-        import urllib2
+    @url 被请求的URL地址(必需)
-        import ssl
+    @timeout 超时时间默认60秒
+    return string
+    """
+    if sys.version_info[0] == 2:
         try:
-            ssl._create_default_https_context = ssl._create_unverified_context
+            import urllib2
-        except:
+            import ssl
-            pass
+            if sys.version_info[0] == 2:
-        response = urllib2.urlopen(url, timeout=timeout)
+                reload(urllib2)
-        return response.read()
+                reload(ssl)
-    except Exception, ex:
+            try:
-        # writeLog('网络诊断', str(ex) + '[' + url + ']')
+                ssl._create_default_https_context = ssl._create_unverified_context
-        return str(ex)
+            except:
-
+                pass
-
+            response = urllib2.urlopen(url, timeout=timeout)
-def httpPost(url, data, timeout=30):
+            return response.read()
-    # 发送POST请求
+        except Exception as ex:
-    try:
+            return str(ex)
-        import urllib
+    else:
-        import urllib2
+        try:
-        import ssl
+            import urllib.request
+            import ssl
+            try:
+                ssl._create_default_https_context = ssl._create_unverified_context
+            except:
+                pass
+            response = urllib.request.urlopen(url, timeout=timeout)
+            result = response.read()
+            if type(result) == bytes:
+                result = result.decode('utf-8')
+            return result
+        except Exception as ex:
+            return str(ex)
+
+
+def httpGet(url, timeout=10):
+    return HttpGet(url, timeout)
+
+
+def HttpPost(url, data, timeout=10):
+    """
+    发送POST请求
+    @url 被请求的URL地址(必需)
+    @data POST参数，可以是字符串或字典(必需)
+    @timeout 超时时间默认60秒
+    return string
+    """
+    if sys.version_info[0] == 2:
         try:
+            import urllib
+            import urllib2
+            import ssl
             ssl._create_default_https_context = ssl._create_unverified_context
-        except:
+            data = urllib.urlencode(data)
-            pass
+            req = urllib2.Request(url, data)
-        data = urllib.urlencode(data)
+            response = urllib2.urlopen(req, timeout=timeout)
-        req = urllib2.Request(url, data)
+            return response.read()
-        response = urllib2.urlopen(req, timeout=timeout)
+        except Exception as ex:
-        return response.read()
+            return str(ex)
-    except Exception, ex:
+    else:
-        # WriteLog('网络诊断',str(ex) + '['+url+']');
+        try:
-        return str(ex)
+            import urllib.request
+            import ssl
+            try:
+                ssl._create_default_https_context = ssl._create_unverified_context
+            except:
+                pass
+            data = urllib.parse.urlencode(data).encode('utf-8')
+            req = urllib.request.Request(url, data)
+            response = urllib.request.urlopen(req, timeout=timeout)
+            result = response.read()
+            if type(result) == bytes:
+                result = result.decode('utf-8')
+            return result
+        except Exception as ex:
+            return str(ex)
+
+
+def httpPost(url, data, timeout=10):
+    return HttpPost(url, data, timeout)
 
 
 def writeSpeed(title, used, total, speed=0):

plugins/php/versions/phplib.conf

@@ -291,7 +291,6 @@
             "53",
             "54",
             "55",
-            "56",
             "70",
             "71"
         ],
@@ -401,7 +400,6 @@
             "53",
             "54",
             "55",
-            "56",
             "70",
             "71"
         ],
@@ -417,7 +415,6 @@
             "53",
             "54",
             "55",
-            "56",
             "70",
             "71"
         ],

route/__init__.py

@@ -93,6 +93,7 @@ def publicObject(toObject, func, action=None, get=None):
 
 @app.route("/test")
 def test():
+    print sys.version_info
     print session
     os = public.getOs()
     print os