From 9537294d7910a3b5c0c4a76c88a18b28cb8325fa Mon Sep 17 00:00:00 2001 From: wisdomwei201804 Date: Sat, 21 Apr 2018 18:29:20 +0800 Subject: [PATCH] =?UTF-8?q?v3.8.0.0=20=201=E3=80=81=E5=A2=9E=E5=8A=A0TTL?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E3=80=822=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81BUG=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Properties/AssemblyInfo.cs | 4 +- .../net.nutcore.aliddns/main.Designer.cs | 278 ++++++++++++------ .../net.nutcore.aliddns/main.cs | 17 +- .../net.nutcore.aliddns/updateinfo.txt | 3 + 4 files changed, 205 insertions(+), 97 deletions(-) diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs index 9e71c14..106339d 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.7.1.7")] -[assembly: AssemblyFileVersion("3.7.1.7")] +[assembly: AssemblyVersion("3.8.0.0")] +[assembly: AssemblyFileVersion("3.8.0.0")] diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs b/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs index 6586866..c256515 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/main.Designer.cs @@ -78,6 +78,10 @@ this.comboBox_whatIsUrl = new System.Windows.Forms.ComboBox(); this.button_whatIsTest = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); + this.textBox_TTL = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label_TTL = new System.Windows.Forms.Label(); this.timeSetGroup.SuspendLayout(); this.debugMessage.SuspendLayout(); this.globalSetGroup.SuspendLayout(); @@ -95,9 +99,11 @@ this.timeSetGroup.Controls.Add(this.label3); this.timeSetGroup.Controls.Add(this.label_nextUpdateSeconds); this.timeSetGroup.Controls.Add(this.updateNow); - this.timeSetGroup.Location = new System.Drawing.Point(12, 185); + this.timeSetGroup.Location = new System.Drawing.Point(18, 278); + this.timeSetGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.timeSetGroup.Name = "timeSetGroup"; - this.timeSetGroup.Size = new System.Drawing.Size(201, 123); + this.timeSetGroup.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.timeSetGroup.Size = new System.Drawing.Size(302, 217); this.timeSetGroup.TabIndex = 4; this.timeSetGroup.TabStop = false; this.timeSetGroup.Text = "其它设置"; @@ -105,9 +111,10 @@ // checkBox_logAutoSave // this.checkBox_logAutoSave.AutoSize = true; - this.checkBox_logAutoSave.Location = new System.Drawing.Point(8, 45); + this.checkBox_logAutoSave.Location = new System.Drawing.Point(13, 106); + this.checkBox_logAutoSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBox_logAutoSave.Name = "checkBox_logAutoSave"; - this.checkBox_logAutoSave.Size = new System.Drawing.Size(96, 16); + this.checkBox_logAutoSave.Size = new System.Drawing.Size(142, 22); this.checkBox_logAutoSave.TabIndex = 8; this.checkBox_logAutoSave.Text = "日志自动转储"; this.checkBox_logAutoSave.UseVisualStyleBackColor = true; @@ -116,9 +123,10 @@ // checkBox_minimized // this.checkBox_minimized.AutoSize = true; - this.checkBox_minimized.Location = new System.Drawing.Point(98, 21); + this.checkBox_minimized.Location = new System.Drawing.Point(13, 66); + this.checkBox_minimized.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBox_minimized.Name = "checkBox_minimized"; - this.checkBox_minimized.Size = new System.Drawing.Size(96, 16); + this.checkBox_minimized.Size = new System.Drawing.Size(142, 22); this.checkBox_minimized.TabIndex = 7; this.checkBox_minimized.Text = "启动时最小化"; this.checkBox_minimized.UseVisualStyleBackColor = true; @@ -129,9 +137,10 @@ this.checkBox_autoUpdate.AutoSize = true; this.checkBox_autoUpdate.Checked = true; this.checkBox_autoUpdate.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox_autoUpdate.Location = new System.Drawing.Point(8, 71); + this.checkBox_autoUpdate.Location = new System.Drawing.Point(13, 146); + this.checkBox_autoUpdate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBox_autoUpdate.Name = "checkBox_autoUpdate"; - this.checkBox_autoUpdate.Size = new System.Drawing.Size(72, 16); + this.checkBox_autoUpdate.Size = new System.Drawing.Size(106, 22); this.checkBox_autoUpdate.TabIndex = 6; this.checkBox_autoUpdate.Text = "自动更新"; this.checkBox_autoUpdate.UseVisualStyleBackColor = true; @@ -140,9 +149,10 @@ // checkBox_autoBoot // this.checkBox_autoBoot.AutoSize = true; - this.checkBox_autoBoot.Location = new System.Drawing.Point(8, 21); + this.checkBox_autoBoot.Location = new System.Drawing.Point(13, 29); + this.checkBox_autoBoot.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkBox_autoBoot.Name = "checkBox_autoBoot"; - this.checkBox_autoBoot.Size = new System.Drawing.Size(84, 16); + this.checkBox_autoBoot.Size = new System.Drawing.Size(124, 22); this.checkBox_autoBoot.TabIndex = 5; this.checkBox_autoBoot.Text = "随系统启动"; this.checkBox_autoBoot.UseVisualStyleBackColor = true; @@ -151,9 +161,10 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(117, 72); + this.label3.Location = new System.Drawing.Point(176, 148); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(77, 12); + this.label3.Size = new System.Drawing.Size(116, 18); this.label3.TabIndex = 4; this.label3.Text = "秒后更新记录"; // @@ -161,17 +172,19 @@ // this.label_nextUpdateSeconds.AutoSize = true; this.label_nextUpdateSeconds.ForeColor = System.Drawing.Color.Red; - this.label_nextUpdateSeconds.Location = new System.Drawing.Point(97, 72); + this.label_nextUpdateSeconds.Location = new System.Drawing.Point(146, 148); + this.label_nextUpdateSeconds.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_nextUpdateSeconds.Name = "label_nextUpdateSeconds"; - this.label_nextUpdateSeconds.Size = new System.Drawing.Size(17, 12); + this.label_nextUpdateSeconds.Size = new System.Drawing.Size(26, 18); this.label_nextUpdateSeconds.TabIndex = 3; this.label_nextUpdateSeconds.Text = "60"; // // updateNow // - this.updateNow.Location = new System.Drawing.Point(6, 94); + this.updateNow.Location = new System.Drawing.Point(9, 175); + this.updateNow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.updateNow.Name = "updateNow"; - this.updateNow.Size = new System.Drawing.Size(185, 23); + this.updateNow.Size = new System.Drawing.Size(278, 34); this.updateNow.TabIndex = 2; this.updateNow.Text = "立即更新"; this.updateNow.UseVisualStyleBackColor = true; @@ -179,6 +192,8 @@ // // debugMessage // + this.debugMessage.Controls.Add(this.label_TTL); + this.debugMessage.Controls.Add(this.label15); this.debugMessage.Controls.Add(this.recordId); this.debugMessage.Controls.Add(this.globalValue); this.debugMessage.Controls.Add(this.globalDomainType); @@ -187,86 +202,98 @@ this.debugMessage.Controls.Add(this.globalRR); this.debugMessage.Controls.Add(this.label10); this.debugMessage.Controls.Add(this.label9); - this.debugMessage.Location = new System.Drawing.Point(219, 47); + this.debugMessage.Location = new System.Drawing.Point(328, 70); + this.debugMessage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.debugMessage.Name = "debugMessage"; - this.debugMessage.Size = new System.Drawing.Size(206, 79); + this.debugMessage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.debugMessage.Size = new System.Drawing.Size(309, 118); this.debugMessage.TabIndex = 5; this.debugMessage.TabStop = false; this.debugMessage.Text = "调试信息"; // // recordId // - this.recordId.Location = new System.Drawing.Point(68, 18); + this.recordId.Location = new System.Drawing.Point(102, 27); + this.recordId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.recordId.Name = "recordId"; - this.recordId.Size = new System.Drawing.Size(116, 21); + this.recordId.Size = new System.Drawing.Size(172, 28); this.recordId.TabIndex = 8; this.recordId.Text = ""; // // globalValue // this.globalValue.AutoSize = true; - this.globalValue.Location = new System.Drawing.Point(47, 60); + this.globalValue.Location = new System.Drawing.Point(70, 90); + this.globalValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.globalValue.Name = "globalValue"; - this.globalValue.Size = new System.Drawing.Size(41, 12); + this.globalValue.Size = new System.Drawing.Size(62, 18); this.globalValue.TabIndex = 7; this.globalValue.Text = ""; // // globalDomainType // this.globalDomainType.AutoSize = true; - this.globalDomainType.Location = new System.Drawing.Point(110, 42); + this.globalDomainType.Location = new System.Drawing.Point(150, 63); + this.globalDomainType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.globalDomainType.Name = "globalDomainType"; - this.globalDomainType.Size = new System.Drawing.Size(41, 12); + this.globalDomainType.Size = new System.Drawing.Size(62, 18); this.globalDomainType.TabIndex = 6; this.globalDomainType.Text = ""; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(8, 59); + this.label12.Location = new System.Drawing.Point(12, 88); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(41, 12); + this.label12.Size = new System.Drawing.Size(62, 18); this.label12.TabIndex = 5; this.label12.Text = "Value:"; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(77, 41); + this.label11.Location = new System.Drawing.Point(101, 62); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(35, 12); + this.label11.Size = new System.Drawing.Size(53, 18); this.label11.TabIndex = 4; this.label11.Text = "Type:"; // // globalRR // this.globalRR.AutoSize = true; - this.globalRR.Location = new System.Drawing.Point(28, 41); + this.globalRR.Location = new System.Drawing.Point(42, 62); + this.globalRR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.globalRR.Name = "globalRR"; - this.globalRR.Size = new System.Drawing.Size(41, 12); + this.globalRR.Size = new System.Drawing.Size(62, 18); this.globalRR.TabIndex = 3; this.globalRR.Text = ""; // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(7, 41); + this.label10.Location = new System.Drawing.Point(10, 62); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(23, 12); + this.label10.Size = new System.Drawing.Size(35, 18); this.label10.TabIndex = 2; this.label10.Text = "RR:"; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(7, 21); + this.label9.Location = new System.Drawing.Point(10, 32); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(53, 12); + this.label9.Size = new System.Drawing.Size(80, 18); this.label9.TabIndex = 0; this.label9.Text = "RecordId"; // // globalSetGroup // + this.globalSetGroup.Controls.Add(this.label13); + this.globalSetGroup.Controls.Add(this.textBox_TTL); this.globalSetGroup.Controls.Add(this.button_ShowHide); this.globalSetGroup.Controls.Add(this.checkAndSaveConfig); this.globalSetGroup.Controls.Add(this.label8); @@ -278,18 +305,21 @@ this.globalSetGroup.Controls.Add(this.label5); this.globalSetGroup.Controls.Add(this.accessKeyId); this.globalSetGroup.Controls.Add(this.label4); - this.globalSetGroup.Location = new System.Drawing.Point(219, 132); + this.globalSetGroup.Location = new System.Drawing.Point(328, 198); + this.globalSetGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.globalSetGroup.Name = "globalSetGroup"; - this.globalSetGroup.Size = new System.Drawing.Size(206, 176); + this.globalSetGroup.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.globalSetGroup.Size = new System.Drawing.Size(309, 297); this.globalSetGroup.TabIndex = 6; this.globalSetGroup.TabStop = false; this.globalSetGroup.Text = "设置"; // // button_ShowHide // - this.button_ShowHide.Location = new System.Drawing.Point(106, 147); + this.button_ShowHide.Location = new System.Drawing.Point(159, 254); + this.button_ShowHide.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button_ShowHide.Name = "button_ShowHide"; - this.button_ShowHide.Size = new System.Drawing.Size(91, 23); + this.button_ShowHide.Size = new System.Drawing.Size(136, 34); this.button_ShowHide.TabIndex = 14; this.button_ShowHide.Text = "显示录入"; this.button_ShowHide.UseVisualStyleBackColor = true; @@ -297,9 +327,10 @@ // // checkAndSaveConfig // - this.checkAndSaveConfig.Location = new System.Drawing.Point(8, 147); + this.checkAndSaveConfig.Location = new System.Drawing.Point(12, 254); + this.checkAndSaveConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkAndSaveConfig.Name = "checkAndSaveConfig"; - this.checkAndSaveConfig.Size = new System.Drawing.Size(93, 23); + this.checkAndSaveConfig.Size = new System.Drawing.Size(140, 34); this.checkAndSaveConfig.TabIndex = 10; this.checkAndSaveConfig.Text = "测试并保存"; this.checkAndSaveConfig.UseVisualStyleBackColor = true; @@ -308,80 +339,89 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(107, 125); + this.label8.Location = new System.Drawing.Point(160, 228); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(65, 12); + this.label8.Size = new System.Drawing.Size(98, 18); this.label8.TabIndex = 8; this.label8.Text = "秒更新一次"; // // newSeconds // - this.newSeconds.Location = new System.Drawing.Point(41, 122); + this.newSeconds.Location = new System.Drawing.Point(62, 223); + this.newSeconds.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.newSeconds.Name = "newSeconds"; - this.newSeconds.Size = new System.Drawing.Size(60, 21); + this.newSeconds.Size = new System.Drawing.Size(88, 28); this.newSeconds.TabIndex = 7; this.newSeconds.Text = "60"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 125); + this.label7.Location = new System.Drawing.Point(9, 228); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(29, 12); + this.label7.Size = new System.Drawing.Size(44, 18); this.label7.TabIndex = 6; this.label7.Text = "每隔"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 98); + this.label6.Location = new System.Drawing.Point(9, 147); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(53, 12); + this.label6.Size = new System.Drawing.Size(80, 18); this.label6.TabIndex = 5; this.label6.Text = "完整域名"; // // fullDomainName // - this.fullDomainName.Location = new System.Drawing.Point(65, 95); + this.fullDomainName.Location = new System.Drawing.Point(98, 142); + this.fullDomainName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.fullDomainName.Name = "fullDomainName"; - this.fullDomainName.Size = new System.Drawing.Size(135, 21); + this.fullDomainName.Size = new System.Drawing.Size(200, 28); this.fullDomainName.TabIndex = 4; this.fullDomainName.Text = "www.xxx.com"; this.fullDomainName.ModifiedChanged += new System.EventHandler(this.fullDomainName_ModifiedChanged); // // accessKeySecret // - this.accessKeySecret.Location = new System.Drawing.Point(8, 68); + this.accessKeySecret.Location = new System.Drawing.Point(12, 102); + this.accessKeySecret.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.accessKeySecret.Name = "accessKeySecret"; this.accessKeySecret.PasswordChar = '*'; - this.accessKeySecret.Size = new System.Drawing.Size(192, 21); + this.accessKeySecret.Size = new System.Drawing.Size(286, 28); this.accessKeySecret.TabIndex = 3; this.accessKeySecret.Text = "null"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 53); + this.label5.Location = new System.Drawing.Point(9, 80); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(95, 12); + this.label5.Size = new System.Drawing.Size(143, 18); this.label5.TabIndex = 2; this.label5.Text = "accessKeySecret"; // // accessKeyId // - this.accessKeyId.Location = new System.Drawing.Point(8, 29); + this.accessKeyId.Location = new System.Drawing.Point(12, 44); + this.accessKeyId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.accessKeyId.Name = "accessKeyId"; this.accessKeyId.PasswordChar = '*'; - this.accessKeyId.Size = new System.Drawing.Size(192, 21); + this.accessKeyId.Size = new System.Drawing.Size(286, 28); this.accessKeyId.TabIndex = 1; this.accessKeyId.Text = "null"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(6, 14); + this.label4.Location = new System.Drawing.Point(9, 21); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(71, 12); + this.label4.Size = new System.Drawing.Size(107, 18); this.label4.TabIndex = 0; this.label4.Text = "accessKeyId"; // @@ -406,30 +446,31 @@ this.toolStripMenuItem_Exit, this.ToolStripMenuItem_About}); this.contextMenuStrip_sysTrayMenu.Name = "contextMenuStrip1"; - this.contextMenuStrip_sysTrayMenu.Size = new System.Drawing.Size(101, 48); + this.contextMenuStrip_sysTrayMenu.Size = new System.Drawing.Size(117, 60); // // toolStripMenuItem_Exit // this.toolStripMenuItem_Exit.Name = "toolStripMenuItem_Exit"; - this.toolStripMenuItem_Exit.Size = new System.Drawing.Size(100, 22); + this.toolStripMenuItem_Exit.Size = new System.Drawing.Size(116, 28); this.toolStripMenuItem_Exit.Text = "退出"; this.toolStripMenuItem_Exit.Click += new System.EventHandler(this.toolStripMenuItem1_Click); // // ToolStripMenuItem_About // this.ToolStripMenuItem_About.Name = "ToolStripMenuItem_About"; - this.ToolStripMenuItem_About.Size = new System.Drawing.Size(100, 22); + this.ToolStripMenuItem_About.Size = new System.Drawing.Size(116, 28); this.ToolStripMenuItem_About.Text = "关于"; this.ToolStripMenuItem_About.Click += new System.EventHandler(this.ToolStripMenuItem_About_Click); // // textBox_log // - this.textBox_log.Location = new System.Drawing.Point(12, 314); + this.textBox_log.Location = new System.Drawing.Point(18, 503); + this.textBox_log.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox_log.Multiline = true; this.textBox_log.Name = "textBox_log"; this.textBox_log.ReadOnly = true; this.textBox_log.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textBox_log.Size = new System.Drawing.Size(413, 109); + this.textBox_log.Size = new System.Drawing.Size(618, 162); this.textBox_log.TabIndex = 8; // // groupBox_netstate @@ -440,9 +481,11 @@ this.groupBox_netstate.Controls.Add(this.label2); this.groupBox_netstate.Controls.Add(this.localIP); this.groupBox_netstate.Controls.Add(this.label1); - this.groupBox_netstate.Location = new System.Drawing.Point(12, 3); + this.groupBox_netstate.Location = new System.Drawing.Point(18, 4); + this.groupBox_netstate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox_netstate.Name = "groupBox_netstate"; - this.groupBox_netstate.Size = new System.Drawing.Size(413, 38); + this.groupBox_netstate.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox_netstate.Size = new System.Drawing.Size(620, 57); this.groupBox_netstate.TabIndex = 9; this.groupBox_netstate.TabStop = false; this.groupBox_netstate.Text = "网络状态"; @@ -451,9 +494,10 @@ // this.label_DomainIpStatus.AutoSize = true; this.label_DomainIpStatus.ForeColor = System.Drawing.Color.Red; - this.label_DomainIpStatus.Location = new System.Drawing.Point(364, 19); + this.label_DomainIpStatus.Location = new System.Drawing.Point(546, 28); + this.label_DomainIpStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_DomainIpStatus.Name = "label_DomainIpStatus"; - this.label_DomainIpStatus.Size = new System.Drawing.Size(41, 12); + this.label_DomainIpStatus.Size = new System.Drawing.Size(62, 18); this.label_DomainIpStatus.TabIndex = 9; this.label_DomainIpStatus.Text = "未绑定"; // @@ -461,45 +505,50 @@ // this.label_localIpStatus.AutoSize = true; this.label_localIpStatus.ForeColor = System.Drawing.Color.Red; - this.label_localIpStatus.Location = new System.Drawing.Point(156, 19); + this.label_localIpStatus.Location = new System.Drawing.Point(234, 28); + this.label_localIpStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label_localIpStatus.Name = "label_localIpStatus"; - this.label_localIpStatus.Size = new System.Drawing.Size(41, 12); + this.label_localIpStatus.Size = new System.Drawing.Size(62, 18); this.label_localIpStatus.TabIndex = 8; this.label_localIpStatus.Text = "未连接"; // // domainIP // this.domainIP.AutoSize = true; - this.domainIP.Location = new System.Drawing.Point(259, 19); + this.domainIP.Location = new System.Drawing.Point(388, 28); + this.domainIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.domainIP.Name = "domainIP"; - this.domainIP.Size = new System.Drawing.Size(47, 12); + this.domainIP.Size = new System.Drawing.Size(71, 18); this.domainIP.TabIndex = 7; this.domainIP.Text = "0.0.0.0"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(213, 19); + this.label2.Location = new System.Drawing.Point(320, 28); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 12); + this.label2.Size = new System.Drawing.Size(71, 18); this.label2.TabIndex = 6; this.label2.Text = "域名IP:"; // // localIP // this.localIP.AutoSize = true; - this.localIP.Location = new System.Drawing.Point(57, 19); + this.localIP.Location = new System.Drawing.Point(86, 28); + this.localIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.localIP.Name = "localIP"; - this.localIP.Size = new System.Drawing.Size(47, 12); + this.localIP.Size = new System.Drawing.Size(71, 18); this.localIP.TabIndex = 5; this.localIP.Text = "0.0.0.0"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(5, 19); + this.label1.Location = new System.Drawing.Point(8, 28); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.Size = new System.Drawing.Size(80, 18); this.label1.TabIndex = 4; this.label1.Text = "WAN口IP:"; // @@ -510,27 +559,31 @@ this.groupBox_setWanIp.Controls.Add(this.comboBox_whatIsUrl); this.groupBox_setWanIp.Controls.Add(this.button_whatIsTest); this.groupBox_setWanIp.Controls.Add(this.label14); - this.groupBox_setWanIp.Location = new System.Drawing.Point(12, 47); + this.groupBox_setWanIp.Location = new System.Drawing.Point(18, 70); + this.groupBox_setWanIp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox_setWanIp.Name = "groupBox_setWanIp"; - this.groupBox_setWanIp.Size = new System.Drawing.Size(201, 135); + this.groupBox_setWanIp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox_setWanIp.Size = new System.Drawing.Size(302, 202); this.groupBox_setWanIp.TabIndex = 10; this.groupBox_setWanIp.TabStop = false; this.groupBox_setWanIp.Text = "WAN口IP设置"; // // maskedTextBox_setIP // - this.maskedTextBox_setIP.Location = new System.Drawing.Point(7, 100); + this.maskedTextBox_setIP.Location = new System.Drawing.Point(10, 150); + this.maskedTextBox_setIP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.maskedTextBox_setIP.Mask = "000.000.000.000"; this.maskedTextBox_setIP.Name = "maskedTextBox_setIP"; this.maskedTextBox_setIP.PromptChar = ' '; - this.maskedTextBox_setIP.Size = new System.Drawing.Size(106, 21); + this.maskedTextBox_setIP.Size = new System.Drawing.Size(157, 28); this.maskedTextBox_setIP.TabIndex = 20; // // button_setIP // - this.button_setIP.Location = new System.Drawing.Point(119, 99); + this.button_setIP.Location = new System.Drawing.Point(178, 148); + this.button_setIP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button_setIP.Name = "button_setIP"; - this.button_setIP.Size = new System.Drawing.Size(76, 23); + this.button_setIP.Size = new System.Drawing.Size(114, 34); this.button_setIP.TabIndex = 19; this.button_setIP.Text = "手工指定IP"; this.button_setIP.UseVisualStyleBackColor = true; @@ -542,17 +595,19 @@ this.comboBox_whatIsUrl.Items.AddRange(new object[] { "http://whatismyip.akamai.com/", "http://www.net.cn/static/customercare/yourip.asp"}); - this.comboBox_whatIsUrl.Location = new System.Drawing.Point(6, 41); + this.comboBox_whatIsUrl.Location = new System.Drawing.Point(9, 62); + this.comboBox_whatIsUrl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox_whatIsUrl.Name = "comboBox_whatIsUrl"; - this.comboBox_whatIsUrl.Size = new System.Drawing.Size(189, 20); + this.comboBox_whatIsUrl.Size = new System.Drawing.Size(282, 26); this.comboBox_whatIsUrl.TabIndex = 18; this.comboBox_whatIsUrl.Text = "http://whatismyip.akamai.com/"; // // button_whatIsTest // - this.button_whatIsTest.Location = new System.Drawing.Point(6, 66); + this.button_whatIsTest.Location = new System.Drawing.Point(9, 99); + this.button_whatIsTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button_whatIsTest.Name = "button_whatIsTest"; - this.button_whatIsTest.Size = new System.Drawing.Size(189, 23); + this.button_whatIsTest.Size = new System.Drawing.Size(284, 34); this.button_whatIsTest.TabIndex = 17; this.button_whatIsTest.Text = "获取WAN口IP"; this.button_whatIsTest.UseVisualStyleBackColor = true; @@ -561,17 +616,53 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(7, 22); + this.label14.Location = new System.Drawing.Point(10, 33); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(59, 12); + this.label14.Size = new System.Drawing.Size(89, 18); this.label14.TabIndex = 16; this.label14.Text = "查询网址:"; // + // textBox_TTL + // + this.textBox_TTL.Location = new System.Drawing.Point(98, 181); + this.textBox_TTL.Name = "textBox_TTL"; + this.textBox_TTL.Size = new System.Drawing.Size(54, 28); + this.textBox_TTL.TabIndex = 15; + this.textBox_TTL.Text = "600"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(12, 186); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(71, 18); + this.label13.TabIndex = 16; + this.label13.Text = "TTL(秒)"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(209, 62); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(44, 18); + this.label15.TabIndex = 9; + this.label15.Text = "TTL:"; + // + // label_TTL + // + this.label_TTL.AutoSize = true; + this.label_TTL.Location = new System.Drawing.Point(243, 62); + this.label_TTL.Name = "label_TTL"; + this.label_TTL.Size = new System.Drawing.Size(62, 18); + this.label_TTL.TabIndex = 10; + this.label_TTL.Text = ""; + // // mainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(437, 430); + this.ClientSize = new System.Drawing.Size(656, 677); this.Controls.Add(this.groupBox_setWanIp); this.Controls.Add(this.groupBox_netstate); this.Controls.Add(this.textBox_log); @@ -580,6 +671,7 @@ this.Controls.Add(this.timeSetGroup); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "mainForm"; this.Text = "AliDDNS"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.mainForm_FormClosing); @@ -649,6 +741,10 @@ private System.Windows.Forms.Label label14; private System.Windows.Forms.Button button_setIP; private System.Windows.Forms.MaskedTextBox maskedTextBox_setIP; + private System.Windows.Forms.Label label_TTL; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox textBox_TTL; } } diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/main.cs b/net.nutcore.aliddns/net.nutcore.aliddns/main.cs index 0918704..a059a33 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/main.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/main.cs @@ -137,6 +137,7 @@ namespace net.nutcore.aliddns checkBox_logAutoSave.Checked = true; else checkBox_logAutoSave.Checked = false; + textBox_TTL.Text = nodes[10].InnerText; textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "设置文件读取成功！" + "\r\n"); return true; @@ -220,6 +221,10 @@ namespace net.nutcore.aliddns textWriter.WriteString("Off"); textWriter.WriteEndElement(); + textWriter.WriteStartElement("TTL", ""); + textWriter.WriteString(textBox_TTL.Text); + textWriter.WriteEndElement(); + textWriter.WriteEndElement(); //设置项目结束 textWriter.WriteEndDocument();//文档结束 textWriter.Close(); //文档保存关闭 @@ -270,7 +275,7 @@ namespace net.nutcore.aliddns } } - private bool setRecordId() + private bool setRecordId() //获取阿里云解析返回recordId { DescribeSubDomainRecordsRequest request = new DescribeSubDomainRecordsRequest(); request.SubDomain = fullDomainName.Text; @@ -279,7 +284,7 @@ namespace net.nutcore.aliddns DescribeSubDomainRecordsResponse response = client.GetAcsResponse(request); List list = response.DomainRecords; - if (list.Count == 0) + if (list.Count == 0) //当不存在域名记录时，添加一个 { textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务访问成功，但没有找到对应域名信息！" + "\r\n"); if (addDomainRecord()) @@ -290,7 +295,7 @@ namespace net.nutcore.aliddns int i = 0; - foreach (Record record in list) + foreach (Record record in list) //当存在域名记录时，返回域名记录信息 { i++; textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务返回RecordId:" + i.ToString() + " RecordId：" + record.RecordId + "\r\n"); @@ -298,6 +303,7 @@ namespace net.nutcore.aliddns globalRR.Text = record.RR; globalDomainType.Text = record.Type; globalValue.Text = domainIP.Text = record.Value; + label_TTL.Text = Convert.ToString(record.TTL); label_DomainIpStatus.Text = "已绑定"; label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0, 255); } @@ -330,6 +336,7 @@ namespace net.nutcore.aliddns globalRR.Text = response.RR; globalDomainType.Text = response.Type; globalValue.Text = response.Value; + label_TTL.Text = Convert.ToString(response.TTL); label_DomainIpStatus.Text = "已绑定"; label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0, 255); return response.Value; @@ -365,6 +372,7 @@ namespace net.nutcore.aliddns request.Type = "A"; request.RR = domainRR; request.RecordId = recordId.Text; + request.TTL = Convert.ToInt32(textBox_TTL.Text); request.Value = localIP.Text; try { @@ -399,6 +407,7 @@ namespace net.nutcore.aliddns request.Type = "A"; request.RR = domainRR; request.DomainName = domainName; + request.TTL = Convert.ToInt32(textBox_TTL.Text); request.Value = localIP.Text; try { @@ -491,6 +500,7 @@ namespace net.nutcore.aliddns globalRR.Text = "null"; globalDomainType.Text = "null"; globalValue.Text = "null"; + label_TTL.Text = "null"; label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(255, 255, 0, 0); } notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 @@ -689,6 +699,5 @@ namespace net.nutcore.aliddns } } - } } diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt index 3f2b8c5..eb54086 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt +++ b/net.nutcore.aliddns/net.nutcore.aliddns/updateinfo.txt @@ -1,3 +1,6 @@ +v3.8.0.0 +1TTL2޸BUG + v3.7.1.7 1޲BUG2ڴԡ