10-08

2018-10-10 09:33:09 +09:00
parent 7c5391a5e6
commit 68ebe71800
19 changed files with 911 additions and 434 deletions
--- a/Project/EETGW.csproj
+++ b/Project/EETGW.csproj
@@ -8,7 +8,7 @@
    <OutputType>WinExe</OutputType>
    <RootNamespace>Project</RootNamespace>
    <AssemblyName>GWEE</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <IsWebBootstrapper>true</IsWebBootstrapper>
    <SignAssembly>False</SignAssembly>
@@ -41,6 +41,7 @@
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
    <PublishWizardCompleted>true</PublishWizardCompleted>
    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>x86</PlatformTarget>
@@ -51,6 +52,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,6 +62,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationIcon>icons8-realtime-64.ico</ApplicationIcon>
@@ -79,6 +82,7 @@
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    <OutputPath>bin\</OutputPath>
@@ -88,6 +92,7 @@
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
@@ -124,8 +129,21 @@
    </Reference>
    <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
    <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="StackExchange.Redis.Extender, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\StackExchange.Redis.Extender.1.0.5\lib\StackExchange.Redis.Extender.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Web" />
    <Reference Include="System.Web.Services" />
@@ -339,6 +357,7 @@
    <None Include="dsMSSQL.xss">
      <DependentUpon>dsMSSQL.xsd</DependentUpon>
    </None>
+    <None Include="packages.config" />
    <None Include="Properties\app.manifest" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
--- a/Project/Properties/Resources.Designer.cs
+++ b/Project/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Project.Properties {
    // 클래스에서 자동으로 생성되었습니다.
    // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
    // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/Project/StateMachine/_BW.cs
+++ b/Project/StateMachine/_BW.cs
@@ -16,6 +16,32 @@ namespace Project
        {
            while(bBW)
            {
+                if(redisConnection == null)
+                {
+                    Console.WriteLine("redis conn : 10.131.36.205:6379");
+                    redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379");
+                }
+                else
+                {
+                    if (redisConnection.IsConnected)
+                    {
+                        if(this.db == null)
+                        {
+                            Console.WriteLine("redis connected setting db");
+                            this.db = redisConnection.GetDatabase();
+                            var getStr = this.db.StringGet("test");
+                            Console.WriteLine(getStr);
+                        }
+                    }
+                    else
+                    {
+                        Console.WriteLine("resetting redis connection");
+                        redisConnection.Dispose();
+                        redisConnection = null;
+                    }
+                }
+                
+
                System.Threading.Thread.Sleep(5000);
            }
        }
--- a/Project/StateMachine/_TMDisplay.cs
+++ b/Project/StateMachine/_TMDisplay.cs
@@ -23,6 +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;
            
        }
    }
--- a/Project/app.config
+++ b/Project/app.config
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Project.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Project.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <connectionStrings>
-        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
-            providerName="System.Data.SqlClient" />
+        <add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
    </connectionStrings>
    <userSettings>
        <Project.Properties.Settings>
@@ -26,4 +25,16 @@ namespace HelloWorld
            </setting>
        </Project.Properties.Settings>
    </userSettings>
-</configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -84,6 +84,7 @@
            this.toolStrip = new System.Windows.Forms.ToolStrip();
            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.sbRedis = new System.Windows.Forms.ToolStripStatusLabel();
            this.cmVision.SuspendLayout();
            this.statusStrip1.SuspendLayout();
            this.menuStrip1.SuspendLayout();
@@ -151,13 +152,14 @@
            // sbBCD
            // 
            this.sbBCD.Name = "sbBCD";
-            this.sbBCD.Size = new System.Drawing.Size(11, 17);
-            this.sbBCD.Text = " ";
+            this.sbBCD.Size = new System.Drawing.Size(35, 17);
+            this.sbBCD.Text = " BCD";
            // 
            // statusStrip1
            // 
            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.sbBWRun,
+            this.sbRedis,
            this.sbBCD,
            this.sbLogin});
            this.statusStrip1.Location = new System.Drawing.Point(1, 644);
@@ -514,6 +516,12 @@
            this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
            // 
+            // sbRedis
+            // 
+            this.sbRedis.Name = "sbRedis";
+            this.sbRedis.Size = new System.Drawing.Size(55, 17);
+            this.sbRedis.Text = "● REDIS";
+            // 
            // fMain
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -600,6 +608,7 @@
        private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem customerToolStripMenuItem;
        private System.Windows.Forms.ToolStripButton toolStripButton2;
+        private System.Windows.Forms.ToolStripStatusLabel sbRedis;
    }
 }

--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using StackExchange.Redis;

 namespace Project
 {
@@ -46,12 +47,23 @@ namespace Project
                e.Cancel = true;
                return;
            }
+
+            //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();
            bBW = false;    //backgroundWorker
            if (bw.IsBusy) bw.CancelAsync();
        }

+        ConnectionMultiplexer redisConnection;
+        IDatabase db;
+
        private void __Load(object sender, EventArgs e)
        {
            this.Text = Application.ProductName + " v" + Application.ProductVersion;
@@ -69,8 +81,7 @@ namespace Project
            UpdateControls();
            
            tmDisplay.Start();  //display timer
-            
-            bw.RunWorkerAsync(); //background worker
+          

            Dialog.fLogin flogIn = new Dialog.fLogin();
            if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
@@ -80,6 +91,11 @@ namespace Project

            sbLogin.Text = string.Format("{0} {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
            Pub.log.Add("Program Start");
+
+
+            bw.RunWorkerAsync(); //background worker
+
+            
        }


--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -153,16 +153,16 @@
  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPY0iaV3E9aWbN/7SKvovplX3WDFAwrd5VbGad
-        +65pVS4WcH6N664pFW4qYAUwkDS/6lLSvKqLqZW9UakVfXcYGP4zTq10sZ9Z4/5254zoX7PrPN5PrnRz
-        nVXn9mrnjJg/cxrcH88pteKFakcFqdW9fzJmlL8pmZr9Z+bKkv+7dtf/37Qi79+UZr9/VzcV/vt6rvX/
-        0cWpP4GGHl0VGsoM1YYAqY1dn1vWzvo/6+TS/337Z/1v3jrhf/ma1v/pCyv/x88p/5+3uPp/w6ra/7Vz
-        C34VT0w9Fje7PAaqFQLSWjqv1M6f/n/Xg70YePvd3f9XXdn4f+7pZf8nHJz7v2Zjz9+EeRVvoVohIKm5
-        ZXFeb/9vmKaefTOx0iA859Sy/8kLqi5AtUJAUmtranpDzx+Yorg5ZVhpEAa5AuiC1VCtEJDS0SGTVtX3
-        f/u93QQNaNo++UfcnNIWqFYEAMbE34XH14EV4fNC8Zr2j7FzylKh2hAgtaH7Xde6+XCF2PCmW9v/J86r
-        /JEws8IUqg0BUpo7TiV1tfwFptDvMJw4v+JH4vxKBJ5X/jN5QU0/VAsqACbpjNTKvq1QLukgtaxXF2jI
-        +5SqfgOoEOkgo3bi4YzqCf8yayb9T6vsR8EZNRP/p1dN/J1TNwW7F0AgvWrCjznrDgEVTvgOFYIDfHJw
-        kAU0Pa1ywu/s2sk9UCE4QJVjYAAAy1mkyv1iYtYAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIaSURBVDhPY0iaW349aWbN/7Ty3ovplX3WDFAwrd5VbGad
+        +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9USkVfXcYGP4zTq10sZ9R7f52x/SoX7Nq3d9PrnRz
+        nVnn+mrn9Jg/cxrcHs8pteKFakcFqdU9f9JnlL0pmZL9Z+bKkv+7dtf/37g879/kJr9/VzYW/vt6rvX/
+        kUWpP2fXehxdFRrKDNWGACmNXZ9b1s76P+vk0v99+2f9b9464X/5mtb/6Qsr/8fPKf+ft7j6f8Oq2v+1
+        cwt+FU1MORY3uzwGqhUC0lo6r9TOn/5/14O9GHj73d3/V13Z+H/u6WX/Jxyc+796Y8/f+HkVb6FaISCp
+        uXlxbm//b5imnn0zsdIgPOfUsv/JC6ouQLVCQFJra2p6ffcfmKK4OWVYaRAGuSJ+XvlqqFYISOnokEmr
+        6vu//d5uggY0bp/8I25OaQtUKwKkVPX+XXh8HVgRPi8Ur2n/GDunLBWqDQFS6rvfda2bD1eIDW+6tf1/
+        wrzKHwkzK0yh2hAgubnjVGJXy19gCv0OwwnzK34kzAdqgOLEuWU/kxfU9EO1oIK0ir6M1Mq+rVAu6SC1
+        rFcXmC/ep1T1G0CFSAcZtRMPZ1T3/8usmfQ/rbIfBWfUTATSE3/n1E3B7gUQSKvq/zFn3aH/6ZX936FC
+        cIBPDg4ygaanVkz4nV07uQcqBAeocgwMAAhppHUfe4MbAAAAAElFTkSuQmCC
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">