개정판 0585d5cc
markus Api 오류 출력 되도록 수정
Change-Id: I7318ee5da1ec9b8dbfd4450a1ab7117b6b2713ea
KCOM/Events/Implementation/TopMenuEvent.cs | ||
---|---|---|
362 | 362 |
} |
363 | 363 |
catch (Exception ex) |
364 | 364 |
{ |
365 |
|
|
365 |
System.Diagnostics.Debug.WriteLine("_SaveEvent Error : " + ex.ToString()); |
|
366 | 366 |
} |
367 | 367 |
finally |
368 | 368 |
{ |
... | ... | |
388 | 388 |
/// <param name="menu"></param> |
389 | 389 |
private void ExecuteSaveCommand(MainMenu menu) |
390 | 390 |
{ |
391 |
SaveCommand.Instance.Project_No = App.ViewInfo.ProjectNO; |
|
392 |
SaveCommand.Instance.document_id = App.ViewInfo.DocumentItemID; |
|
393 |
SaveCommand.Instance.user_id = App.ViewInfo.UserID; |
|
394 |
SaveCommand.Instance.page_no = menu.pageNavigator.CurrentPage.PageNumber; |
|
395 |
|
|
396 |
try |
|
391 |
if (menu.pageNavigator.CurrentPage != null) |
|
397 | 392 |
{ |
398 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
393 |
SaveCommand.Instance.Project_No = App.ViewInfo.ProjectNO; |
|
394 |
SaveCommand.Instance.document_id = App.ViewInfo.DocumentItemID; |
|
395 |
SaveCommand.Instance.user_id = App.ViewInfo.UserID; |
|
396 |
SaveCommand.Instance.page_no = menu.pageNavigator.CurrentPage.PageNumber; |
|
397 |
|
|
398 |
try |
|
399 | 399 |
{ |
400 |
List<IKCOM.MarkupInfoItem> SelectedMarkupInfos = new List<IKCOM.MarkupInfoItem>(); |
|
401 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
|
400 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
402 | 401 |
{ |
403 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
402 |
List<IKCOM.MarkupInfoItem> SelectedMarkupInfos = new List<IKCOM.MarkupInfoItem>(); |
|
403 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
|
404 | 404 |
{ |
405 |
SelectedMarkupInfos.Add(item as IKCOM.MarkupInfoItem); |
|
405 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
406 |
{ |
|
407 |
SelectedMarkupInfos.Add(item as IKCOM.MarkupInfoItem); |
|
408 |
} |
|
406 | 409 |
} |
410 |
|
|
411 |
SaveCommand.Instance.Execute(SelectedMarkupInfos); |
|
407 | 412 |
} |
408 | 413 |
|
409 |
SaveCommand.Instance.Execute(SelectedMarkupInfos); |
|
414 |
if (ViewerDataModel.Instance.RotationDocs.Count > 0) |
|
415 |
{ |
|
416 |
SaveCommand.Instance.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
|
417 |
} |
|
410 | 418 |
} |
411 |
|
|
412 |
if (ViewerDataModel.Instance.RotationDocs.Count > 0) |
|
419 |
catch (Exception ex) |
|
413 | 420 |
{ |
414 |
SaveCommand.Instance.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
|
421 |
this.ParentOfType<MainWindow>().dzMainMenu.DialogMessage_Alert(string.Format("세이브 실패:{0}", ex.Message), "Alert"); |
|
422 |
throw ex; |
|
415 | 423 |
} |
416 | 424 |
} |
417 |
catch (Exception ex)
|
|
425 |
else
|
|
418 | 426 |
{ |
419 |
this.ParentOfType<MainWindow>().dzMainMenu.DialogMessage_Alert(string.Format("세이브 실패:{0}", ex.Message), "Alert"); |
|
420 |
throw ex; |
|
427 |
System.Diagnostics.Debug.WriteLine("ExecuteSaveCommand Error - pageNavigator.CurrentPage null"); |
|
421 | 428 |
} |
422 | 429 |
} |
423 | 430 |
|
KCOM/KCOM.csproj.user | ||
---|---|---|
13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
14 | 14 |
</PropertyGroup> |
15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMDI1IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=</StartArguments>
|
|
17 | 17 |
</PropertyGroup> |
18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
KCOM/Services/BaseServices.cs | ||
---|---|---|
224 | 224 |
|
225 | 225 |
private void BaseClient_GetDeptDataCompleted(object sender, GetDeptDataCompletedEventArgs e) |
226 | 226 |
{ |
227 |
Logger.sendResLog("GetDeptDataCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
|
227 |
if (e.Error == null) |
|
228 |
{ |
|
229 |
Logger.sendResLog("GetDeptDataCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
|
230 |
} |
|
231 |
else |
|
232 |
{ |
|
233 |
Logger.sendResLog("GetDeptDataCompleted", "\r Error :" + e.Error, 1); |
|
234 |
} |
|
228 | 235 |
|
229 | 236 |
if (e.Result != null) |
230 | 237 |
{ |
... | ... | |
232 | 239 |
//cbSymbolPublic.ItemsSource = e.Result.ToList(); |
233 | 240 |
} |
234 | 241 |
} |
242 |
|
|
235 | 243 |
public MarkupInfoItem PreviewUserMarkupInfoItem { get; set; } |
236 | 244 |
|
237 | 245 |
/// <summary> |
... | ... | |
263 | 271 |
{ |
264 | 272 |
docInfo = _DocInfo, |
265 | 273 |
Document_Id = _DocInfo.DOCUMENT_ID, |
266 |
Document_NO = _DocItem.DOCUMENT_NO, |
|
267 | 274 |
File_Original = _DocInfo.ORIGINAL_FILE, |
268 |
File_Result = _DocItem.RESULT_FILE, |
|
269 |
Group_No = _DocItem.GROUP_NO, |
|
270 |
ProjectNo = _DocItem.PROJECT_NO, |
|
271 |
Revision = _DocItem.REVISION, |
|
275 |
|
|
276 |
Document_NO = _DocItem?.DOCUMENT_NO, |
|
277 |
File_Result = _DocItem?.RESULT_FILE, |
|
278 |
Group_No = _DocItem?.GROUP_NO, |
|
279 |
ProjectNo = _DocItem?.PROJECT_NO, |
|
280 |
Revision = _DocItem?.REVISION, |
|
272 | 281 |
}; |
282 |
|
|
273 | 283 |
var instanceMain = this.ParentOfType<MainWindow>(); |
274 | 284 |
string firstpage = "1"; |
275 | 285 |
string lastpage = _DocInfo.PAGE_COUNT.ToString(); |
276 | 286 |
instanceMain.dzTopMenu.tlcurrentPage.Text = firstpage; |
277 | 287 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = lastpage; |
278 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem.DOCUMENT_NO, _DocItem.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
288 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem?.DOCUMENT_NO, _DocItem?.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
279 | 289 |
instanceMain.TitleText.Text = apptitle; |
280 | 290 |
instanceMain.Title = apptitle; |
281 | 291 |
|
... | ... | |
323 | 333 |
ViewerDataModel.Instance._markupInfoList.Clear(); |
324 | 334 |
if (e.Result.Count > 0) ViewerDataModel.Instance.MyMarkupList.Clear(); |
325 | 335 |
|
326 |
foreach(var info in e.Result) |
|
336 |
foreach (var info in e.Result)
|
|
327 | 337 |
{ |
328 | 338 |
if (info.UserID == App.ViewInfo.UserID) |
329 | 339 |
{ |
... | ... | |
337 | 347 |
ViewerDataModel.Instance._markupInfoList.Add(info); |
338 | 348 |
} |
339 | 349 |
|
340 |
var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f=>new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
|
|
350 |
var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f => new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
|
|
341 | 351 |
|
342 | 352 |
userInfoList.ToList().ForEach(x => ViewerDataModel.Instance._markupUserList.Add(x)); |
343 | 353 |
|
344 |
e.Result.ToList().ForEach(d => d.MarkupList.ForEach(p =>
|
|
354 |
e.Result.ToList().ForEach(d => |
|
345 | 355 |
{ |
346 |
if (d.UserID == App.ViewInfo.UserID) |
|
347 |
{ |
|
348 |
d.userDelete = true; |
|
349 |
d.DisplayColor = "#FFFF0000"; |
|
350 |
|
|
351 |
MarkupItemEx markup = new MarkupItemEx |
|
352 |
{ |
|
353 |
Data = p.Data, |
|
354 |
Data_Type = p.Data_Type, |
|
355 |
ID = p.ID, |
|
356 |
IsUpdate = false, |
|
357 |
MarkupInfoID = d.MarkupInfoID, |
|
358 |
PageNumber = p.PageNumber, |
|
359 |
Symbol_ID = p.Symbol_ID, |
|
360 |
//Group_ID = p.Group_ID |
|
361 |
}; |
|
362 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
|
363 |
} |
|
364 |
else |
|
356 |
if (d.MarkupList != null) |
|
365 | 357 |
{ |
366 |
MarkupItemEx markup = new MarkupItemEx
|
|
358 |
d.MarkupList.ForEach(p =>
|
|
367 | 359 |
{ |
368 |
Data = p.Data, |
|
369 |
Data_Type = p.Data_Type, |
|
370 |
ID = p.ID, |
|
371 |
IsUpdate = false, |
|
372 |
MarkupInfoID = d.MarkupInfoID, |
|
373 |
PageNumber = p.PageNumber, |
|
374 |
Symbol_ID = p.Symbol_ID, |
|
375 |
//Group_ID = p.Group_ID |
|
376 |
}; |
|
377 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
|
360 |
if (d.UserID == App.ViewInfo.UserID) |
|
361 |
{ |
|
362 |
d.userDelete = true; |
|
363 |
d.DisplayColor = "#FFFF0000"; |
|
364 |
|
|
365 |
MarkupItemEx markup = new MarkupItemEx |
|
366 |
{ |
|
367 |
Data = p.Data, |
|
368 |
Data_Type = p.Data_Type, |
|
369 |
ID = p.ID, |
|
370 |
IsUpdate = false, |
|
371 |
MarkupInfoID = d.MarkupInfoID, |
|
372 |
PageNumber = p.PageNumber, |
|
373 |
Symbol_ID = p.Symbol_ID, |
|
374 |
//Group_ID = p.Group_ID |
|
375 |
}; |
|
376 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
|
377 |
} |
|
378 |
else |
|
379 |
{ |
|
380 |
MarkupItemEx markup = new MarkupItemEx |
|
381 |
{ |
|
382 |
Data = p.Data, |
|
383 |
Data_Type = p.Data_Type, |
|
384 |
ID = p.ID, |
|
385 |
IsUpdate = false, |
|
386 |
MarkupInfoID = d.MarkupInfoID, |
|
387 |
PageNumber = p.PageNumber, |
|
388 |
Symbol_ID = p.Symbol_ID, |
|
389 |
//Group_ID = p.Group_ID |
|
390 |
}; |
|
391 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
|
392 |
} |
|
393 |
}); |
|
378 | 394 |
} |
379 |
}));
|
|
395 |
}); |
|
380 | 396 |
|
381 | 397 |
var currentUser = e.Result.Where(data => data.UserID == App.ViewInfo.UserID && data.AvoidConsolidate == 0).FirstOrDefault(); |
382 | 398 |
|
... | ... | |
652 | 668 |
} |
653 | 669 |
else |
654 | 670 |
{ |
671 |
DialogMessage_Alert("Document Information Not Found.", "Error"); |
|
672 |
|
|
655 | 673 |
BaseClient.GetCheckSystemAdminCompleted += (sen, ea) => |
656 | 674 |
{ |
657 | 675 |
Logger.sendResLog("GetCheckSystemAdminCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1); |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
585 | 585 |
} |
586 | 586 |
} |
587 | 587 |
|
588 |
/// delete markup list |
|
589 |
int iPageNo = this.pageNavigator.CurrentPage.PageNumber; |
|
588 |
if(this.pageNavigator.CurrentPage != null) |
|
589 |
{ |
|
590 |
/// delete markup list |
|
591 |
int iPageNo = this.pageNavigator.CurrentPage.PageNumber; |
|
590 | 592 |
|
591 |
var deleted = (from markup in ViewerDataModel.Instance.MyMarkupList |
|
592 |
where (markup.PageNumber == iPageNo) |
|
593 |
&& (null == ViewerDataModel.Instance.MarkupControls_USER.Where(control => control.CommentID == markup.ID).FirstOrDefault()) |
|
594 |
select markup).ToList(); |
|
593 |
var deleted = (from markup in ViewerDataModel.Instance.MyMarkupList
|
|
594 |
where (markup.PageNumber == iPageNo)
|
|
595 |
&& (null == ViewerDataModel.Instance.MarkupControls_USER.Where(control => control.CommentID == markup.ID).FirstOrDefault())
|
|
596 |
select markup).ToList();
|
|
595 | 597 |
|
596 |
foreach (var markup in deleted) |
|
598 |
foreach (var markup in deleted) |
|
599 |
{ |
|
600 |
ViewerDataModel.Instance.MyMarkupList.Remove(markup); |
|
601 |
} |
|
602 |
} |
|
603 |
else |
|
597 | 604 |
{ |
598 |
ViewerDataModel.Instance.MyMarkupList.Remove(markup);
|
|
605 |
System.Diagnostics.Debug.WriteLine("UpdateMyMarkupList : this.pageNavigator.CurrentPage null ");
|
|
599 | 606 |
} |
607 |
|
|
600 | 608 |
/// up to here |
601 | 609 |
|
602 | 610 |
//if (modified) |
KCOMDataModel/DataModel/CIModel.edmx | ||
---|---|---|
836 | 836 |
</Options> |
837 | 837 |
<!-- Diagram content (shape and connector positions) --> |
838 | 838 |
<Diagrams> |
839 |
<Diagram DiagramId="56537d79007d413b99bb660a37dd2a9f" Name="Diagram1" ZoomLevel="81">
|
|
839 |
<Diagram DiagramId="56537d79007d413b99bb660a37dd2a9f" Name="Diagram1" ZoomLevel="105">
|
|
840 | 840 |
<EntityTypeShape EntityType="CIModel.DOCUMENT_ITEM" Width="1.5" PointX="5.375" PointY="7.75" /> |
841 | 841 |
<EntityTypeShape EntityType="CIModel.DOCINFO" Width="1.5" PointX="7.375" PointY="10.125" /> |
842 | 842 |
<EntityTypeShape EntityType="CIModel.DOCPAGE" Width="1.5" PointX="9.625" PointY="8.125" /> |
KCOMDataModel/DataModel/KCOM_Model.edmx | ||
---|---|---|
407 | 407 |
</Options> |
408 | 408 |
<!-- Diagram content (shape and connector positions) --> |
409 | 409 |
<Diagrams> |
410 |
<Diagram DiagramId="4fcfe8ceef424b17a708746f51f37f67" Name="Diagram1" ZoomLevel="72">
|
|
410 |
<Diagram DiagramId="4fcfe8ceef424b17a708746f51f37f67" Name="Diagram1" ZoomLevel="124">
|
|
411 | 411 |
<EntityTypeShape EntityType="KCOMModel.CONVERTER_DOC" Width="1.5" PointX="0.75" PointY="0.75" /> |
412 | 412 |
<EntityTypeShape EntityType="KCOMModel.ERROR_LOG" Width="1.5" PointX="2.75" PointY="0.75" /> |
413 | 413 |
<EntityTypeShape EntityType="KCOMModel.PROPERTIES" Width="1.5" PointX="4.75" PointY="0.75" /> |
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user | ||
---|---|---|
10 | 10 |
</PropertyGroup> |
11 | 11 |
<ItemGroup> |
12 | 12 |
<File Include="bin/CommonLib.dll"> |
13 |
<publishTime>03/09/2020 11:28:50</publishTime>
|
|
13 |
<publishTime>03/19/2020 10:34:18</publishTime>
|
|
14 | 14 |
</File> |
15 | 15 |
<File Include="bin/CommonLib.pdb"> |
16 |
<publishTime>03/09/2020 11:28:50</publishTime>
|
|
16 |
<publishTime>03/19/2020 10:34:18</publishTime>
|
|
17 | 17 |
</File> |
18 | 18 |
<File Include="bin/CompareLib.dll"> |
19 | 19 |
<publishTime>03/27/2018 10:07:16</publishTime> |
... | ... | |
52 | 52 |
<publishTime>09/19/2015 15:28:04</publishTime> |
53 | 53 |
</File> |
54 | 54 |
<File Include="bin/IFinalPDF.dll"> |
55 |
<publishTime>03/09/2020 11:28:50</publishTime>
|
|
55 |
<publishTime>03/19/2020 10:34:18</publishTime>
|
|
56 | 56 |
</File> |
57 | 57 |
<File Include="bin/IFinalPDF.pdb"> |
58 |
<publishTime>03/09/2020 11:28:50</publishTime>
|
|
58 |
<publishTime>03/19/2020 10:34:18</publishTime>
|
|
59 | 59 |
</File> |
60 | 60 |
<File Include="bin/IKCOM.dll"> |
61 |
<publishTime>03/09/2020 11:28:53</publishTime>
|
|
61 |
<publishTime>03/19/2020 10:34:23</publishTime>
|
|
62 | 62 |
</File> |
63 | 63 |
<File Include="bin/IKCOM.pdb"> |
64 |
<publishTime>03/09/2020 11:28:53</publishTime>
|
|
64 |
<publishTime>03/19/2020 10:34:23</publishTime>
|
|
65 | 65 |
</File> |
66 | 66 |
<File Include="bin/it/ZedGraph.resources.dll"> |
67 | 67 |
<publishTime>09/19/2015 15:28:04</publishTime> |
... | ... | |
70 | 70 |
<publishTime>09/19/2015 15:28:04</publishTime> |
71 | 71 |
</File> |
72 | 72 |
<File Include="bin/KCOMDataModel.dll"> |
73 |
<publishTime>03/09/2020 11:28:51</publishTime>
|
|
73 |
<publishTime>03/19/2020 10:34:19</publishTime>
|
|
74 | 74 |
</File> |
75 | 75 |
<File Include="bin/KCOMDataModel.dll.config"> |
76 | 76 |
<publishTime>07/10/2019 14:11:36</publishTime> |
77 | 77 |
</File> |
78 | 78 |
<File Include="bin/KCOMDataModel.pdb"> |
79 |
<publishTime>03/09/2020 11:28:51</publishTime>
|
|
79 |
<publishTime>03/19/2020 10:34:19</publishTime>
|
|
80 | 80 |
</File> |
81 | 81 |
<File Include="bin/KCOM_API.dll"> |
82 |
<publishTime>03/10/2020 10:53:51</publishTime>
|
|
82 |
<publishTime>03/19/2020 10:34:58</publishTime>
|
|
83 | 83 |
</File> |
84 | 84 |
<File Include="bin/KCOM_API.pdb"> |
85 |
<publishTime>03/10/2020 10:53:51</publishTime>
|
|
85 |
<publishTime>03/19/2020 10:34:58</publishTime>
|
|
86 | 86 |
</File> |
87 | 87 |
<File Include="bin/Leadtools.Codecs.Cmp.dll"> |
88 | 88 |
<publishTime>06/29/2017 11:38:22</publishTime> |
... | ... | |
190 | 190 |
<publishTime>07/10/2019 14:11:36</publishTime> |
191 | 191 |
</File> |
192 | 192 |
<File Include="Web.config"> |
193 |
<publishTime>03/10/2020 10:53:51</publishTime>
|
|
193 |
<publishTime>03/19/2020 10:34:58</publishTime>
|
|
194 | 194 |
</File> |
195 | 195 |
</ItemGroup> |
196 | 196 |
</Project> |
KCOM_API/ServiceDeepView.svc.cs | ||
---|---|---|
25 | 25 |
[AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)] |
26 | 26 |
public partial class ServiceDeepView : System.Web.Services.WebService |
27 | 27 |
{ |
28 |
public ServiceDeepView() |
|
29 |
{ |
|
30 |
System.Diagnostics.Debug.WriteLine(OperationContext.Current.RequestContext.RequestMessage.Headers.Action.ToString()); |
|
31 |
} |
|
32 |
|
|
28 | 33 |
/// <summary> |
29 | 34 |
/// Client Version 과 Server Version 을 비교하여 Server Version 이 최신이면 다운로드 url 리턴. |
30 | 35 |
/// </summary> |
... | ... | |
65 | 70 |
url = dbvalue.VALUE; |
66 | 71 |
} |
67 | 72 |
} |
68 |
catch (Exception) |
|
73 |
catch (Exception ex)
|
|
69 | 74 |
{ |
75 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetVersionData : " + ex.ToString()); |
|
76 |
|
|
70 | 77 |
url = null; |
71 | 78 |
} |
72 | 79 |
return url; |
... | ... | |
107 | 114 |
} |
108 | 115 |
catch (Exception ex) |
109 | 116 |
{ |
117 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetSystemData : " + ex.ToString()); |
|
118 |
|
|
110 | 119 |
} |
111 | 120 |
return null; |
112 | 121 |
GC.Collect(2); |
... | ... | |
150 | 159 |
return favoriteListSet; |
151 | 160 |
} |
152 | 161 |
} |
162 |
|
|
153 | 163 |
[OperationContract] |
154 | 164 |
public bool EditFavoriteVP(string prjNo, string userID, string docID, int state, string description) |
155 | 165 |
{ |
... | ... | |
179 | 189 |
return false; |
180 | 190 |
} |
181 | 191 |
} |
182 |
catch (Exception) |
|
192 |
catch (Exception ex)
|
|
183 | 193 |
{ |
194 |
System.Diagnostics.Debug.WriteLine("KCOM_API - EditFavoriteVP : " + ex.ToString()); |
|
195 |
|
|
184 | 196 |
return false; |
185 | 197 |
} |
186 | 198 |
} |
... | ... | |
209 | 221 |
return false; |
210 | 222 |
} |
211 | 223 |
} |
212 |
catch (Exception) |
|
224 |
catch (Exception ex)
|
|
213 | 225 |
{ |
226 |
System.Diagnostics.Debug.WriteLine("KCOM_API - DelFavoriteVP : " + ex.ToString()); |
|
227 |
|
|
214 | 228 |
return false; |
215 | 229 |
} |
216 | 230 |
} |
... | ... | |
257 | 271 |
} |
258 | 272 |
catch (Exception ex) |
259 | 273 |
{ |
274 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetCompareRect : " + ex.ToString()); |
|
260 | 275 |
//throw new FaultException(ex.ToString() + " Inner Exception : " + ex.InnerException?.ToString()); |
261 | 276 |
} |
262 |
|
|
277 |
|
|
263 | 278 |
|
264 | 279 |
return result; |
265 | 280 |
} |
... | ... | |
390 | 405 |
} |
391 | 406 |
catch (Exception ex) |
392 | 407 |
{ |
408 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SetFinalPDF : " + ex.ToString()); |
|
409 |
|
|
393 | 410 |
_result.Status = FinalStatus.Error; |
394 | 411 |
|
395 | 412 |
if (ex.GetType() == typeof(System.Net.Sockets.SocketException)) |
... | ... | |
456 | 473 |
using (CIEntities entity = new CIEntities(sCIConnString)) |
457 | 474 |
{ |
458 | 475 |
var _vpList = (from docitem in entity.DOCUMENT_ITEM |
459 |
where docitem.DOCUMENT_NO == vpNo |
|
476 |
where docitem.PROJECT_NO == ProjectNo && docitem.DOCUMENT_NO == vpNo
|
|
460 | 477 |
select new VPRevision |
461 | 478 |
{ |
462 | 479 |
RevNo = docitem.REVISION, |
... | ... | |
484 | 501 |
} |
485 | 502 |
catch (Exception ex) |
486 | 503 |
{ |
487 |
|
|
488 |
throw ex; |
|
504 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetVPRevisionHistory : " + ex.ToString()); |
|
489 | 505 |
} |
490 | 506 |
finally |
491 | 507 |
{ |
492 | 508 |
GC.Collect(2); |
493 | 509 |
} |
510 |
|
|
494 | 511 |
return _result; |
495 | 512 |
} |
496 | 513 |
|
... | ... | |
504 | 521 |
using (CIEntities entity = new CIEntities(sCIConnString)) |
505 | 522 |
{ |
506 | 523 |
_result = (from docitem in entity.DOCUMENT_ITEM |
507 |
where docitem.DOCUMENT_ID == DocumentId |
|
524 |
where docitem.PROJECT_NO == ProjectNo && docitem.DOCUMENT_ID == DocumentId
|
|
508 | 525 |
select new VPRevision |
509 | 526 |
{ |
510 | 527 |
RevNo = docitem.REVISION, |
... | ... | |
516 | 533 |
}).FirstOrDefault(); |
517 | 534 |
} |
518 | 535 |
} |
519 |
catch (Exception) |
|
536 |
catch (Exception ex)
|
|
520 | 537 |
{ |
521 |
throw;
|
|
538 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetVPRevisionFirstOrDefault : " + ex.ToString());
|
|
522 | 539 |
} |
523 | 540 |
finally |
524 | 541 |
{ |
... | ... | |
550 | 567 |
} |
551 | 568 |
catch (Exception ex) |
552 | 569 |
{ |
553 |
System.Diagnostics.Trace.WriteLine("GetDocInfo Error : " + ex);
|
|
570 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocInfo : " + ex.ToString());
|
|
554 | 571 |
} |
555 | 572 |
finally |
556 | 573 |
{ |
... | ... | |
589 | 606 |
string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString; |
590 | 607 |
CIEntities entity = new CIEntities(sCIConnString); |
591 | 608 |
|
592 |
var _items = entity.DOCUMENT_ITEM.Where(data => data.DOCUMENT_ID == param.documentID); |
|
609 |
var _items = entity.DOCUMENT_ITEM.Where(data => data.PROJECT_NO == param.projectNo && data.DOCUMENT_ID == param.documentID);
|
|
593 | 610 |
|
594 | 611 |
if (_items.Count() > 0) |
595 | 612 |
{ |
... | ... | |
604 | 621 |
} |
605 | 622 |
catch (Exception ex) |
606 | 623 |
{ |
607 |
System.Diagnostics.Trace.WriteLine("GetDocumentItemInfo Error : " + ex);
|
|
624 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocumentItemInfo : " + ex.ToString());
|
|
608 | 625 |
|
609 | 626 |
new FaultException("GetDocumentItemInfo Error - " + ex.ToString()); |
610 | 627 |
//throw new FaultException(ex.ToString()); |
... | ... | |
637 | 654 |
} |
638 | 655 |
catch (Exception ex) |
639 | 656 |
{ |
657 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetDocItemID : " + ex.ToString()); |
|
640 | 658 |
//System.Diagnostics.Trace.WriteLine("GetVendorItemInfo Error : " + ex); |
641 | 659 |
//Common.Helper.SystemErrorNotify(SERVICE_NAME.API, LEVEL.MEDIUM, ERROR_TYPE.CONVERT, "GetDocumentItemInfo / " + ex.Message, param.documentID, param.projectNo); |
642 | 660 |
} |
... | ... | |
737 | 755 |
} |
738 | 756 |
} |
739 | 757 |
} |
740 |
catch (Exception EX)
|
|
758 |
catch (Exception ex)
|
|
741 | 759 |
{ |
742 |
System.Diagnostics.Debug.WriteLine(this.GetType().ToString() + " " + EX); |
|
760 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetMarkupInfoItems : " + ex.ToString()); |
|
761 |
|
|
743 | 762 |
return _result; |
744 | 763 |
} |
745 | 764 |
finally |
... | ... | |
852 | 871 |
} |
853 | 872 |
} |
854 | 873 |
} |
855 |
catch (Exception EX)
|
|
874 |
catch (Exception ex)
|
|
856 | 875 |
{ |
857 |
System.Diagnostics.Debug.WriteLine(this.GetType().ToString() + " " + EX);
|
|
876 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetSyncMarkupInfoItems : " + ex.ToString());
|
|
858 | 877 |
return _result; |
859 | 878 |
} |
860 | 879 |
finally |
... | ... | |
927 | 946 |
} |
928 | 947 |
catch (Exception ex) |
929 | 948 |
{ |
930 |
System.Diagnostics.Debug.WriteLine(ex.Message);
|
|
949 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetDeptData : " + ex.ToString());
|
|
931 | 950 |
} |
932 | 951 |
finally |
933 | 952 |
{ |
... | ... | |
972 | 991 |
} |
973 | 992 |
catch (Exception ex) |
974 | 993 |
{ |
975 |
System.Diagnostics.Trace.WriteLine(ex, "SaveMarkup");
|
|
994 |
System.Diagnostics.Debug.WriteLine("KCOM_API - DeleteMarkup : " + ex.ToString());
|
|
976 | 995 |
} |
977 | 996 |
finally |
978 | 997 |
{ |
... | ... | |
1006 | 1025 |
}); |
1007 | 1026 |
entity.SaveChanges(); |
1008 | 1027 |
} |
1009 |
catch (Exception) |
|
1028 |
catch (Exception ex)
|
|
1010 | 1029 |
{ |
1030 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SetFavoriteVP : " + ex.ToString()); |
|
1011 | 1031 |
return false; |
1012 | 1032 |
} |
1013 | 1033 |
|
... | ... | |
1121 | 1141 |
where info.ID == UserState.MarkupInfoID && info.USER_ID == user_id |
1122 | 1142 |
select info).FirstOrDefault(); |
1123 | 1143 |
} |
1124 |
catch (Exception) |
|
1144 |
catch (Exception ex)
|
|
1125 | 1145 |
{ |
1146 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData Get markup_info: " + ex.ToString()); |
|
1126 | 1147 |
markup_info = null; |
1127 | 1148 |
} |
1128 | 1149 |
|
... | ... | |
1162 | 1183 |
where info.MARKUPINFO_ID == markup_info.ID |
1163 | 1184 |
select info).FirstOrDefault(); |
1164 | 1185 |
} |
1165 |
catch (Exception) |
|
1186 |
catch (Exception ex)
|
|
1166 | 1187 |
{ |
1188 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData Get markup_info_version : " + ex.ToString()); |
|
1167 | 1189 |
markup_info_version = null; |
1168 | 1190 |
} |
1169 | 1191 |
|
... | ... | |
1206 | 1228 |
}); |
1207 | 1229 |
Entity.SaveChanges(); |
1208 | 1230 |
} |
1209 |
catch (Exception) |
|
1231 |
catch (Exception ex)
|
|
1210 | 1232 |
{ |
1233 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SaveMarkupData set mlmarkup_data : " + ex.ToString()); |
|
1211 | 1234 |
return false; |
1212 | 1235 |
} |
1213 | 1236 |
} |
... | ... | |
1239 | 1262 |
where info.ID == UserState.MarkupInfoID && info.USER_ID == user_id |
1240 | 1263 |
select info).FirstOrDefault(); |
1241 | 1264 |
} |
1242 |
catch (Exception) |
|
1265 |
catch (Exception ex)
|
|
1243 | 1266 |
{ |
1267 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData : " + ex.ToString()); |
|
1268 |
|
|
1244 | 1269 |
markup_info = null; |
1245 | 1270 |
} |
1246 | 1271 |
|
... | ... | |
1280 | 1305 |
where info.MARKUPINFO_ID == markup_info.ID |
1281 | 1306 |
select info).FirstOrDefault(); |
1282 | 1307 |
} |
1283 |
catch (Exception) |
|
1308 |
catch (Exception ex)
|
|
1284 | 1309 |
{ |
1310 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData get markup_info_version : " + ex.ToString()); |
|
1285 | 1311 |
markup_info_version = null; |
1286 | 1312 |
} |
1287 | 1313 |
|
... | ... | |
1324 | 1350 |
}); |
1325 | 1351 |
Entity.SaveChanges(); |
1326 | 1352 |
} |
1327 |
catch (Exception) |
|
1353 |
catch (Exception ex)
|
|
1328 | 1354 |
{ |
1355 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SavePageMarkupData set mlmarkup_data : " + ex.ToString()); |
|
1329 | 1356 |
return false; |
1330 | 1357 |
} |
1331 | 1358 |
} |
... | ... | |
1382 | 1409 |
Entity.SaveChanges(); |
1383 | 1410 |
} |
1384 | 1411 |
} |
1385 |
catch (Exception) |
|
1412 |
catch (Exception ex)
|
|
1386 | 1413 |
{ |
1414 |
System.Diagnostics.Debug.WriteLine("KCOM_API - UpdateMarkupData: " + ex.ToString()); |
|
1387 | 1415 |
return false; |
1388 | 1416 |
} |
1389 | 1417 |
return true; |
... | ... | |
1401 | 1429 |
uc.SaveChanges(); |
1402 | 1430 |
} |
1403 | 1431 |
} |
1404 |
catch(Exception)
|
|
1432 |
catch (Exception ex)
|
|
1405 | 1433 |
{ |
1434 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SaveSymbol: " + ex.ToString()); |
|
1406 | 1435 |
return false; |
1407 | 1436 |
} |
1408 | 1437 |
return true; |
... | ... | |
1419 | 1448 |
uc.SaveChanges(); |
1420 | 1449 |
} |
1421 | 1450 |
} |
1422 |
catch (Exception) |
|
1451 |
catch (Exception ex)
|
|
1423 | 1452 |
{ |
1453 |
System.Diagnostics.Debug.WriteLine("KCOM_API - AddPublicSymbol: " + ex.ToString()); |
|
1424 | 1454 |
return false; |
1425 | 1455 |
} |
1426 | 1456 |
return true; |
... | ... | |
1449 | 1479 |
} |
1450 | 1480 |
} |
1451 | 1481 |
} |
1452 |
catch(Exception)
|
|
1482 |
catch (Exception ex)
|
|
1453 | 1483 |
{ |
1484 |
System.Diagnostics.Debug.WriteLine("KCOM_API - DeleteSymbol : " + ex.ToString()); |
|
1485 |
|
|
1454 | 1486 |
return false; |
1455 | 1487 |
} |
1456 | 1488 |
return true; |
... | ... | |
1478 | 1510 |
} |
1479 | 1511 |
} |
1480 | 1512 |
} |
1481 |
catch (Exception) |
|
1513 |
catch (Exception ex)
|
|
1482 | 1514 |
{ |
1515 |
System.Diagnostics.Debug.WriteLine("KCOM_API - RenameSymbol: " + ex.ToString()); |
|
1483 | 1516 |
return false; |
1484 | 1517 |
} |
1485 | 1518 |
return true; |
... | ... | |
1497 | 1530 |
Entity.SaveChanges(); |
1498 | 1531 |
} |
1499 | 1532 |
} |
1500 |
catch (Exception) |
|
1533 |
catch (Exception ex)
|
|
1501 | 1534 |
{ |
1535 |
System.Diagnostics.Debug.WriteLine("KCOM_API - AddCheckListHistory: " + ex.ToString()); |
|
1502 | 1536 |
return false; |
1503 | 1537 |
} |
1504 | 1538 |
return true; |
... | ... | |
1516 | 1550 |
Entity.SaveChanges(); |
1517 | 1551 |
} |
1518 | 1552 |
} |
1519 |
catch (Exception) |
|
1553 |
catch (Exception ex)
|
|
1520 | 1554 |
{ |
1555 |
System.Diagnostics.Debug.WriteLine("KCOM_API - SaveCheckListHistory: " + ex.ToString()); |
|
1521 | 1556 |
return false; |
1522 | 1557 |
} |
1523 | 1558 |
return true; |
... | ... | |
2494 | 2529 |
{ |
2495 | 2530 |
displaycolor = _markupInfoList.Where(info => info.MarkupInfoID == markinfo.ID).First().DisplayColor; |
2496 | 2531 |
} |
2497 |
catch(Exception)
|
|
2532 |
catch (Exception ex)
|
|
2498 | 2533 |
{ |
2534 |
System.Diagnostics.Debug.WriteLine("KCOM_API - GetPrintDocItemList displaycolor : " + ex.ToString()); |
|
2535 |
|
|
2499 | 2536 |
displaycolor = "#FFFFFF"; |
2500 | 2537 |
} |
2501 | 2538 |
|
... | ... | |
2677 | 2714 |
string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString; |
2678 | 2715 |
using (CIEntities _entity = new CIEntities(sCIConnString)) |
2679 | 2716 |
{ |
2680 |
var doc = _entity.DOCUMENT_ITEM.Where(x => x.DOCUMENT_ID == document_id).FirstOrDefault(); |
|
2717 |
var doc = _entity.DOCUMENT_ITEM.Where(x => x.PROJECT_NO == project_no && x.DOCUMENT_ID == document_id).FirstOrDefault();
|
|
2681 | 2718 |
if(doc != null) |
2682 | 2719 |
{ |
2683 | 2720 |
item = new DOCUMENT_ITEM() |
... | ... | |
2977 | 3014 |
string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString; |
2978 | 3015 |
using (CIEntities _entity = new CIEntities(sCIConnString)) |
2979 | 3016 |
{ |
2980 |
var item = _entity.DOCUMENT_ITEM.Where(d => d.DOCUMENT_ID == document_id).FirstOrDefault(); |
|
3017 |
var item = _entity.DOCUMENT_ITEM.Where(d =>d.PROJECT_NO == project_no && d.DOCUMENT_ID == document_id).FirstOrDefault();
|
|
2981 | 3018 |
if (item != null) |
2982 | 3019 |
{ |
2983 | 3020 |
item.RESULT_FILE = url; |
MarkusLogview/MarkusLogview.sln | ||
---|---|---|
41 | 41 |
EndProject |
42 | 42 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LICENSE_GENERATOR", "LICENSE_GENERATOR\LICENSE_GENERATOR.csproj", "{0D3B39CC-7B6B-4CDB-B034-6EDB529D89B8}" |
43 | 43 |
EndProject |
44 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasswordGen", "PasswordGen\PasswordGen.csproj", "{621F04AD-27D2-4B50-A91E-FFE37C6AF430}" |
|
45 |
EndProject |
|
44 | 46 |
Global |
45 | 47 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
46 | 48 |
Debug|Any CPU = Debug|Any CPU |
... | ... | |
153 | 155 |
{0D3B39CC-7B6B-4CDB-B034-6EDB529D89B8}.Release|Any CPU.Build.0 = Release|Any CPU |
154 | 156 |
{0D3B39CC-7B6B-4CDB-B034-6EDB529D89B8}.Release|x86.ActiveCfg = Release|Any CPU |
155 | 157 |
{0D3B39CC-7B6B-4CDB-B034-6EDB529D89B8}.Release|x86.Build.0 = Release|Any CPU |
158 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
|
159 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
160 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Debug|x86.ActiveCfg = Debug|Any CPU |
|
161 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Debug|x86.Build.0 = Debug|Any CPU |
|
162 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
163 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Release|Any CPU.Build.0 = Release|Any CPU |
|
164 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Release|x86.ActiveCfg = Release|Any CPU |
|
165 |
{621F04AD-27D2-4B50-A91E-FFE37C6AF430}.Release|x86.Build.0 = Release|Any CPU |
|
156 | 166 |
EndGlobalSection |
157 | 167 |
GlobalSection(SolutionProperties) = preSolution |
158 | 168 |
HideSolutionNode = FALSE |
MarkusLogview/PasswordGen/App.xaml | ||
---|---|---|
1 |
<Application x:Class="PasswordGen.App" |
|
2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
4 |
xmlns:local="clr-namespace:PasswordGen" |
|
5 |
StartupUri="MainWindow.xaml"> |
|
6 |
<Application.Resources> |
|
7 |
|
|
8 |
</Application.Resources> |
|
9 |
</Application> |
MarkusLogview/PasswordGen/App.xaml.cs | ||
---|---|---|
1 |
using System; |
|
2 |
using System.Collections.Generic; |
|
3 |
using System.Configuration; |
|
4 |
using System.Data; |
|
5 |
using System.Linq; |
|
6 |
using System.Threading.Tasks; |
|
7 |
using System.Windows; |
|
8 |
|
|
9 |
namespace PasswordGen |
|
10 |
{ |
|
11 |
/// <summary> |
|
12 |
/// App.xaml에 대한 상호 작용 논리 |
|
13 |
/// </summary> |
|
14 |
public partial class App : Application |
|
15 |
{ |
|
16 |
} |
|
17 |
} |
MarkusLogview/PasswordGen/MainWindow.xaml | ||
---|---|---|
1 |
<Window x:Class="PasswordGen.MainWindow" |
|
2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
4 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|
5 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
|
6 |
xmlns:local="clr-namespace:PasswordGen" |
|
7 |
mc:Ignorable="d" |
|
8 |
Title="MainWindow" Height="450" Width="800"> |
|
9 |
<Grid> |
|
10 |
<Button Click="Button_Click"/> |
|
11 |
</Grid> |
|
12 |
</Window> |
MarkusLogview/PasswordGen/MainWindow.xaml.cs | ||
---|---|---|
1 |
using System; |
|
2 |
using System.Collections.Generic; |
|
3 |
using System.Linq; |
|
4 |
using System.Text; |
|
5 |
using System.Threading.Tasks; |
|
6 |
using System.Windows; |
|
7 |
using System.Windows.Controls; |
|
8 |
using System.Windows.Data; |
|
9 |
using System.Windows.Documents; |
|
10 |
using System.Windows.Input; |
|
11 |
using System.Windows.Media; |
|
12 |
using System.Windows.Media.Imaging; |
|
13 |
using System.Windows.Navigation; |
|
14 |
using System.Windows.Shapes; |
|
15 |
|
|
16 |
namespace PasswordGen |
|
17 |
{ |
|
18 |
/// <summary> |
|
19 |
/// MainWindow.xaml에 대한 상호 작용 논리 |
|
20 |
/// </summary> |
|
21 |
public partial class MainWindow : Window |
|
22 |
{ |
|
23 |
public MainWindow() |
|
24 |
{ |
|
25 |
InitializeComponent(); |
|
26 |
} |
|
27 |
|
|
28 |
private void Button_Click(object sender, RoutedEventArgs e) |
|
29 |
{ |
|
30 |
var pass = MARKUS_LOGVIEW.Common.CryptoHelper.SHA256Hash("dof1073#"); |
|
31 |
} |
|
32 |
} |
|
33 |
} |
MarkusLogview/PasswordGen/PasswordGen.csproj | ||
---|---|---|
1 |
<?xml version="1.0" encoding="utf-8"?> |
|
2 |
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|
3 |
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
|
4 |
<PropertyGroup> |
|
5 |
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
|
6 |
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
|
7 |
<ProjectGuid>{621F04AD-27D2-4B50-A91E-FFE37C6AF430}</ProjectGuid> |
|
8 |
<OutputType>WinExe</OutputType> |
|
9 |
<RootNamespace>PasswordGen</RootNamespace> |
|
10 |
<AssemblyName>PasswordGen</AssemblyName> |
|
11 |
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> |
|
12 |
<FileAlignment>512</FileAlignment> |
|
13 |
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> |
|
14 |
<WarningLevel>4</WarningLevel> |
|
15 |
<Deterministic>true</Deterministic> |
|
16 |
</PropertyGroup> |
|
17 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
|
18 |
<PlatformTarget>AnyCPU</PlatformTarget> |
|
19 |
<DebugSymbols>true</DebugSymbols> |
|
20 |
<DebugType>full</DebugType> |
|
21 |
<Optimize>false</Optimize> |
|
22 |
<OutputPath>bin\Debug\</OutputPath> |
|
23 |
<DefineConstants>DEBUG;TRACE</DefineConstants> |
|
24 |
<ErrorReport>prompt</ErrorReport> |
|
25 |
<WarningLevel>4</WarningLevel> |
|
26 |
</PropertyGroup> |
|
27 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
|
28 |
<PlatformTarget>AnyCPU</PlatformTarget> |
|
29 |
<DebugType>pdbonly</DebugType> |
|
30 |
<Optimize>true</Optimize> |
|
31 |
<OutputPath>bin\Release\</OutputPath> |
|
32 |
<DefineConstants>TRACE</DefineConstants> |
|
33 |
<ErrorReport>prompt</ErrorReport> |
|
34 |
<WarningLevel>4</WarningLevel> |
|
35 |
</PropertyGroup> |
|
36 |
<ItemGroup> |
|
37 |
<Reference Include="System" /> |
|
38 |
<Reference Include="System.Data" /> |
|
39 |
<Reference Include="System.Xml" /> |
|
40 |
<Reference Include="Microsoft.CSharp" /> |
|
41 |
<Reference Include="System.Core" /> |
|
42 |
<Reference Include="System.Xml.Linq" /> |
|
43 |
<Reference Include="System.Data.DataSetExtensions" /> |
|
44 |
<Reference Include="System.Net.Http" /> |
|
45 |
<Reference Include="System.Xaml"> |
|
46 |
<RequiredTargetFramework>4.0</RequiredTargetFramework> |
|
47 |
</Reference> |
|
48 |
<Reference Include="WindowsBase" /> |
|
49 |
<Reference Include="PresentationCore" /> |
|
50 |
<Reference Include="PresentationFramework" /> |
|
51 |
</ItemGroup> |
|
52 |
<ItemGroup> |
|
53 |
<ApplicationDefinition Include="App.xaml"> |
|
54 |
<Generator>MSBuild:Compile</Generator> |
|
55 |
<SubType>Designer</SubType> |
|
56 |
</ApplicationDefinition> |
|
57 |
<Page Include="MainWindow.xaml"> |
|
58 |
<Generator>MSBuild:Compile</Generator> |
|
59 |
<SubType>Designer</SubType> |
|
60 |
</Page> |
|
61 |
<Compile Include="..\MARKUS_LOGVIEW\Common\CryptoHelper.cs"> |
|
62 |
<Link>CryptoHelper.cs</Link> |
|
63 |
</Compile> |
|
64 |
<Compile Include="App.xaml.cs"> |
|
65 |
<DependentUpon>App.xaml</DependentUpon> |
|
66 |
<SubType>Code</SubType> |
|
67 |
</Compile> |
|
68 |
<Compile Include="MainWindow.xaml.cs"> |
|
69 |
<DependentUpon>MainWindow.xaml</DependentUpon> |
|
70 |
<SubType>Code</SubType> |
|
71 |
</Compile> |
|
72 |
</ItemGroup> |
|
73 |
<ItemGroup> |
|
74 |
<Compile Include="Properties\AssemblyInfo.cs"> |
|
75 |
<SubType>Code</SubType> |
|
76 |
</Compile> |
|
77 |
<Compile Include="Properties\Resources.Designer.cs"> |
|
78 |
<AutoGen>True</AutoGen> |
|
79 |
<DesignTime>True</DesignTime> |
|
80 |
<DependentUpon>Resources.resx</DependentUpon> |
|
81 |
</Compile> |
|
82 |
<Compile Include="Properties\Settings.Designer.cs"> |
|
83 |
<AutoGen>True</AutoGen> |
|
84 |
<DependentUpon>Settings.settings</DependentUpon> |
|
85 |
<DesignTimeSharedInput>True</DesignTimeSharedInput> |
|
86 |
</Compile> |
|
87 |
<EmbeddedResource Include="Properties\Resources.resx"> |
|
88 |
<Generator>ResXFileCodeGenerator</Generator> |
|
89 |
<LastGenOutput>Resources.Designer.cs</LastGenOutput> |
|
90 |
</EmbeddedResource> |
|
91 |
<None Include="Properties\Settings.settings"> |
|
92 |
<Generator>SettingsSingleFileGenerator</Generator> |
|
93 |
<LastGenOutput>Settings.Designer.cs</LastGenOutput> |
|
94 |
</None> |
|
95 |
</ItemGroup> |
|
96 |
<ItemGroup> |
|
97 |
<None Include="App.config" /> |
|
98 |
</ItemGroup> |
|
99 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
|
100 |
</Project> |
MarkusLogview/PasswordGen/Properties/AssemblyInfo.cs | ||
---|---|---|
1 |
using System.Reflection; |
|
2 |
using System.Resources; |
|
3 |
using System.Runtime.CompilerServices; |
|
4 |
using System.Runtime.InteropServices; |
|
5 |
using System.Windows; |
|
6 |
|
|
7 |
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 |
|
8 |
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 |
|
9 |
// 이러한 특성 값을 변경하세요. |
|
10 |
[assembly: AssemblyTitle("PasswordGen")] |
|
11 |
[assembly: AssemblyDescription("")] |
|
12 |
[assembly: AssemblyConfiguration("")] |
|
13 |
[assembly: AssemblyCompany("")] |
|
14 |
[assembly: AssemblyProduct("PasswordGen")] |
|
15 |
[assembly: AssemblyCopyright("Copyright © 2020")] |
|
16 |
[assembly: AssemblyTrademark("")] |
|
17 |
[assembly: AssemblyCulture("")] |
|
18 |
|
|
19 |
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 |
|
20 |
// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 |
|
21 |
// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. |
|
22 |
[assembly: ComVisible(false)] |
|
23 |
|
|
24 |
//지역화 가능 응용 프로그램 빌드를 시작하려면 다음을 설정하세요. |
|
25 |
//.csproj 파일에서 <PropertyGroup> 내에 <UICulture>CultureYouAreCodingWith</UICulture>를 |
|
26 |
//설정하십시오. 예를 들어 소스 파일에서 영어(미국)를 |
|
27 |
//사용하는 경우 <UICulture>를 en-US로 설정합니다. 그런 다음 아래 |
|
28 |
//NeutralResourceLanguage 특성의 주석 처리를 제거합니다. 아래 줄의 "en-US"를 업데이트하여 |
|
29 |
//프로젝트 파일의 UICulture 설정과 일치시킵니다. |
|
30 |
|
|
31 |
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] |
|
32 |
|
|
33 |
|
|
34 |
[assembly: ThemeInfo( |
|
35 |
ResourceDictionaryLocation.None, //테마별 리소스 사전의 위치 |
|
36 |
//(페이지 또는 응용 프로그램 리소스 사진에 |
|
37 |
// 리소스가 없는 경우에 사용됨) |
|
38 |
ResourceDictionaryLocation.SourceAssembly //제네릭 리소스 사전의 위치 |
|
39 |
//(페이지 또는 응용 프로그램 리소스 사진에 |
|
40 |
// 리소스가 없는 경우에 사용됨) |
|
41 |
)] |
|
42 |
|
|
43 |
|
|
44 |
// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. |
|
45 |
// |
|
46 |
// 주 버전 |
|
47 |
// 부 버전 |
|
48 |
// 빌드 번호 |
|
49 |
// 수정 버전 |
|
50 |
// |
|
51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
|
52 |
// 지정되도록 할 수 있습니다. |
|
53 |
// [assembly: AssemblyVersion("1.0.*")] |
|
54 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
55 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
MarkusLogview/PasswordGen/Properties/Resources.Designer.cs | ||
---|---|---|
1 |
//------------------------------------------------------------------------------ |
|
2 |
// <auto-generated> |
|
3 |
// 이 코드는 도구를 사용하여 생성되었습니다. |
|
4 |
// 런타임 버전:4.0.30319.42000 |
|
5 |
// |
|
6 |
// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 |
|
7 |
// 이러한 변경 내용이 손실됩니다. |
|
8 |
// </auto-generated> |
|
9 |
//------------------------------------------------------------------------------ |
|
10 |
|
|
11 |
namespace PasswordGen.Properties |
|
12 |
{ |
|
13 |
|
|
14 |
|
|
15 |
/// <summary> |
|
16 |
/// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. |
|
17 |
/// </summary> |
|
18 |
// 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder |
|
19 |
// 클래스에서 자동으로 생성되었습니다. |
|
20 |
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 |
|
21 |
// ResGen을 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. |
|
22 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] |
|
23 |
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
|
24 |
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
|
25 |
internal class Resources |
|
26 |
{ |
|
27 |
|
|
28 |
private static global::System.Resources.ResourceManager resourceMan; |
|
29 |
|
|
30 |
private static global::System.Globalization.CultureInfo resourceCulture; |
|
31 |
|
|
32 |
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] |
|
33 |
internal Resources() |
|
34 |
{ |
|
35 |
} |
|
36 |
|
|
37 |
/// <summary> |
|
38 |
/// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. |
|
39 |
/// </summary> |
|
40 |
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
|
41 |
internal static global::System.Resources.ResourceManager ResourceManager |
|
42 |
{ |
|
43 |
get |
|
44 |
{ |
|
45 |
if ((resourceMan == null)) |
|
46 |
{ |
|
47 |
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PasswordGen.Properties.Resources", typeof(Resources).Assembly); |
|
48 |
resourceMan = temp; |
|
49 |
} |
|
50 |
return resourceMan; |
|
51 |
} |
|
52 |
} |
|
53 |
|
|
54 |
/// <summary> |
|
55 |
/// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을 |
|
56 |
/// 재정의합니다. |
|
57 |
/// </summary> |
|
58 |
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
|
59 |
internal static global::System.Globalization.CultureInfo Culture |
|
60 |
{ |
|
61 |
get |
|
62 |
{ |
|
63 |
return resourceCulture; |
|
64 |
} |
|
65 |
set |
|
66 |
{ |
|
67 |
resourceCulture = value; |
|
68 |
} |
|
69 |
} |
|
70 |
} |
|
71 |
} |
MarkusLogview/PasswordGen/Properties/Resources.resx | ||
---|---|---|
1 |
<?xml version="1.0" encoding="utf-8"?> |
|
2 |
<root> |
|
3 |
<!-- |
|
4 |
Microsoft ResX Schema |
|
5 |
|
|
6 |
Version 2.0 |
|
7 |
|
|
8 |
The primary goals of this format is to allow a simple XML format |
|
9 |
that is mostly human readable. The generation and parsing of the |
|
10 |
various data types are done through the TypeConverter classes |
|
11 |
associated with the data types. |
|
12 |
|
|
13 |
Example: |
|
14 |
|
|
15 |
... ado.net/XML headers & schema ... |
|
16 |
<resheader name="resmimetype">text/microsoft-resx</resheader> |
|
17 |
<resheader name="version">2.0</resheader> |
|
18 |
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> |
|
19 |
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> |
|
20 |
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> |
|
21 |
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> |
|
22 |
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> |
|
23 |
<value>[base64 mime encoded serialized .NET Framework object]</value> |
|
24 |
</data> |
|
25 |
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> |
|
26 |
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> |
|
27 |
<comment>This is a comment</comment> |
|
28 |
</data> |
|
29 |
|
|
30 |
There are any number of "resheader" rows that contain simple |
|
31 |
name/value pairs. |
|
32 |
|
|
33 |
Each data row contains a name, and value. The row also contains a |
|
34 |
type or mimetype. Type corresponds to a .NET class that support |
|
35 |
text/value conversion through the TypeConverter architecture. |
|
36 |
Classes that don't support this are serialized and stored with the |
|
37 |
mimetype set. |
|
38 |
|
|
39 |
The mimetype is used for serialized objects, and tells the |
|
40 |
ResXResourceReader how to depersist the object. This is currently not |
|
41 |
extensible. For a given mimetype the value must be set accordingly: |
|
42 |
|
|
43 |
Note - application/x-microsoft.net.object.binary.base64 is the format |
|
44 |
that the ResXResourceWriter will generate, however the reader can |
|
45 |
read any of the formats listed below. |
|
46 |
|
|
47 |
mimetype: application/x-microsoft.net.object.binary.base64 |
|
48 |
value : The object must be serialized with |
|
49 |
: System.Serialization.Formatters.Binary.BinaryFormatter |
|
50 |
: and then encoded with base64 encoding. |
|
51 |
|
|
52 |
mimetype: application/x-microsoft.net.object.soap.base64 |
|
53 |
value : The object must be serialized with |
|
54 |
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter |
|
55 |
: and then encoded with base64 encoding. |
|
56 |
|
|
57 |
mimetype: application/x-microsoft.net.object.bytearray.base64 |
|
58 |
value : The object must be serialized into a byte array |
|
59 |
: using a System.ComponentModel.TypeConverter |
|
60 |
: and then encoded with base64 encoding. |
|
61 |
--> |
|
62 |
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> |
|
63 |
<xsd:element name="root" msdata:IsDataSet="true"> |
|
64 |
<xsd:complexType> |
|
65 |
<xsd:choice maxOccurs="unbounded"> |
|
66 |
<xsd:element name="metadata"> |
|
67 |
<xsd:complexType> |
|
68 |
<xsd:sequence> |
|
69 |
<xsd:element name="value" type="xsd:string" minOccurs="0" /> |
|
70 |
</xsd:sequence> |
|
71 |
<xsd:attribute name="name" type="xsd:string" /> |
|
72 |
<xsd:attribute name="type" type="xsd:string" /> |
|
73 |
<xsd:attribute name="mimetype" type="xsd:string" /> |
|
74 |
</xsd:complexType> |
|
75 |
</xsd:element> |
|
76 |
<xsd:element name="assembly"> |
|
77 |
<xsd:complexType> |
|
78 |
<xsd:attribute name="alias" type="xsd:string" /> |
|
79 |
<xsd:attribute name="name" type="xsd:string" /> |
|
80 |
</xsd:complexType> |
|
81 |
</xsd:element> |
|
82 |
<xsd:element name="data"> |
|
83 |
<xsd:complexType> |
|
84 |
<xsd:sequence> |
|
85 |
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
|
86 |
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> |
|
87 |
</xsd:sequence> |
|
88 |
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> |
|
89 |
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> |
|
90 |
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> |
|
91 |
</xsd:complexType> |
|
92 |
</xsd:element> |
|
93 |
<xsd:element name="resheader"> |
|
94 |
<xsd:complexType> |
|
95 |
<xsd:sequence> |
|
96 |
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> |
|
97 |
</xsd:sequence> |
|
98 |
<xsd:attribute name="name" type="xsd:string" use="required" /> |
|
99 |
</xsd:complexType> |
|
100 |
</xsd:element> |
|
101 |
</xsd:choice> |
|
102 |
</xsd:complexType> |
|
103 |
</xsd:element> |
|
104 |
</xsd:schema> |
|
105 |
<resheader name="resmimetype"> |
|
106 |
<value>text/microsoft-resx</value> |
|
107 |
</resheader> |
|
108 |
<resheader name="version"> |
|
109 |
<value>2.0</value> |
|
110 |
</resheader> |
|
111 |
<resheader name="reader"> |
|
112 |
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
|
113 |
</resheader> |
|
114 |
<resheader name="writer"> |
|
115 |
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
|
116 |
</resheader> |
|
117 |
</root> |
MarkusLogview/PasswordGen/Properties/Settings.Designer.cs | ||
---|---|---|
1 |
//------------------------------------------------------------------------------ |
|
2 |
// <auto-generated> |
|
3 |
// This code was generated by a tool. |
|
4 |
// Runtime Version:4.0.30319.42000 |
|
5 |
// |
|
6 |
// Changes to this file may cause incorrect behavior and will be lost if |
|
7 |
// the code is regenerated. |
|
8 |
// </auto-generated> |
|
9 |
//------------------------------------------------------------------------------ |
|
10 |
|
|
11 |
namespace PasswordGen.Properties |
|
12 |
{ |
|
13 |
|
|
14 |
|
|
15 |
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
|
16 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] |
|
17 |
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase |
|
18 |
{ |
|
19 |
|
|
20 |
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); |
|
21 |
|
|
22 |
public static Settings Default |
|
23 |
{ |
|
24 |
get |
|
25 |
{ |
|
26 |
return defaultInstance; |
|
27 |
} |
|
28 |
} |
|
29 |
} |
|
30 |
} |
MarkusLogview/PasswordGen/Properties/Settings.settings | ||
---|---|---|
1 |
<?xml version='1.0' encoding='utf-8'?> |
|
2 |
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> |
|
3 |
<Profiles> |
|
4 |
<Profile Name="(Default)" /> |
|
5 |
</Profiles> |
|
6 |
<Settings /> |
|
7 |
</SettingsFile> |
내보내기 Unified diff