Compare commits

...

2 Commits

Author SHA1 Message Date
Mr Chen 3ec02b8ead
Merge pull request #728 from midoks/dev 2 weeks ago
dami d25e4b3093 0.17.0升级0.18.0升级后,站点修复 2 weeks ago
  1. 6
      web/utils/site_reflect.py

@ -42,12 +42,12 @@ def getServerName(content):
return [] return []
def addDomain(site_id, site_name, domain): def addDomain(site_id, site_name, domain):
# print(site_id, site_name, domain)
d = domain.split(':') d = domain.split(':')
port = '80' port = '80'
name = d[0] name = d[0]
if len(d) == 2: if len(d) == 2:
port = d[1] port = d[1]
if thisdb.checkSitesDomainIsExist(name, port): if thisdb.checkSitesDomainIsExist(name, port):
print('您添加的域名[{}:{}],已使用。请仔细检查!'.format(name, port)) print('您添加的域名[{}:{}],已使用。请仔细检查!'.format(name, port))
return True return True
@ -82,8 +82,6 @@ def parseSite(d):
root_dir = getRootDir(content) root_dir = getRootDir(content)
sn_list = getServerName(content) sn_list = getServerName(content)
# print(domain,dconf)
# print(sn_list)
if thisdb.isSitesExist(domain): if thisdb.isSitesExist(domain):
print('您添加的站点[%s]已存在!' % domain) print('您添加的站点[%s]已存在!' % domain)
else: else:
@ -92,4 +90,4 @@ def parseSite(d):
site_id = info['id'] site_id = info['id']
for sn in sn_list: for sn in sn_list:
addDomain(site_id, d, domain) addDomain(site_id, d, sn)

Loading…
Cancel
Save