diff --git a/.gitignore b/.gitignore index 705c9dbd3..1c375c27e 100644 --- a/.gitignore +++ b/.gitignore @@ -107,10 +107,11 @@ venv.bak/ .idea/*.iml tmp/*.pl tmp/*.log -data/json/index.json *.swp *.zip -data/*.db -data/control.conf scripts/init.d/mw logs/* +data/*.db +data/control.conf +data/iplist.txt +data/json/index.json diff --git a/class/core/public.py b/class/core/public.py index 80b320323..7830d1356 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -368,13 +368,7 @@ def getLocalIp(): ipaddress = re.search('\d+.\d+.\d+.\d+', ipaddress).group(0) return ipaddress except: - pass - # try: - # url = web.ctx.session.home + '/Api/getIpAddress' - # opener = urllib2.urlopen(url) - # return opener.read() - # except: - # return web.ctx.host.split(':')[0] + return '127.0.0.1' def inArray(arrays, searchStr): diff --git a/route/dashboard.py b/route/dashboard.py index bea0fbc9e..749f2a4a8 100644 --- a/route/dashboard.py +++ b/route/dashboard.py @@ -36,8 +36,9 @@ def login_required(func): def test(): os = public.getOs() print os + print(sys.platform) - return os + return public.getLocalIp() @dashboard.route("/")