Merge pull request FunctionClub#61 from bzd111/master

fix bugs

Pipfile

@@ -5,6 +5,7 @@ verify_ssl = true
 
 [dev-packages]
 yapf = "*"
+flake8 = "*"
 
 [packages]
 requests = ">=2.20.0"

Config_Generator.py → config_generator.py

@@ -1,14 +1,22 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
-import json
-import urllib2
 import commands
+import json
+
+import requests
+from requests.exceptions import ConnectTimeout
 
 
 def getip():
-    myip = urllib2.urlopen('https://cn.fdos.me/ip.php').read()
-    myip = myip.strip()
-    return str(myip)
+    try:
+        resp = requests.get("http://httpbin.org/ip", timeout=5).json()
+        ip = resp.get("origin").split(", ")[1]
+    except ConnectTimeout:
+        import socket
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            s.connect(("8.8.8.8", 80))
+            ip = s.getsockname()[0]
+    return str(ip)
 
 
 def open_port(port):

init.py

@@ -4,16 +4,18 @@
 import config_generator
 import uuid
 
-data = {}
 with open("/usr/local/V2ray.Fun/v2ray.config") as f:
-    data = json.load(f)
+    try:
+        data = json.load(f)
+    except ValueError:
+        data = {}
 
 data['uuid'] = str(uuid.uuid4())
 data['ip'] = config_generator.getip()
 config_generator.open_port(data['port'])
 
 with open("/usr/local/V2ray.Fun/v2ray.config", "w") as f:
-    f.write(json.dump(data))
+    json.dump(data, f)
 
 config_generator.gen_server()
 config_generator.gen_client()