diff --git a/unimarc/.vs/unimarc/FileContentIndex/6e2814d5-5312-4b6a-b852-242f0c80f830.vsidx b/unimarc/.vs/unimarc/FileContentIndex/00ed9702-c7b5-4f18-8ead-afe3d71cb45c.vsidx similarity index 100% rename from unimarc/.vs/unimarc/FileContentIndex/6e2814d5-5312-4b6a-b852-242f0c80f830.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/00ed9702-c7b5-4f18-8ead-afe3d71cb45c.vsidx diff --git a/unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx b/unimarc/.vs/unimarc/FileContentIndex/1214bb14-0420-4fd0-8887-deb9ae323b87.vsidx similarity index 83% rename from unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/1214bb14-0420-4fd0-8887-deb9ae323b87.vsidx index 314cce1..9a0f0ef 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/a57b72d0-571d-4e71-955d-f9c3cad25cfa.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/1214bb14-0420-4fd0-8887-deb9ae323b87.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx b/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx deleted file mode 100644 index 8f11398..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/754b624f-d146-476c-a687-76fe97579f22.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/70ea73a4-3dbe-49ee-911a-19050906e911.vsidx b/unimarc/.vs/unimarc/FileContentIndex/c7047de1-4846-4518-988b-604f3ed72328.vsidx similarity index 100% rename from unimarc/.vs/unimarc/FileContentIndex/70ea73a4-3dbe-49ee-911a-19050906e911.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/c7047de1-4846-4518-988b-604f3ed72328.vsidx diff --git a/unimarc/.vs/unimarc/FileContentIndex/f6a24e10-e20d-4495-9975-3f41fc7b9340.vsidx b/unimarc/.vs/unimarc/FileContentIndex/f6a24e10-e20d-4495-9975-3f41fc7b9340.vsidx new file mode 100644 index 0000000..3f0ea5e Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/f6a24e10-e20d-4495-9975-3f41fc7b9340.vsidx differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 5587236..bc5b9ab 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/unimarc/Login.cs b/unimarc/unimarc/Login.cs index dabc0cd..e388109 100644 --- a/unimarc/unimarc/Login.cs +++ b/unimarc/unimarc/Login.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using System.IO; using System.Net; using System.Net.Sockets; +using Microsoft.VisualBasic; namespace WindowsFormsApp1 { @@ -60,7 +61,11 @@ namespace WindowsFormsApp1 MessageBox.Show("저장된 아이피가 다릅니다!"); return; } - + ((Main)(this.Owner)).IPText.Text = string.Format("접속 아이피 : {0}", lbl_IP.Text); + db.DB_Send_CMD_reVoid( + string.Format("UPDATE `User_Data` SET `lastIP` = \"{0}\", `lastDate` = \"{2}\" WHERE `ID` = \"{1}\"", + lbl_IP.Text, ID_text.Text, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) + ); this.DialogResult = DialogResult.OK; this.Close(); } diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index 2af89d7..b69f0c6 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -129,10 +129,10 @@ this.VersionText = new System.Windows.Forms.ToolStripLabel(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.botUserLabel = new System.Windows.Forms.ToolStripLabel(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.IPText = new System.Windows.Forms.ToolStripLabel(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.menuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -1194,6 +1194,6 @@ private System.Windows.Forms.ToolStripMenuItem 편목; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripLabel IPText; + public System.Windows.Forms.ToolStripLabel IPText; } } \ No newline at end of file diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index bdce069..83defea 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 09a2681..983b56e 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index c3ac11e..b0fa9e3 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index f3b215f..1d8a8bb 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index bdce069..83defea 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 09a2681..983b56e 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index c3ac11e..b0fa9e3 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index ee21eb8..d03df8f 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.VisualBasic; +using System; using System.Drawing; using System.Text; using System.Text.RegularExpressions; @@ -985,51 +986,48 @@ namespace WindowsFormsApp1.Mac bool isJBEClick = false; string 전북교육청입력(string text) { + // webBrowser1.Document.GetElementById("search_text").SetAttribute("value", text); foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) { - if (input.Id != null && input.Id == "search_text") - { - input.SetAttribute("value", text); - break; - } - } - if (!isJBEClick) - { - foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) + if (!isJBEClick) { if (input.GetAttribute("value").IndexOf("ALL") > -1) { input.InvokeMember("click"); - isJBEClick = true; } if (input.GetAttribute("value").IndexOf(Code) > -1) { input.InvokeMember("click"); isJBEClick = true; + break; } } } - - foreach (HtmlElement Btn in webBrowser1.Document.GetElementsByTagName("button")) + foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) { - if (Btn.Id != null && Btn.Id == "do-search") - Btn.InvokeMember("click"); - } - - Delay(10000); - - string result = ""; - - foreach (HtmlElement div in webBrowser1.Document.GetElementsByTagName("div")) - { - if (div.GetAttribute("className").IndexOf("search-info") > -1) + if (input.Name == "search_text" && input.GetAttribute("className") == "text") { - result = Regex.Replace(div.InnerText, @"\D", ""); + input.SetAttribute("value", text); break; } } - + + webBrowser1.Document.GetElementById("do-search").InvokeMember("click"); + + Delay(3000); + string result = ""; + int count = 0; + foreach (HtmlElement B in webBrowser1.Document.GetElementsByTagName("b")) + { + if (count == 1) + { + result = B.InnerText; + break; + } + count++; + } + return result; } #endregion