diff --git a/plugins/acme_pandominassl_apply/hooks/goedge.py b/plugins/acme_pandominassl_apply/hooks/goedge.py index e69de29bb..3c0358d9d 100644 --- a/plugins/acme_pandominassl_apply/hooks/goedge.py +++ b/plugins/acme_pandominassl_apply/hooks/goedge.py @@ -0,0 +1 @@ +# coding:utf-8 \ No newline at end of file diff --git a/plugins/acme_pandominassl_apply/hooks/init.py b/plugins/acme_pandominassl_apply/hooks/init.py index e69de29bb..3c0358d9d 100644 --- a/plugins/acme_pandominassl_apply/hooks/init.py +++ b/plugins/acme_pandominassl_apply/hooks/init.py @@ -0,0 +1 @@ +# coding:utf-8 \ No newline at end of file diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py index 79e290e78..bcd77bf2f 100755 --- a/plugins/acme_pandominassl_apply/index.py +++ b/plugins/acme_pandominassl_apply/index.py @@ -438,6 +438,7 @@ def domainList(): search = args['search'] conn = pSqliteDb('domain') + conn_dnsapi = pSqliteDb('dnsapi') limit = str((page - 1) * page_size) + ',' + str(page_size) condition = '' if not search == '': @@ -446,6 +447,14 @@ def domainList(): clist = conn.where(condition, ()).field( field).limit(limit).order('id desc').select() + for i in range(len(clist)): + tdata = conn_dnsapi.field('id,name').where('id=?',(clist[i]['dnsapi_id'],)).select() + if len(tdata) > 0: + # print(tdata[0]['name']) + clist[i]['dnsapi_id_alias'] = clist[i]['dnsapi_id']+'('+ tdata[0]['name'] +')' + else: + clist[i]['dnsapi_id_alias'] = clist[i]['dnsapi_id']+' (无)' + count = conn.where(condition, ()).count() _page = {} _page['count'] = count diff --git a/plugins/acme_pandominassl_apply/js/common.js b/plugins/acme_pandominassl_apply/js/common.js index 4d4bb1900..eeebdf949 100755 --- a/plugins/acme_pandominassl_apply/js/common.js +++ b/plugins/acme_pandominassl_apply/js/common.js @@ -594,7 +594,7 @@ function domainList(page, search){ list += ''; list +=''; list += '' + rdata.data[i]['domain'] +''; - list += '' + rdata.data[i]['dnsapi_id'] +''; + list += '' + rdata.data[i]['dnsapi_id_alias'] +''; list += '' + rdata.data[i]['email'] +''; list += '' + rdata.data[i]['remark'] +''; list += '';