From 5412f86de0bce2507fcd6ffd7185a5416701bed6 Mon Sep 17 00:00:00 2001 From: wisdomwei201804 Date: Tue, 3 Jul 2018 18:07:04 +0800 Subject: [PATCH] =?UTF-8?q?v3.8.4.8=20=201=E3=80=81=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=822=E3=80=81=E8=B0=83=E6=95=B4=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E5=AE=9E=E7=8E=B0=E3=80=823?= =?UTF-8?q?=E3=80=81DEBUG...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net.nutcore.aliddns/Form_main.Designer.cs | 64 ++-- .../net.nutcore.aliddns/Form_main.cs | 275 +++++++++--------- 2 files changed, 187 insertions(+), 152 deletions(-) diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.Designer.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.Designer.cs index cff8a35..2ac8be2 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.Designer.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.Designer.cs @@ -85,6 +85,8 @@ this.comboBox_whatIsUrl = new System.Windows.Forms.ComboBox(); this.button_whatIsTest = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); + this.button_addNewDomain = new System.Windows.Forms.Button(); + this.button_addUrl = new System.Windows.Forms.Button(); this.timeSetGroup.SuspendLayout(); this.debugMessage.SuspendLayout(); this.globalSetGroup.SuspendLayout(); @@ -219,7 +221,7 @@ this.debugMessage.Controls.Add(this.label9); this.debugMessage.Location = new System.Drawing.Point(219, 47); this.debugMessage.Name = "debugMessage"; - this.debugMessage.Size = new System.Drawing.Size(206, 79); + this.debugMessage.Size = new System.Drawing.Size(216, 79); this.debugMessage.TabIndex = 5; this.debugMessage.TabStop = false; this.debugMessage.Text = "调试信息"; @@ -317,6 +319,7 @@ // // globalSetGroup // + this.globalSetGroup.Controls.Add(this.button_addNewDomain); this.globalSetGroup.Controls.Add(this.label13); this.globalSetGroup.Controls.Add(this.textBox_TTL); this.globalSetGroup.Controls.Add(this.button_ShowHide); @@ -332,7 +335,7 @@ this.globalSetGroup.Controls.Add(this.label4); this.globalSetGroup.Location = new System.Drawing.Point(219, 132); this.globalSetGroup.Name = "globalSetGroup"; - this.globalSetGroup.Size = new System.Drawing.Size(206, 198); + this.globalSetGroup.Size = new System.Drawing.Size(216, 198); this.globalSetGroup.TabIndex = 6; this.globalSetGroup.TabStop = false; this.globalSetGroup.Text = "设置"; @@ -340,7 +343,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(8, 124); + this.label13.Location = new System.Drawing.Point(8, 123); this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(47, 12); @@ -349,7 +352,7 @@ // // textBox_TTL // - this.textBox_TTL.Location = new System.Drawing.Point(65, 121); + this.textBox_TTL.Location = new System.Drawing.Point(65, 120); this.textBox_TTL.Margin = new System.Windows.Forms.Padding(2); this.textBox_TTL.Name = "textBox_TTL"; this.textBox_TTL.Size = new System.Drawing.Size(37, 21); @@ -359,9 +362,9 @@ // // button_ShowHide // - this.button_ShowHide.Location = new System.Drawing.Point(106, 169); + this.button_ShowHide.Location = new System.Drawing.Point(75, 169); this.button_ShowHide.Name = "button_ShowHide"; - this.button_ShowHide.Size = new System.Drawing.Size(91, 23); + this.button_ShowHide.Size = new System.Drawing.Size(65, 23); this.button_ShowHide.TabIndex = 14; this.button_ShowHide.Text = "显示录入"; this.button_ShowHide.UseVisualStyleBackColor = true; @@ -369,9 +372,9 @@ // // checkAndSaveConfig // - this.checkAndSaveConfig.Location = new System.Drawing.Point(8, 169); + this.checkAndSaveConfig.Location = new System.Drawing.Point(5, 169); this.checkAndSaveConfig.Name = "checkAndSaveConfig"; - this.checkAndSaveConfig.Size = new System.Drawing.Size(93, 23); + this.checkAndSaveConfig.Size = new System.Drawing.Size(65, 23); this.checkAndSaveConfig.TabIndex = 10; this.checkAndSaveConfig.Text = "测试连接"; this.checkAndSaveConfig.UseVisualStyleBackColor = true; @@ -380,7 +383,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(107, 152); + this.label8.Location = new System.Drawing.Point(107, 148); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 8; @@ -388,7 +391,7 @@ // // newSeconds // - this.newSeconds.Location = new System.Drawing.Point(41, 149); + this.newSeconds.Location = new System.Drawing.Point(41, 145); this.newSeconds.Name = "newSeconds"; this.newSeconds.Size = new System.Drawing.Size(60, 21); this.newSeconds.TabIndex = 7; @@ -398,7 +401,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 152); + this.label7.Location = new System.Drawing.Point(6, 148); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(29, 12); this.label7.TabIndex = 6; @@ -489,7 +492,7 @@ this.toolStripMenuItem_Exit.Name = "toolStripMenuItem_Exit"; this.toolStripMenuItem_Exit.Size = new System.Drawing.Size(124, 22); this.toolStripMenuItem_Exit.Text = "退出"; - this.toolStripMenuItem_Exit.Click += new System.EventHandler(this.toolStripMenuItem1_Click); + this.toolStripMenuItem_Exit.Click += new System.EventHandler(this.toolStripMenuItem_Quit_Click); // // ToolStripMenuItem_checkUpdate // @@ -512,7 +515,7 @@ 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(423, 109); this.textBox_log.TabIndex = 8; // // groupBox_netstate @@ -525,7 +528,7 @@ this.groupBox_netstate.Controls.Add(this.label1); this.groupBox_netstate.Location = new System.Drawing.Point(12, 3); this.groupBox_netstate.Name = "groupBox_netstate"; - this.groupBox_netstate.Size = new System.Drawing.Size(413, 38); + this.groupBox_netstate.Size = new System.Drawing.Size(423, 38); this.groupBox_netstate.TabIndex = 9; this.groupBox_netstate.TabStop = false; this.groupBox_netstate.Text = "网络状态"; @@ -534,7 +537,7 @@ // 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(371, 19); this.label_DomainIpStatus.Name = "label_DomainIpStatus"; this.label_DomainIpStatus.Size = new System.Drawing.Size(41, 12); this.label_DomainIpStatus.TabIndex = 9; @@ -553,7 +556,7 @@ // domainIP // this.domainIP.AutoSize = true; - this.domainIP.Location = new System.Drawing.Point(259, 19); + this.domainIP.Location = new System.Drawing.Point(264, 19); this.domainIP.Name = "domainIP"; this.domainIP.Size = new System.Drawing.Size(47, 12); this.domainIP.TabIndex = 7; @@ -562,7 +565,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(213, 19); + this.label2.Location = new System.Drawing.Point(218, 19); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(47, 12); this.label2.TabIndex = 6; @@ -588,6 +591,7 @@ // // groupBox_setWanIp // + this.groupBox_setWanIp.Controls.Add(this.button_addUrl); this.groupBox_setWanIp.Controls.Add(this.maskedTextBox_setIP); this.groupBox_setWanIp.Controls.Add(this.button_setIP); this.groupBox_setWanIp.Controls.Add(this.comboBox_whatIsUrl); @@ -636,7 +640,7 @@ // this.button_whatIsTest.Location = new System.Drawing.Point(6, 66); this.button_whatIsTest.Name = "button_whatIsTest"; - this.button_whatIsTest.Size = new System.Drawing.Size(189, 23); + this.button_whatIsTest.Size = new System.Drawing.Size(90, 23); this.button_whatIsTest.TabIndex = 17; this.button_whatIsTest.Text = "获取WAN口IP"; this.button_whatIsTest.UseVisualStyleBackColor = true; @@ -651,11 +655,31 @@ this.label14.TabIndex = 16; this.label14.Text = "查询网址:"; // + // button_addNewDomain + // + this.button_addNewDomain.Location = new System.Drawing.Point(145, 169); + this.button_addNewDomain.Name = "button_addNewDomain"; + this.button_addNewDomain.Size = new System.Drawing.Size(65, 23); + this.button_addNewDomain.TabIndex = 17; + this.button_addNewDomain.Text = "添加域名"; + this.button_addNewDomain.UseVisualStyleBackColor = true; + this.button_addNewDomain.Click += new System.EventHandler(this.button_addNewDomain_Click); + // + // button_addUrl + // + this.button_addUrl.Location = new System.Drawing.Point(105, 66); + this.button_addUrl.Name = "button_addUrl"; + this.button_addUrl.Size = new System.Drawing.Size(90, 23); + this.button_addUrl.TabIndex = 21; + this.button_addUrl.Text = "添加地址"; + this.button_addUrl.UseVisualStyleBackColor = true; + this.button_addUrl.Click += new System.EventHandler(this.button_addUrl_Click); + // // mainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(437, 451); + this.ClientSize = new System.Drawing.Size(447, 451); this.Controls.Add(this.groupBox_setWanIp); this.Controls.Add(this.groupBox_netstate); this.Controls.Add(this.textBox_log); @@ -741,6 +765,8 @@ private System.Windows.Forms.Button button_ngrok; private System.Windows.Forms.CheckBox checkBox_ngrok; public System.Windows.Forms.TextBox textBox_log; + private System.Windows.Forms.Button button_addNewDomain; + private System.Windows.Forms.Button button_addUrl; } } diff --git a/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.cs b/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.cs index 328c690..4ce9b5a 100644 --- a/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.cs +++ b/net.nutcore.aliddns/net.nutcore.aliddns/Form_main.cs @@ -29,6 +29,11 @@ namespace net.nutcore.aliddns this.MaximizeBox = false; //取消窗口最大化按钮 } + /// + /// mainForm窗体加载 + /// + /// + /// private void mainForm_Load(object sender, EventArgs e) { //获取当前用户名和计算机名并写入日志 @@ -100,36 +105,22 @@ namespace net.nutcore.aliddns this.ShowInTaskbar = true; //从状态栏显示 } - try //获取域名绑定IP - { - clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text, accessKeySecret.Text); - client = new DefaultAcsClient(clientProfile); - domainIP.Text = getDomainIP(); - } - catch (Exception error) - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "运行出错！信息: " + error + "\r\n"); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "获取域名和绑定IP失败，请检查设置项目内容和网络状态！" + "\r\n"); - } - } - - try //获取WAN口IP - { - localIP.Text = getLocalIP(); + //获取阿里云域名记录绑定IP + domainIP.Text = getAliDnsRecordDomainIP(); + //获取WAN口IP + localIP.Text = getWanIP(); if ((localIP.Text != domainIP.Text) && (checkBox_autoBoot.Checked = true)) { updatePrepare(); } } - catch (Exception error) - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "运行出错！信息: " + error + "\r\n"); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "获取WAN口IP失败！" + "\r\n"); - } - notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 } + /// + /// 读取配置文件并初始化控件 + /// + /// private bool readConfigFile() { try @@ -178,16 +169,23 @@ namespace net.nutcore.aliddns } - private string getLocalIP() + /// + /// 获取网络出口公网IP + /// + /// + private string getWanIP() { try { - string strUrl = comboBox_whatIsUrl.Text; //从控件获取WAN口IP查询网址，默认值为："http://whatismyip.akamai.com/"; + //从控件获取WAN口IP查询网址，默认值为："http://whatismyip.akamai.com/"; + string strUrl = comboBox_whatIsUrl.Text; Uri uri = new Uri(strUrl); WebRequest webreq = WebRequest.Create(uri); Stream s = webreq.GetResponse().GetResponseStream(); StreamReader sr = new StreamReader(s, Encoding.Default); string all = sr.ReadToEnd(); + sr.Close(); + sr.Dispose(); all = Regex.Replace(all, @"(\d+)", "000$1"); all = Regex.Replace(all, @"0+(\d{1,4})", "$1"); string reg = @"(\d{1,4}\.\d{1,4}\.\d{1,4}\.\d{1,4})"; @@ -213,39 +211,43 @@ namespace net.nutcore.aliddns } } - private bool setRecordId() //获取阿里云解析返回recordId + /// + /// 从阿里云获取域名记录 + /// + /// + private bool getRecordId() //获取阿里云解析返回recordId { + clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text.ToString(), accessKeySecret.Text.ToString()); + client = new DefaultAcsClient(clientProfile); DescribeSubDomainRecordsRequest request = new DescribeSubDomainRecordsRequest(); request.SubDomain = fullDomainName.Text; try - { + { DescribeSubDomainRecordsResponse response = client.GetAcsResponse(request); List list = response.DomainRecords; if (list.Count == 0) //当不存在域名记录时，添加一个 { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务访问成功，但没有找到对应域名信息！" + "\r\n"); - if (addDomainRecord()) - return true; - else - return false; + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务访问成功，但没有找到对应域名记录，请添加域名后重试！" + "\r\n"); + return false; } - - int i = 0; - - foreach (Record record in list) //当存在域名记录时，返回域名记录信息 + else { - i++; - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务返回RecordId:" + i.ToString() + " RecordId：" + record.RecordId + "\r\n"); - recordId.Text = record.RecordId; - 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); + int i = 0; + foreach (Record record in list) //当存在域名记录时，返回域名记录信息 + { + i++; + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务返回RecordId:" + i.ToString() + " RecordId：" + record.RecordId + "\r\n"); + recordId.Text = record.RecordId; + 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); + } + return true; } - return true; } //处理错误 catch (ServerException e) @@ -260,15 +262,30 @@ namespace net.nutcore.aliddns } } - private string getDomainIP() + /// + /// 从阿里云服务器获取域名记录信息 + /// + /// + private string getAliDnsRecordDomainIP() { + clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text.ToString(), accessKeySecret.Text.ToString()); + client = new DefaultAcsClient(clientProfile); DescribeDomainRecordInfoRequest request = new DescribeDomainRecordInfoRequest(); - request.RecordId = recordId.Text; + request.RecordId = recordId.Text.ToString(); try { DescribeDomainRecordInfoResponse response = client.GetAcsResponse(request); + string fullDomain = response.RR.ToString() + "." + response.DomainName.ToString(); if (response.Value != "0.0.0.0") { + if(fullDomain != fullDomainName.Text.ToString()) + { + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS域名记录:"+ response.RecordId + " 对应域名为:" + fullDomain + "\r\n"); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "配置文件域名记录:" + recordId.Text.ToString() + " 对应域名为:" + fullDomainName.Text.ToString() + "\r\n"); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "配置文件设置错误！可能原因是修改域名记录后未及时添加，已经自动修改配置文件与服务器记录一致！" + "\r\n"); + fullDomainName.Text = fullDomain; + cfg.SaveAppSetting("fullDomainName", fullDomain); + } textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "域名:" + response.RR + "." + response.DomainName + " 已经绑定IP:" + response.Value + "\r\n"); recordId.Text = response.RecordId; globalRR.Text = response.RR; @@ -299,6 +316,9 @@ namespace net.nutcore.aliddns } } + /// + /// 更新域名记录 + /// private void updateDomainRecord() { string[] symbols = new string[1] { "." }; @@ -306,6 +326,8 @@ namespace net.nutcore.aliddns string domainRR = data[0]; string domainName = data[1] + "." + data[2]; + clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text.ToString(), accessKeySecret.Text.ToString()); + client = new DefaultAcsClient(clientProfile); UpdateDomainRecordRequest request = new UpdateDomainRecordRequest(); request.Type = "A"; request.RR = domainRR; @@ -334,6 +356,10 @@ namespace net.nutcore.aliddns } } + /// + /// 添加域名记录 + /// + /// private bool addDomainRecord() { string[] symbols = new string[1] { "." }; @@ -341,6 +367,8 @@ namespace net.nutcore.aliddns string domainRR = data[0]; string domainName = data[1] + "." + data[2]; + clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text.ToString(), accessKeySecret.Text.ToString()); + client = new DefaultAcsClient(clientProfile); AddDomainRecordRequest request = new AddDomainRecordRequest(); request.Type = "A"; request.RR = domainRR; @@ -352,14 +380,30 @@ namespace net.nutcore.aliddns textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "正在向阿里云DNS服务添加域名:" + fullDomainName.Text + "\r\n"); AddDomainRecordResponse response = client.GetAcsResponse(request); if (response.RecordId != null) - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "RecordId:" + response.RecordId + " 域名：" + fullDomainName.Text + "添加成功！" + "\r\n"); - recordId.Text = response.RecordId; - globalDomainType.Text = request.Type; - globalRR.Text = request.RR; - globalValue.Text = domainIP.Text = request.Value; - label_DomainIpStatus.Text = "已绑定"; - label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0, 255); - return true; + { + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + " 域名：" + fullDomainName.Text + "添加成功！" + "服务器返回RecordId:" + response.RecordId + "\r\n"); + recordId.Text = response.RecordId; + globalDomainType.Text = request.Type; + globalRR.Text = request.RR; + globalValue.Text = domainIP.Text = request.Value; + label_DomainIpStatus.Text = "已绑定"; + label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0, 255); + return true; + } + else + { + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + " 域名：" + fullDomainName.Text + "添加失败！" + "\r\n"); + label_DomainIpStatus.Text = "未绑定"; + domainIP.Text = "0.0.0.0"; + recordId.Text = "null"; + globalRR.Text = "null"; + globalDomainType.Text = "null"; + globalValue.Text = "null"; + label_TTL.Text = "null"; + label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(255, 255, 0, 0); + return false; + } + } //处理错误 catch (ServerException e) @@ -374,34 +418,29 @@ namespace net.nutcore.aliddns } } + /// + /// 比较是否需要更新域名信息 + /// private void updatePrepare() { label_nextUpdateSeconds.Text = newSeconds.Text; - try + localIP.Text = getWanIP(); + domainIP.Text = getAliDnsRecordDomainIP(); + if (domainIP.Text == localIP.Text) { - localIP.Text = getLocalIP(); - domainIP.Text = getDomainIP(); - if (domainIP.Text == localIP.Text) - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "WAN口IP:" + localIP.Text + " 与域名绑定IP:" + domainIP.Text + "一致，无需更新！" + "\r\n"); - } - else - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "WAN口IP:" + localIP.Text + " 与域名绑定IP:" + domainIP.Text + "不一致，需要更新！" + "\r\n"); - updateDomainRecord(); - } - //localIP.Text = getLocalIP(); - //domainIP.Text = getDomainIP(); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "WAN口IP:" + localIP.Text + " 与域名绑定IP:" + domainIP.Text + "一致，无需更新！" + "\r\n"); } - catch (Exception error) + else { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "运行出错！信息: " + error + "\r\n"); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "域名绑定IP更新失败！" + "\r\n"); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "WAN口IP:" + localIP.Text + " 与域名绑定IP:" + domainIP.Text + "不一致，需要更新！" + "\r\n"); + updateDomainRecord(); } - notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 + //localIP.Text = getWanIP(); + //domainIP.Text = getAliDnsRecordDomainIP(); + //监测网络状态、刷新系统托盘图标 + notifyIcon_sysTray_Update(); } - //Events in form private void updateNow_Click(object sender, EventArgs e) { textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "---立即开始WAN口IP和域名绑定IP进行查询比较---" + "\r\n"); @@ -410,33 +449,13 @@ namespace net.nutcore.aliddns private void checkConfig_Click(object sender, EventArgs e) { - try + if (getRecordId()) { - //localIP.Text = getLocalIP(); //读取WAN口IP - //domainIP.Text = getDomainIP(); //读取AliDDNS已经绑定IP - clientProfile = DefaultProfile.GetProfile("cn-hangzhou", accessKeyId.Text, accessKeySecret.Text); - client = new DefaultAcsClient(clientProfile); - if (setRecordId()) //检查能否从服务器返回RecordId，返回则设置正确，否则设置不正确 - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务返回RecordId，连接成功！ " + "\r\n"); - } - else - { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务没有返回RecordId，请检查设置项目是否正确！" + "\r\n"); - } + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "测试结果->成功！" + "\r\n"); } - catch (Exception error) + else { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "运行出错！信息: " + error + "\r\n"); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "阿里云DNS服务访问失败，请检查账户accessKeyId和accessKeySecret！" + "\r\n"); - label_DomainIpStatus.Text = "未绑定"; - domainIP.Text = "0.0.0.0"; - recordId.Text = "null"; - globalRR.Text = "null"; - globalDomainType.Text = "null"; - globalValue.Text = "null"; - label_TTL.Text = "null"; - label_DomainIpStatus.ForeColor = System.Drawing.Color.FromArgb(255, 255, 0, 0); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "测试结果->失败！请检查设置项目是否正确！" + "\r\n"); } notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 } @@ -463,8 +482,9 @@ namespace net.nutcore.aliddns } } - private void toolStripMenuItem1_Click(object sender, EventArgs e) + private async void toolStripMenuItem_Quit_Click(object sender, EventArgs e) { + await ngrok.Stop(); this.Dispose(); } @@ -494,7 +514,7 @@ namespace net.nutcore.aliddns private void button_whatIsTest_Click(object sender, EventArgs e) { textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "开始向网址发起查询... " + "\r\n"); - localIP.Text = getLocalIP(); + localIP.Text = getWanIP(); notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 } @@ -644,7 +664,8 @@ namespace net.nutcore.aliddns { textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "运行出错！信息: " + error + "\r\n"); } - notifyIcon_sysTray_Update(); //监测网络状态、刷新系统托盘图标 + //监测网络状态、刷新系统托盘图标 + notifyIcon_sysTray_Update(); } private void notifyIcon_sysTray_Update() @@ -738,7 +759,7 @@ namespace net.nutcore.aliddns //检测ngrok.exe是否存在 if (ngrok.IsExists()) { - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "Ngrok功能启用，ngrok.exe将自动加载！通过浏览器打开：http://127.0.0.1:4040 查看运行状态。" + "\r\n"); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "Ngrok功能启用，ngrok.exe将自动加载！本机浏览器打开：http://127.0.0.1:4040 查看运行状态。" + "\r\n"); await ngrok.Start(); } else @@ -766,50 +787,26 @@ namespace net.nutcore.aliddns //检测ngrok.exe是否存在 if (( checkBox_ngrok.Checked == true ) && ( !ngrok.IsExists() )) { - MessageBox.Show("设置在当前目录没有发现ngrok.exe，请往官网下载自行编译。\nNgrok官网：https://ngrok.com/download"); + MessageBox.Show("软件运行目录没有发现ngrok.exe，请往官网下载自行编译。\nNgrok官网：https://ngrok.com/download"); } } private void fullDomainName_Leave(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("请确认域名: " + this.fullDomainName.Text.ToString(), "提醒", MessageBoxButtons.YesNo); - if (result == DialogResult.Yes) - { - cfg.SaveAppSetting("fullDomainName", this.fullDomainName.Text.ToString()); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "域名已经保存，点击测试连接将测试创建域名记录！" + "\r\n"); - } - else - { - this.fullDomainName.Focus(); - } + cfg.SaveAppSetting("fullDomainName", this.fullDomainName.Text.ToString()); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "域名已经保存，点击测试连接将查询域名是否存在，当不存在时点击添加域名会创建新域名记录！" + "\r\n"); } private void accessKeyId_Leave(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("请确认accessKeyId:\n" + this.accessKeyId.Text.ToString(), "提醒", MessageBoxButtons.YesNo); - if (result == DialogResult.Yes) - { - cfg.SaveAppSetting("AccessKeyID", EncryptHelper.AESEncrypt(this.accessKeyId.Text.ToString())); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "accessKeyId已经保存，请完成设置录入后点击测试连接！" + "\r\n"); - } - else - { - this.accessKeyId.Focus(); - } + cfg.SaveAppSetting("AccessKeyID", EncryptHelper.AESEncrypt(this.accessKeyId.Text.ToString())); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "accessKeyId已经保存，请完成设置录入后点击测试连接！" + "\r\n"); } private void accessKeySecret_Leave(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("请确认accessKeySecret:\n" + this.accessKeySecret.Text.ToString(), "提醒", MessageBoxButtons.YesNo); - if (result == DialogResult.Yes) - { - cfg.SaveAppSetting("AccessKeySecret", EncryptHelper.AESEncrypt(this.accessKeySecret.Text.ToString())); - textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "accessKeySecret已经保存，请完成设置录入后点击测试连接！" + "\r\n"); - } - else - { - this.accessKeySecret.Focus(); - } + cfg.SaveAppSetting("AccessKeySecret", EncryptHelper.AESEncrypt(this.accessKeySecret.Text.ToString())); + textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "accessKeySecret已经保存，请完成设置录入后点击测试连接！" + "\r\n"); } private void textBox_TTL_Leave(object sender, EventArgs e) @@ -829,5 +826,17 @@ namespace net.nutcore.aliddns cfg.SaveAppSetting("whatIsUrl", this.comboBox_whatIsUrl.Text.ToString()); textBox_log.AppendText(System.DateTime.Now.ToString() + " " + "公网IP查询网址修改保存成功！" + "\r\n"); } + + private void button_addNewDomain_Click(object sender, EventArgs e) + { + addDomainRecord(); + } + + private void button_addUrl_Click(object sender, EventArgs e) + { + string newItem = comboBox_whatIsUrl.Text.Trim().ToLower().ToString(); + comboBox_whatIsUrl.Items.Add(newItem); + cfg.AddAppSetting("whatIsUrl", newItem); + } } }