개정판 37183d04
Fix: 설치 파일 스크립트에 log4net 추가
Change-Id: Ic220c1d16f2dcc6f423fc1ddf5921c5f863f713b
| ID2.Manager/ID2.Manager.wxs | ||
|---|---|---|
| 243 | 243 |
<Component Id="cmp9DBCA795D932AB083234E0DAEF7CCCC5" Directory="INSTALLFOLDER" Guid="3E82CEE9-7046-4488-8C96-895155042409" Win64="yes"> |
| 244 | 244 |
<File Id="filDBD3D396B7182945BD91EEFC05F44BB9" KeyPath="yes" Source="$(var.SourceDir)\KCOM.exe" /> |
| 245 | 245 |
</Component> |
| 246 |
<Component Id="cmp82E7A2BA51984FF295B3BA603C9AA8FD" Directory="INSTALLFOLDER" Guid="E3485CB1-5E11-4734-9725-386DACDD460A" Win64="yes"> |
|
| 247 |
<File Id="fil89D34138673E4FDA9FF3B10252E9A762" KeyPath="yes" Source="$(var.SourceDir)\log4net.config" /> |
|
| 248 |
</Component> |
|
| 249 |
<Component Id="cmp0C05CA738C284099B0E2FB7EDEE9F1FB" Directory="INSTALLFOLDER" Guid="72D37B51-9AD6-4C7A-9D04-AA8E9BABEC27" Win64="yes"> |
|
| 250 |
<File Id="filA6BB55C94B9245AA84F296E5CF68E08B" KeyPath="yes" Source="$(var.SourceDir)\log4net.dll" /> |
|
| 251 |
</Component> |
|
| 246 | 252 |
<Component Id="cmp44B75EE95560A911A708C00BB29D72AD" Directory="INSTALLFOLDER" Guid="2BBFA6EF-32E1-4800-B838-4F5797B104C6" Win64="yes"> |
| 247 | 253 |
<File Id="fil548487577F3C736A3C5B7B0D32CB7633" KeyPath="yes" Source="$(var.SourceDir)\MARKUS.ini" /> |
| 248 | 254 |
</Component> |
| ID2.Manager/ID2.Manager/Forms/Login.cs | ||
|---|---|---|
| 83 | 83 |
{
|
| 84 | 84 |
if (!IsValidatioin()) return; |
| 85 | 85 |
|
| 86 |
|
|
| 87 |
#region ID2 Project DB 경로를 찾아 appSetting에 저장한다. |
|
| 88 |
Configuration configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None); |
|
| 89 |
string ID2SQLiteInfo = configuration.AppSettings.Settings["ID2SQLiteInfo"].Value; |
|
| 90 |
if (!System.IO.File.Exists(ID2SQLiteInfo)) |
|
| 91 |
{
|
|
| 92 |
ID2SQLiteInfo = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Digital PID", "Project.db"); |
|
| 93 |
if (!System.IO.File.Exists(ID2SQLiteInfo)) |
|
| 94 |
{
|
|
| 95 |
Telerik.WinControls.RadMessageBox.Show($"Can't find {ID2SQLiteInfo} file.");
|
|
| 96 |
|
|
| 97 |
Telerik.WinControls.UI.RadOpenFileDialog openFileDialog = new Telerik.WinControls.UI.RadOpenFileDialog(); |
|
| 98 |
openFileDialog.Filter = "SQLite|*.db|"; |
|
| 99 |
if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) |
|
| 100 |
{
|
|
| 101 |
configuration.AppSettings.Settings["ID2SQLiteInfo"].Value = openFileDialog.FileName; |
|
| 102 |
configuration.Save(); |
|
| 103 |
ConfigurationManager.RefreshSection("appSettings");
|
|
| 104 |
} |
|
| 105 |
} |
|
| 106 |
else |
|
| 107 |
{
|
|
| 108 |
configuration.AppSettings.Settings["ID2SQLiteInfo"].Value = ID2SQLiteInfo; |
|
| 109 |
configuration.Save(); |
|
| 110 |
ConfigurationManager.RefreshSection("appSettings");
|
|
| 111 |
} |
|
| 112 |
} |
|
| 113 |
#endregion |
|
| 114 |
|
|
| 115 | 86 |
//DB연결해서 체크로직추가 |
| 116 | 87 |
UserInfo userInfo = new UserController().GetUserInfo(this.radTextBoxID.Text, Globals.EncryptionSHA256(this.radTextBoxPW.Text)); |
| 117 | 88 |
|
내보내기 Unified diff
