diff --git a/DLL/Newtonsoft.Json.dll b/DLL/Newtonsoft.Json.dll new file mode 100644 index 0000000..628aaf0 Binary files /dev/null and b/DLL/Newtonsoft.Json.dll differ diff --git a/Project/Device/Barcode.cs b/Project/Device/Barcode.cs index 4dd4eeb..10fecbe 100644 --- a/Project/Device/Barcode.cs +++ b/Project/Device/Barcode.cs @@ -354,7 +354,7 @@ namespace Project.Device /// /// 시리얼포트의 핀 상태값이 변경될 때 발생합니다. /// - public event EventHandler serialPinchanged; + //public event EventHandler serialPinchanged; #endregion @@ -817,7 +817,7 @@ namespace Project.Device errorMessage = string.Empty; _isSync = true; byte[] recvbuf = null; - Boolean bRet = false; + // Boolean bRet = false; //171214 if (!IsOpen) @@ -980,13 +980,13 @@ namespace Project.Device if (!bTimeOut) { recvbuf = _buffer.ToArray(); - bRet = true; + //bRet = true; } } catch (Exception ex) { errorMessage = ex.Message; - bRet = false; + //bRet = false; } } diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 7483c43..0e1936e 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -133,18 +133,6 @@ - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll - True - - - ..\packages\StackExchange.Redis.Extender.1.0.5\lib\StackExchange.Redis.Extender.dll - True - @@ -383,7 +371,6 @@ dsMSSQL.xsd - SettingsSingleFileGenerator diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index c8460cc..5113ef0 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.11.29.1630")] -[assembly: AssemblyFileVersion("19.11.29.1630")] +[assembly: AssemblyVersion("19.12.11.0950")] +[assembly: AssemblyFileVersion("19.12.11.0950")] diff --git a/Project/StateMachine/_BW.cs b/Project/StateMachine/_BW.cs index 5b54cf3..c19982f 100644 --- a/Project/StateMachine/_BW.cs +++ b/Project/StateMachine/_BW.cs @@ -17,49 +17,49 @@ namespace Project { while (bBW) { - if (redisConnection == null) - { - var ts = DateTime.Now - redisTryTime; - if (ts.TotalMinutes > 5) - { - Console.WriteLine("redis conn : 10.131.36.57:6379"); - try - { - redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379"); - } - catch (Exception ex) - { + //if (redisConnection == null) + //{ + // var ts = DateTime.Now - redisTryTime; + // if (ts.TotalMinutes > 5) + // { + // Console.WriteLine("redis conn : 10.131.36.57:6379"); + // try + // { + // redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379"); + // } + // catch (Exception ex) + // { - } - } - } - else - { - if (redisConnection.IsConnected) - { - if (this.db == null) - { - try - { - Console.WriteLine("redis connected setting db"); - this.db = redisConnection.GetDatabase(); - var getStr = this.db.StringGet("test"); - Console.WriteLine(getStr); - } - catch (Exception ex) - { - Pub.log.AddE("REDIS " + ex.Message); - } + // } + // } + //} + //else + //{ + // if (redisConnection.IsConnected) + // { + // if (this.db == null) + // { + // try + // { + // Console.WriteLine("redis connected setting db"); + // this.db = redisConnection.GetDatabase(); + // var getStr = this.db.StringGet("test"); + // Console.WriteLine(getStr); + // } + // catch (Exception ex) + // { + // Pub.log.AddE("REDIS " + ex.Message); + // } - } - } - else - { - Console.WriteLine("resetting redis connection"); - redisConnection.Dispose(); - redisConnection = null; - } - } + // } + // } + // else + // { + // Console.WriteLine("resetting redis connection"); + // redisConnection.Dispose(); + // redisConnection = null; + // } + //} System.Threading.Thread.Sleep(5000); diff --git a/Project/StateMachine/_TMDisplay.cs b/Project/StateMachine/_TMDisplay.cs index 1a2f901..e4f5954 100644 --- a/Project/StateMachine/_TMDisplay.cs +++ b/Project/StateMachine/_TMDisplay.cs @@ -23,13 +23,13 @@ namespace Project } else sbBWRun.BackColor = Color.Red; sbBCD.BackColor = Pub.barcode.IsInit ? Color.Lime : Color.Red; - if (redisConnection == null) this.sbRedis.ForeColor = Color.DimGray; - else if (redisConnection.IsConnected) - { - if (db == null) this.sbRedis.ForeColor = Color.Blue; - else this.sbRedis.ForeColor = Color.Green; - } - else this.sbRedis.ForeColor = Color.Red; + //if (redisConnection == null) this.sbRedis.ForeColor = Color.DimGray; + //else if (redisConnection.IsConnected) + //{ + // if (db == null) this.sbRedis.ForeColor = Color.Blue; + // else this.sbRedis.ForeColor = Color.Green; + //} + //else this.sbRedis.ForeColor = Color.Red; } } diff --git a/Project/_Common/fUserList.Designer.cs b/Project/_Common/fUserList.Designer.cs index e1f4440..9a65d4b 100644 --- a/Project/_Common/fUserList.Designer.cs +++ b/Project/_Common/fUserList.Designer.cs @@ -53,17 +53,6 @@ this.btDevel = new System.Windows.Forms.ToolStripDropDownButton(); this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dv1 = new System.Windows.Forms.DataGridView(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); - this.btRef = new System.Windows.Forms.ToolStripButton(); - this.textBox1 = new System.Windows.Forms.TextBox(); this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -77,7 +66,18 @@ this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); + this.btRef = new System.Windows.Forms.ToolStripButton(); + this.textBox1 = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -109,6 +109,7 @@ this.tam.LineCodeTableAdapter = null; this.tam.ProjectsTableAdapter = null; this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.UserGroupTableAdapter = null; this.tam.UsersTableAdapter = this.ta; // // bn @@ -287,92 +288,6 @@ this.dv1.Size = new System.Drawing.Size(755, 373); this.dv1.TabIndex = 1; // - // cm1 - // - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.autoResizeColumnToolStripMenuItem, - this.toolStripMenuItem2, - this.iDChangeToolStripMenuItem, - this.passwordChangeToolStripMenuItem, - this.toolStripMenuItem1, - this.mailToolStripMenuItem}); - this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(181, 126); - // - // iDChangeToolStripMenuItem - // - this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem"; - this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.iDChangeToolStripMenuItem.Text = "ID Change"; - this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click); - // - // passwordChangeToolStripMenuItem - // - this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem"; - this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.passwordChangeToolStripMenuItem.Text = "Password Change"; - this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); - // - // mailToolStripMenuItem - // - this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; - this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.mailToolStripMenuItem.Text = "Mail"; - this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); - // - // autoResizeColumnToolStripMenuItem - // - this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem"; - this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column"; - this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripLabel1, - this.cmbdept, - this.btRef}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(755, 25); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripLabel1 - // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(43, 22); - this.toolStripLabel1.Text = "Depart"; - // - // cmbdept - // - this.cmbdept.Name = "cmbdept"; - this.cmbdept.Size = new System.Drawing.Size(121, 25); - // - // btRef - // - this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image"))); - this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btRef.Name = "btRef"; - this.btRef.Size = new System.Drawing.Size(66, 22); - this.btRef.Text = "Refresh"; - this.btRef.Click += new System.EventHandler(this.btRef_Click); - // - // textBox1 - // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true)); - this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.textBox1.Location = new System.Drawing.Point(0, 398); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(755, 21); - this.textBox1.TabIndex = 3; - // // dvc_id // this.dvc_id.DataPropertyName = "id"; @@ -470,11 +385,97 @@ this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; this.memoDataGridViewTextBoxColumn.Width = 66; // + // cm1 + // + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.autoResizeColumnToolStripMenuItem, + this.toolStripMenuItem2, + this.iDChangeToolStripMenuItem, + this.passwordChangeToolStripMenuItem, + this.toolStripMenuItem1, + this.mailToolStripMenuItem}); + this.cm1.Name = "cm1"; + this.cm1.Size = new System.Drawing.Size(181, 104); + // + // autoResizeColumnToolStripMenuItem + // + this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem"; + this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column"; + this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click); + // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6); // + // iDChangeToolStripMenuItem + // + this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem"; + this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.iDChangeToolStripMenuItem.Text = "ID Change"; + this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click); + // + // passwordChangeToolStripMenuItem + // + this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem"; + this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.passwordChangeToolStripMenuItem.Text = "Password Change"; + this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6); + // + // mailToolStripMenuItem + // + this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; + this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.mailToolStripMenuItem.Text = "Mail"; + this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel1, + this.cmbdept, + this.btRef}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(755, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel1.Text = "Depart"; + // + // cmbdept + // + this.cmbdept.Name = "cmbdept"; + this.cmbdept.Size = new System.Drawing.Size(300, 25); + // + // btRef + // + this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image"))); + this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btRef.Name = "btRef"; + this.btRef.Size = new System.Drawing.Size(66, 22); + this.btRef.Text = "Refresh"; + this.btRef.Click += new System.EventHandler(this.btRef_Click); + // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true)); + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(0, 398); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(755, 21); + this.textBox1.TabIndex = 3; + // // fUserList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/Project/fMain.cs b/Project/fMain.cs index 68cae7a..00857c7 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -6,7 +6,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; -using StackExchange.Redis; +//using StackExchange.Redis; namespace Project { @@ -48,12 +48,12 @@ namespace Project return; } - //close redis - if (this.redisConnection != null && this.redisConnection.IsConnected && this.db != null) - { - this.redisConnection.Close(); - this.redisConnection.Dispose(); - } + ////close redis + //if (this.redisConnection != null && this.redisConnection.IsConnected && this.db != null) + //{ + // this.redisConnection.Close(); + // this.redisConnection.Dispose(); + //} Pub.log.Add("Program Close"); Pub.log.Flush(); @@ -61,8 +61,8 @@ namespace Project if (bw.IsBusy) bw.CancelAsync(); } - ConnectionMultiplexer redisConnection; - IDatabase db; + //ConnectionMultiplexer redisConnection; + //IDatabase db; private void __Load(object sender, EventArgs e) { diff --git a/Project/packages.config b/Project/packages.config deleted file mode 100644 index 8004d94..0000000 --- a/Project/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file