[DI]

1. DI_HISTORY_TEST_240510 으로 분기 했던 내용 원복
2. .net 버전 변경 (4.5.2)

DI/Agent/Agent.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Agent</RootNamespace>
     <AssemblyName>DI</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

DI/Agent/Services/PolicyService.cs

@@ -62,7 +62,7 @@ namespace Agent.Services
                             ,[custom_tag1]
                             ,[custom_tag2]
                             ,[custom_tag3]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy]
+                        FROM [di_policy]
                         WHERE 1=1
                         AND user_tid = @UserTid
                         AND is_delete = 0
@@ -106,7 +106,7 @@ namespace Agent.Services
                             ,[custom_tag8]
                             ,[custom_tag9]
                             ,[custom_tag10]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy]
+                        FROM [di_policy]
                         WHERE 1=1
                         AND user_tid = @UserTid
                         AND is_delete = 0
@@ -138,7 +138,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = $@"
-                        UPDATE [DI_HISTORY_TEST_240510].[dbo].[di_policy]
+                        UPDATE [di_policy]
                         SET [is_delete] = 1
                         WHERE tid = @PolicyTid
                     ";
@@ -167,7 +167,7 @@ namespace Agent.Services
             {
                 var userTid = Application.Current.Properties["user_tid"];
                 var sql = @"
-                    INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_policy]
+                    INSERT INTO [di_policy]
                         ([user_tid]
                         ,[path]
                         ,[type]
@@ -250,7 +250,7 @@ namespace Agent.Services
 
                 var sql = $@"
                     SELECT COUNT(*)
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy]
+                    FROM [di_policy]
                     WHERE 1=1
                     AND user_tid = @UserTid
                     AND is_delete = 0
@@ -277,7 +277,7 @@ namespace Agent.Services
                         ,[path]
                         ,[create_date]
                         ,[last_update]
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_index]
+                    FROM [di_policy_index]
                     WHERE 1=1
                     AND policy_tid = @PolicyTid
                     AND path = @Path
@@ -304,7 +304,7 @@ namespace Agent.Services
             try
             {
                 var sql = $@"
-                    INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_policy_index]
+                    INSERT INTO [di_policy_index]
                         ([policy_tid]
                         ,[name]
                         ,[path]
@@ -350,7 +350,7 @@ namespace Agent.Services
                 using (var con = new SqlConnection(App._myConnection))
                 {
                     var sql = @"
-                        UPDATE [DI_HISTORY_TEST_240510].[dbo].[di_policy] 
+                        UPDATE [di_policy] 
                         SET custom_tag1 = @Tag1
                             ,custom_tag2 = @Tag2
                             ,custom_tag3 = @Tag3
@@ -415,7 +415,7 @@ namespace Agent.Services
                             ,[test_no]
                             ,[work_emp]
                             ,[upload_date]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_history]
+                        FROM [di_policy_history]
                         WHERE file_ck = '1'
                         AND policy_tid = @PolicyTid
                         AND policy_index_tid = @policyIndexTid
@@ -898,7 +898,7 @@ namespace Agent.Services
                     Equip_Cd = policyEquip_Cd.Trim();
                 }
                 var sql = $@"
-                    INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_policy_history]
+                    INSERT INTO [di_policy_history]
                         ([policy_tid]
                         ,[policy_index_tid]
                         ,[file_ck]
@@ -1016,7 +1016,7 @@ namespace Agent.Services
                         ,[insert_emp]
                         ,[sys_plant_cd]
 
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_history]
+                    FROM [di_policy_history]
                     WHERE  [backup_file_id] = @backup_file_id
                 ";
 
@@ -1029,8 +1029,8 @@ namespace Agent.Services
 
                 };
 
-                //var sql1 = sql.Replace("chang_dbName", App._dbName + "_at.[dbo].[di_policy_history_at] ");
-                var sql1 = sql.Replace("chang_dbName", "DI_HISTORY_TEST_240510_at.[dbo].[di_policy_history_at] ");
+                var sql1 = sql.Replace("chang_dbName", App._dbName + "_at.[dbo].[di_policy_history_at] ");
+                //var sql1 = sql.Replace("chang_dbName", "DI_HISTORY_TEST_240510_at.[dbo].[di_policy_history_at] ");
 
                 return 0 < con.Execute(sql1, data, transaction);
             }
@@ -1254,7 +1254,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = @"
-                        INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_policy_monitor]
+                        INSERT INTO [di_policy_monitor]
                             ([user_tid]
                             ,[start_date]
                             ,[end_date]
@@ -1305,7 +1305,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = @"
-                        UPDATE [DI_HISTORY_TEST_240510].[dbo].[di_policy_monitor]
+                        UPDATE [di_policy_monitor]
                         SET [end_date] = GETDATE()
                             ,[is_done] = 1
                             ,[success_count] = @Success
@@ -1346,7 +1346,7 @@ namespace Agent.Services
                             ,[is_done]
                             ,[success_count]
                             ,[fail_count]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_monitor]
+                        FROM [di_policy_monitor]
                         WHERE user_tid = @UserTid
                         AND is_done = 1
                         ORDER BY start_date DESC
@@ -1421,7 +1421,7 @@ namespace Agent.Services
 
                 var sql = @"
                     SELECT COUNT(*)
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_history]
+                    FROM [di_policy_history]
                     WHERE file_ck = '1'
                     AND policy_tid = @PolicyTid
                     AND policy_index_tid = @PolicyIndexTid
@@ -1456,7 +1456,7 @@ namespace Agent.Services
 
                 var sql = @"
                     SELECT TOP 1 hash
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy_history]
+                    FROM [di_policy_history]
                     WHERE 1=1
                     AND policy_tid = @PolicyTid
                     AND policy_index_tid = @PolicyIndexTid
@@ -1505,8 +1505,8 @@ namespace Agent.Services
                             ,T1.[custom_tag8]
                             ,T1.[custom_tag9]
                             ,T1.[custom_tag10]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy] T1 
-                        INNER JOIN [DI_HISTORY_TEST_240510].[dbo].[di_policy_index] T2 ON T1.tid = T2.policy_tid
+                        FROM [di_policy] T1 
+                        INNER JOIN [di_policy_index] T2 ON T1.tid = T2.policy_tid
                         WHERE 1=1
                         AND T1.user_tid = @UserTid
                         AND T1.is_delete = 0

DI/Agent/Services/ReportService.cs

@@ -34,7 +34,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = $@"
-                        INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_report]
+                        INSERT INTO [di_report]
                             ([user_tid]
                             ,[policy_tid]
                             ,[name]
@@ -139,7 +139,7 @@ namespace Agent.Services
                             ,dbo.FN_WORK_TYPE_NM([work_type]) AS [work_type]
                             ,[create_date]
                             ,[is_fail]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_report]
+                        FROM [di_report]
                         WHERE user_tid = @UserTid
                         ORDER BY [create_date] DESC
                     ";
@@ -178,7 +178,7 @@ namespace Agent.Services
                             ,dbo.FN_WORK_TYPE_NM([work_type]) AS [work_type]
                             ,[create_date]
                             ,[is_fail]
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_report]
+                        FROM [di_report]
                         WHERE 1=1
                         AND user_tid = @UserTid
                         AND ([create_date] >= @MinDate AND [create_date] <= @MaxDate)

DI/Agent/Services/UserService.cs

@@ -49,7 +49,7 @@ namespace Agent.Services
                         ,[tag8]
                         ,[tag9]
                         ,[tag10]
-                    FROM [DI_HISTORY_TEST_240510].[dbo].[di_user]
+                    FROM [di_user]
                     WHERE id = @UserId
                 ";
 
@@ -113,7 +113,7 @@ namespace Agent.Services
 
                     var sql = @"
                         SELECT COUNT(*)
-                        FROM [DI_HISTORY_TEST_240510].[dbo].[di_user]
+                        FROM [di_user]
                         WHERE id = @Id
                     ";
 
@@ -144,7 +144,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = @"
-                        INSERT INTO [DI_HISTORY_TEST_240510].[dbo].[di_user]
+                        INSERT INTO [di_user]
                             ([id]
                             ,[name]
                             ,[create_date]
@@ -310,7 +310,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = @"
-                        UPDATE [DI_HISTORY_TEST_240510].[dbo].[di_user ]
+                        UPDATE [di_user ]
                         SET [is_startup] = @IsStartup
                             ,[is_retry] = @IsRetry
                             ,[is_limit] = @IsLimit
@@ -393,7 +393,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = $@"
-                    INSERT  INTO DI_HISTORY_TEST_240510_at.[dbo].[di_policy_at]" +
+                    INSERT  INTO " + App._dbName + "_at.[dbo].[di_policy_at]" +
                         "([audit_Gubun], [audit_emp_cd], [audit_timestamp],  [audit_remark], [tid]," +
                          "[user_tid],    [create_Date],  [is_delete],    [sys_plant_cd],  [path]," +
                          "[type],    [custom_tag1],  [custom_tag2],   [custom_tag3], [custom_tag4]," +
@@ -405,7 +405,7 @@ namespace Agent.Services
                          "[type],    [custom_tag1],  [custom_tag2],   [custom_tag3], [custom_tag4]," +
                          "[custom_tag5], [custom_tag6],  [custom_tag7],  [custom_tag8],  [custom_tag9],  [custom_tag10]" +
 
-                    "FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy]" +
+                    "FROM [di_policy]" +
                     "WHERE  [user_tid] = @usertid and [path] = @audit_Remark and is_delete = 0";
 
                     var data = new
@@ -416,7 +416,7 @@ namespace Agent.Services
                         usertid = usertid
                     };
 
-                    var sql1 = sql.Replace("chang_dbName", "DI_HISTORY_TEST_240510_at.[dbo].[di_policy_at] ");
+                    var sql1 = sql.Replace("chang_dbName", App._dbName + "_at.[dbo].[di_policy_at] ");
                     return con.Query<User>(sql, data).SingleOrDefault();
                 }
             }
@@ -437,7 +437,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = $@"
-                    INSERT  INTO DI_HISTORY_TEST_240510_at.[dbo].[di_policy_at]" +
+                    INSERT  INTO " + App._dbName + "_at.[dbo].[di_policy_at]" +
                         "([audit_Gubun], [audit_emp_cd], [audit_timestamp],  [audit_remark], [tid]," +
                          "[user_tid],    [create_Date],  [is_delete],    [sys_plant_cd],  [path]," +
                          "[type],    [custom_tag1],  [custom_tag2],   [custom_tag3], [custom_tag4]," +
@@ -449,7 +449,7 @@ namespace Agent.Services
                          "[type],    [custom_tag1],  [custom_tag2],   [custom_tag3], [custom_tag4]," +
                          "[custom_tag5], [custom_tag6],  [custom_tag7],  [custom_tag8],  [custom_tag9],  [custom_tag10]" +
 
-                    "FROM [DI_HISTORY_TEST_240510].[dbo].[di_policy]" +
+                    "FROM [di_policy]" +
                     "WHERE  [tid] = @tid";
 
                     var data = new
@@ -461,7 +461,7 @@ namespace Agent.Services
                         usertid = usertid
                     };
 
-                    var sql1 = sql.Replace("chang_dbName", "DI_HISTORY_TEST_240510_at.[dbo].[di_policy_at] ");
+                    var sql1 = sql.Replace("chang_dbName", App._dbName + "_at.[dbo].[di_policy_at] ");
                     return con.Query<User>(sql, data).SingleOrDefault();
                 }
             }
@@ -487,7 +487,7 @@ namespace Agent.Services
                     con.Open();
 
                     var sql = $@"
-                    INSERT  INTO DI_HISTORY_TEST_240510_at.[dbo].[di_user_at]" +
+                    INSERT  INTO " + App._dbName + "_at.[dbo].[di_user_at]" +
                         "([audit_Gubun], [audit_emp_cd], [audit_timestamp], [audit_remark], [tid]," +
                          "[create_Date]," +
                          "[is_startup],  [is_retry], [is_limit], [is_hash], [name]," +
@@ -503,7 +503,7 @@ namespace Agent.Services
                          "@tag1, @tag2, @tag3, @tag4, @tag5," +
                          "@tag6, @tag7, @tag8, @tag9, @tag10 " +
 
-                    "FROM [DI_HISTORY_TEST_240510].[dbo].[di_user] " +
+                    "FROM [di_user] " +
                     "WHERE  [tid] = @UserTid";
 
                     var data = new

DI/Agent/Views/HashChkWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
-        Title="위변조 점검" Height="220" Width="400" Topmost="True">
+        Title="위변조 점검" Height="220" Width="400" Topmost="False">
     <Window.Resources>
         <Style TargetType="{x:Type GridViewColumnHeader}">
             <Setter Property="HorizontalContentAlignment" Value="Center" />

DI/Agent/Views/LoginWindow.xaml

@@ -8,7 +8,7 @@
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="White"
-        Topmost="True"
+        Topmost="False"
         Title="LoginWindow" Height="154.427" Width="360">
     <Grid>
         <Grid.ColumnDefinitions>

DI/Agent/Views/MainWindow.xaml

@@ -7,7 +7,7 @@
         Closing="Window_Closing"
         ResizeMode="CanMinimize"
         WindowStartupLocation="CenterScreen"
-        Title="MainWindow" Height="692" Width="1030" Topmost="True">
+        Title="MainWindow" Height="692" Width="1030" Topmost="False">
     <Window.Resources>
         <Style x:Key="Flat">
             <Setter Property="Control.Background" Value="{x:Null}" />

DI/Agent/Views/PolicySelectWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Agent.Views"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="정책 추가" Height="140" Width="270" Topmost="True" ResizeMode="NoResize">
+        Title="정책 추가" Height="140" Width="270" Topmost="False" ResizeMode="NoResize">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>

DI/Agent/Views/PolicyTagWindow.xaml

@@ -6,7 +6,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Loaded="Window_Loaded"
-        Title="TAG 설정" Height="560" Width="270" Topmost="True" ResizeMode="NoResize">
+        Title="TAG 설정" Height="560" Width="270" Topmost="False" ResizeMode="NoResize">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>

DI/Agent/Views/RestoreSign.xaml

@@ -6,4 +6,4 @@
         xmlns:local="clr-namespace:Agent.Views"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="정책 추가" Height="140" Width="270" Topmost="True" ResizeMode="NoResize"/>
+        Title="정책 추가" Height="140" Width="270" Topmost="False" ResizeMode="NoResize"/>

DI/Agent/app.config

@@ -3,39 +3,39 @@
   <configSections>
   </configSections>
   <appSettings>
-    <add key="RegPath" value="SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run" />
-    <add key="ProgramName" value="DATA INTEGRITY" />
-    <add key="SysPlantCd" value="PC001" />
+    <add key="RegPath" value="SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"/>
+    <add key="ProgramName" value="DATA INTEGRITY"/>
+    <add key="SysPlantCd" value="PC001"/>
     <!--설비 관리코드-->
-    <add key="EquipmentCd" value="" />
+    <add key="EquipmentCd" value=""/>
     <!--설비 관리사용자 계정(ID)-->
-    <add key="UserCd" value="a2003850" />
-    <add key="ExceptExtension" value=".vmdk,.sln,.exe" />
+    <add key="UserCd" value="a2003850"/>
+    <add key="ExceptExtension" value=".vmdk,.sln,.exe"/>
     <!--서버 데이터베이스 주소-->
-    <add key="DbServer" value="sf.tascorp.co.kr,1444" />
+    <add key="DbServer" value="192.168.8.45,5100"/>
     <!--서버 데이터베이스 명-->
-    <add key="DbName" value="NEW_GMS" />
+    <add key="DbName" value="RTEGMS_HUVIST"/>
     <!--서버 데이터베이스 접근권한 계정(ID)-->
-    <add key="DbUser" value="VL8beHOCRrrgfMNJv4Re4A==" />
+    <add key="DbUser" value="VL8beHOCRrrgfMNJv4Re4A=="/>
     <!--서버 데이터베이스 접근권한 계정(PW)-->
-    <add key="DbPwd" value="UL6Fh5zKurLmhb3qESaFlrlmvTjnX3AqYkRFhUpzwhQ=" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="DbPwd" value="pQku1gs2D9zc8eISxO/U+w=="/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
     <!--Daily 백업 주기     (ex : 초 분 시)-->
-    <add key="jobTimer" value="0 00 02 * * ?" />
+    <add key="jobTimer" value="0 00 02 * * ?"/>
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager enabled="true" defaultProvider="ClientRoleProvider">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
   <startup>
-    <supportedRuntime version="v2.0.50727" />
-  </startup>
-</configuration>
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup>
+</configuration>

DI/Agent/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Common.Logging" version="3.3.1" targetFramework="net35" />
-  <package id="Common.Logging.Core" version="3.3.1" targetFramework="net35" />
-  <package id="Dapper" version="1.42" targetFramework="net35" />
-  <package id="log4net" version="2.0.15" targetFramework="net35" />
-  <package id="Quartz" version="2.6.2" targetFramework="net35" />
+  <package id="Common.Logging" version="3.3.1" targetFramework="net35" requireReinstallation="true" />
+  <package id="Common.Logging.Core" version="3.3.1" targetFramework="net35" requireReinstallation="true" />
+  <package id="Dapper" version="1.42" targetFramework="net35" requireReinstallation="true" />
+  <package id="log4net" version="2.0.15" targetFramework="net35" requireReinstallation="true" />
+  <package id="Quartz" version="2.6.2" targetFramework="net35" requireReinstallation="true" />
 </packages>