update

plugins/acme_pandominassl_apply/index.html

@@ -26,7 +26,7 @@
 	</div>
 </div>
 <script type="text/javascript">
-resetPluginWinWidth(900);
+resetPluginWinWidth(1000);
 resetPluginWinHeight(550);
 $.getScript( "/plugins/file?name=acme_pandominassl_apply&f=js/common.js", function(){
 	pluginService('acme_pandominassl_apply', $('.plugin_version').attr('version'));

plugins/acme_pandominassl_apply/index.py

@@ -732,34 +732,6 @@ def runSyncCfCmd():
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data'
     return mw.returnJson(True, 'ok',cmd)
 
-
-def getDnsPodToken():
-    DPI_Id = row['kv']['DPI_Id']
-    DPI_Key = row['kv']['DPI_Key']
-    data = {
-        'user_token': DPI_Id+','+DPI_Key,
-        'format':'json',
-    }
-    url = "https://api.dnspod.com/Domain.List"
-    try:
-        r = requests.post(url, timeout=30, data=data)
-        r.raise_for_status()
-        r.encoding = r.apparent_encoding
-
-        jdata = json.loads(r.text)
-        # result = jdata['result']
-        # result_info = jdata['result_info']
-
-        print(jdata)
-        # for i in result:
-            # autoSyncDomain(i['name'], row['id'], cf_mail)
-
-        # if result_info['total_pages'] > page:
-        #     page += 1
-        #     runSyncDnspodDataRow(row, page)
-    except Exception as e:
-        print(e)
-
 def runSyncDnspodDataRow(row, page = 1):
     # print(row, page)
 
@@ -786,7 +758,7 @@ def runSyncDnspodDataRow(row, page = 1):
             autoSyncDomain(i['name'], row['id'], i['owner'])
 
         page_total = int(info['domain_total']/data['length'])
-        if rpage_total > page:
+        if page_total > page:
             page += 1
             runSyncDnspodDataRow(row, page)
     except Exception as e:
@@ -808,6 +780,11 @@ def runSyncDnsPodData():
     print("同步DnsPod数据结束")
     return ''
 
+def runSyncDnsPodCmd():
+    cmd = "cd "+mw.getRunDir()+" "
+    cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data'
+    return mw.returnJson(True, 'ok',cmd)
+
 if __name__ == "__main__":
     func = sys.argv[1]
     # print(func)
@@ -867,5 +844,7 @@ if __name__ == "__main__":
         print(runSyncCfCmd())
     elif func == 'run_sync_dnspod_data':
         print(runSyncDnsPodData())
+    elif func == 'run_sync_dnspod_cmd':
+        print(runSyncDnsPodCmd())
     else:
         print('error')

plugins/acme_pandominassl_apply/js/common.js

@@ -563,7 +563,32 @@ function syncCfCmd(){
     apaPost('run_sync_cf_cmd', {}, function(data){
         var rdata = $.parseJSON(data.data);
         layer.open({
-            title: "手动同步CloudFlare域名全部命令",
+            title: "手动同步CloudFlare全部域名命令",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+function syncDnsPodCmd(){
+    apaPost('run_sync_dnspod_cmd', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动同步DnsPod全部域名命令",
             area: ['600px', '180px'],
             type:1,
             closeBtn: 1,
@@ -720,6 +745,7 @@ function domainList(page, search){
             <button onclick="domainAdd()" title="添加顶级域名" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加域名</button>\
             <button onclick="domainHookCmd()" title="全部同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">全部同步命令</button>\
             <button onclick="syncCfCmd()" title="cloudflare同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">cloudflare同步命令</button>\
+            <button onclick="syncDnsPodCmd()" title="DnsPod国际同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">DnsPod国际同步命令</button>\
             <div class="divtable mtb10">\
                 <div class="tablescroll">\
                     <table id="DataBody" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\