# 로그인 체크 변경

1. CS FILE NAME : UserService
-  sysplantcd : PC001 하드코딩 => app.config 에서 sysplantcd 부분 불러오기

# TRY/CATCH 없는 부분 추가
# 오류메세지 팝업박스 없는 부분 추가

DI/Agent/Services/UserService.cs

@@ -68,11 +68,10 @@ namespace Agent.Services
             }
         }
 
-        public User LoginCheck(string userId)
+        public User LoginCheck(string userId, string sysplantcd)
         {
             try
             {
-                string sysplantcd = "PC001";
                 var sql = @"
                    SELECT [user_id] as id
                         ,[emp_cd]  as emp_cd

DI/Agent/Views/LoginWindow.xaml

@@ -26,7 +26,7 @@
         </Border>
         <TextBlock TextAlignment="Center" Margin="14.092,7.872,104.68,43.128" Grid.Row="0" RenderTransformOrigin="0.497,0.855" Grid.ColumnSpan="2" Grid.RowSpan="2"><Run/><LineBreak/><Run Text="User ID"/></TextBlock>
         <TextBox x:Name="UserId" Grid.Row="0" Margin="71.894,7.872,20,48.128" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="2" />
-        <PasswordBox x:Name="UserPassword" Grid.Row="1" Margin="71.894,5.904,20,50.096" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="2"/>
+        <PasswordBox x:Name="UserPassword" Grid.Row="1" Margin="71.894,5.904,20,50.096" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="2" KeyDown="UserPassword_KeyDown"/>
         <Button Grid.Row="2" Margin="17.384,11.808,13.615,8.192" Background="#0070C0" Content="확인" FontWeight="Bold" FontSize="18" Foreground="White" Click="LoginButton_Click" Width="160" Grid.ColumnSpan="2"/>
         <TextBlock TextAlignment="Center" Margin="14.092,5.904,104.68,45.096" Grid.Row="1" RenderTransformOrigin="0.497,0.855" Grid.ColumnSpan="2" Grid.RowSpan="2"><Run/><LineBreak/><Run Text="Password"/></TextBlock>
         <Button Grid.Row="2" Margin="163.687,11.808,16.313,8.192" Background="#0070C0" Content="취소" FontWeight="Bold" FontSize="18" Foreground="White" Click="CloseButton_Click" Width="160" Grid.Column="1" Grid.ColumnSpan="2"/>

DI/Agent/Views/LoginWindow.xaml.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Security.Cryptography;
 using Agent.Services;
 using Agent.Models;
+using System.Configuration;
 using log4net;
 
 namespace Agent.Views
@@ -18,6 +19,7 @@ namespace Agent.Views
         private readonly UserService _userService = new UserService();
         private readonly User _logincheck = new User();
         private readonly LoginWindow _loginWindowPage;
+        public static readonly string _sysPlantCd = @ConfigurationManager.AppSettings["SysPlantCd"];
 
         public string ReturnValue1 = "";
         public string ReturnValue2 = "";
@@ -63,9 +65,10 @@ namespace Agent.Views
             #endregion
 
             //var user1 = _logincheck.IsMatchID(UserId.Text);
-            var user = _userService.LoginCheck(id);
-            if (null == user || !user.Password.Equals(pw))
             //if (null == user || !user.IsMatchPassword(pw))
+
+            var user = _userService.LoginCheck(id, _sysPlantCd);
+            if (null == user || !user.Password.Equals(pw))
             {
                 MessageBox.Show("아이디 또는 비밀번호가 일치하지 않습니다.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
 
@@ -228,5 +231,13 @@ namespace Agent.Views
             return Encoding.GetEncoding(1252).GetString(cipher);
             //return cipher;
         }
+
+        private void UserPassword_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.Enter)
+            {
+                this.LoginButton_Click(sender, e);
+            }
+        }
     }
 }

DI/Agent/Views/MainWindow.xaml

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

DI/Agent/Views/PolicyPage.xaml

@@ -35,7 +35,7 @@
         </Grid>
         <Grid Name="dummygrid" Margin="0,0,10,0" Visibility="Hidden">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="25"></ColumnDefinition>
+                <ColumnDefinition Width="27"></ColumnDefinition>
                 <ColumnDefinition Width="50"></ColumnDefinition>
                 <ColumnDefinition Width="100"></ColumnDefinition>
                 <ColumnDefinition Width="100"></ColumnDefinition>

DI/Agent/Views/PolicyPage.xaml.cs

@@ -96,9 +96,19 @@ namespace Agent.Views
 
         private void PP_upload_btn_Click(object sender, RoutedEventArgs e)
         {
-            var policyMonitorTid = _policyService.AddMonitor();
-            var result = _policyService.Backup();
-            _policyService.ModifyMonitor(policyMonitorTid, result.Success, result.Fail);
+            try
+            {
+                var policyMonitorTid = _policyService.AddMonitor();
+                var result = _policyService.Backup();
+                _policyService.ModifyMonitor(policyMonitorTid, result.Success, result.Fail);
+
+                
+                MessageBox.Show("즉시 Upload 되었습니다.", "Direct Upload", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
         
         private void PP_add_btn_Click(object sender, RoutedEventArgs e)
@@ -110,35 +120,42 @@ namespace Agent.Views
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
         private void PP_set_btn_Click(object sender, RoutedEventArgs e)
         {
-            var selectedItem = _policyList.FirstOrDefault(item => true == item.Selected);
-            if (null == selectedItem)
+            try
             {
-                MessageBox.Show("TAG를 설정할 정책을 선택해 주세요.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
+                var selectedItem = _policyList.FirstOrDefault(item => true == item.Selected);
+                if (null == selectedItem)
+                {
+                    MessageBox.Show("TAG를 설정할 정책을 선택해 주세요.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
 
-                return;
-            }
+                    return;
+                }
 
-            if (1 != _policyList.Count(item => true == item.Selected))
-            {
-                MessageBox.Show("한 개의 정책만 선택해 주세요.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
+                if (1 != _policyList.Count(item => true == item.Selected))
+                {
+                    MessageBox.Show("한 개의 정책만 선택해 주세요.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
 
-                return;
-            }
+                    return;
+                }
 
-            //if ("DIRECTORY".Equals(selectedItem.PolicyType))
-            //{
-            //    MessageBox.Show("파일 정책만 TAG 설정이 가능합니다.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
+                //if ("DIRECTORY".Equals(selectedItem.PolicyType))
+                //{
+                //    MessageBox.Show("파일 정책만 TAG 설정이 가능합니다.", "오류", MessageBoxButton.OK, MessageBoxImage.Error);
 
-            //    return;
-            //}
+                //    return;
+                //}
 
-            var policyTagWindow = new PolicyTagWindow(this, selectedItem);
-            policyTagWindow.ShowDialog();
+                var policyTagWindow = new PolicyTagWindow(this, selectedItem);
+                policyTagWindow.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
         private void PP_del_btn_Click(object sender, RoutedEventArgs e)
@@ -183,7 +200,7 @@ namespace Agent.Views
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
     }    

DI/Agent/Views/RestorePage.xaml.cs

@@ -109,10 +109,8 @@ namespace Agent.Views
                     MessageBox.Show(" 원본 파일 : " + _resultList[ResultList.SelectedIndex].Create_Date.ToString() + "\r\n" + " 대상 파일 : " + create_date.ToString(), "작성일자 불일치", MessageBoxButton.OK, MessageBoxImage.Warning);
 
                     return;
-
                 }
 
-
                 findHistory = ((Agent.Models.PolicyIndex)SearchList.SelectedItem).Name.ToString().Equals(dialog.SafeFileName.ToString());
                 //findHistory = SearchList.SelectedItem.ToString().Equals(create_date.ToString());
 
@@ -236,90 +234,96 @@ namespace Agent.Views
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            var idx = RP_serarch_cb.SelectedIndex;
-            var view = CollectionViewSource.GetDefaultView(_searchViewSource.View);
-            if(0 == idx)
+            try
             {
-                view.Filter = _NameFiltered;
+                var idx = RP_serarch_cb.SelectedIndex;
+                var view = CollectionViewSource.GetDefaultView(_searchViewSource.View);
+                if (0 == idx)
+                {
+                    view.Filter = _NameFiltered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (1 == idx)
-            {
-                view.Filter = _Tag1Filtered;
+                if (1 == idx)
+                {
+                    view.Filter = _Tag1Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (2 == idx)
-            {
-                view.Filter = _Tag2Filtered;
+                if (2 == idx)
+                {
+                    view.Filter = _Tag2Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (3 == idx)
-            {
-                view.Filter = _Tag3Filtered;
+                if (3 == idx)
+                {
+                    view.Filter = _Tag3Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (4 == idx)
-            {
-                view.Filter = _Tag4Filtered;
+                if (4 == idx)
+                {
+                    view.Filter = _Tag4Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (5 == idx)
-            {
-                view.Filter = _Tag5Filtered;
+                if (5 == idx)
+                {
+                    view.Filter = _Tag5Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (6 == idx)
-            {
-                view.Filter = _Tag6Filtered;
+                if (6 == idx)
+                {
+                    view.Filter = _Tag6Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (7 == idx)
-            {
-                view.Filter = _Tag7Filtered;
+                if (7 == idx)
+                {
+                    view.Filter = _Tag7Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (8 == idx)
-            {
-                view.Filter = _Tag8Filtered;
+                if (8 == idx)
+                {
+                    view.Filter = _Tag8Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (9 == idx)
-            {
-                view.Filter = _Tag9Filtered;
+                if (9 == idx)
+                {
+                    view.Filter = _Tag9Filtered;
 
-                return;
-            }
+                    return;
+                }
 
-            if (10 == idx)
-            {
-                view.Filter = _Tag10Filtered;
+                if (10 == idx)
+                {
+                    view.Filter = _Tag10Filtered;
 
-                return;
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "오류", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-
         }
 
         private bool _NameFiltered(object item)

DI/Agent/app.config

@@ -6,15 +6,21 @@
     <add key="RegPath" value="SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"/>
     <add key="ProgramName" value="DATA INTEGRITY"/>
     <add key="SysPlantCd" value="PC001"/>
+    <!--설비 관리코드-->
     <add key="EquipmentCd" value="QM-032"/>
+    <!--설비 관리사용자 계정(ID)-->
     <add key="UserCd" value="a2003850"/>
     <add key="ExceptExtension" value=".vmdk,.sln,.exe"/>
+    <!--서버 데이터베이스 주소-->
     <add key="DbServer" value="sf.tascorp.co.kr,1444"/>
+    <!--서버 데이터베이스 명-->
     <add key="DbName" value="RTEGMS_ARIBIO"/>
+    <!--서버 데이터베이스 접근권한 계정(ID)-->
     <add key="DbUser" value="VL8beHOCRrrgfMNJv4Re4A=="/>
+    <!--서버 데이터베이스 접근권한 계정(PW)-->
     <add key="DbPwd" value="UL6Fh5zKurLmhb3qESaFlrlmvTjnX3AqYkRFhUpzwhQ="/>
-
     <add key="ClientSettingsProvider.ServiceUri" value=""/>
+    <!--Daily 백업 주기     (ex : 초 분 시)-->
     <add key="jobTimer" value="0 00 02 * * ?"/>
   </appSettings>
   <system.web>