pull/109/head
midoks 7 years ago
parent 7db76547ff
commit 1650ae5e18
  1. 7
      .gitignore
  2. 8
      class/core/public.py
  3. 3
      route/dashboard.py

7
.gitignore vendored

@ -107,10 +107,11 @@ venv.bak/
.idea/*.iml .idea/*.iml
tmp/*.pl tmp/*.pl
tmp/*.log tmp/*.log
data/json/index.json
*.swp *.swp
*.zip *.zip
data/*.db
data/control.conf
scripts/init.d/mw scripts/init.d/mw
logs/* logs/*
data/*.db
data/control.conf
data/iplist.txt
data/json/index.json

@ -368,13 +368,7 @@ def getLocalIp():
ipaddress = re.search('\d+.\d+.\d+.\d+', ipaddress).group(0) ipaddress = re.search('\d+.\d+.\d+.\d+', ipaddress).group(0)
return ipaddress return ipaddress
except: except:
pass return '127.0.0.1'
# try:
# url = web.ctx.session.home + '/Api/getIpAddress'
# opener = urllib2.urlopen(url)
# return opener.read()
# except:
# return web.ctx.host.split(':')[0]
def inArray(arrays, searchStr): def inArray(arrays, searchStr):

@ -36,8 +36,9 @@ def login_required(func):
def test(): def test():
os = public.getOs() os = public.getOs()
print os print os
print(sys.platform) print(sys.platform)
return os return public.getLocalIp()
@dashboard.route("/") @dashboard.route("/")

Loading…
Cancel
Save