개정판 a7372e37
kcom_Api 수정
Change-Id: I9dcefa2c90444f26fdc5bb68ee5c1092f172c9dc
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
| 14 | 14 |
</PropertyGroup> |
| 15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments>
|
|
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIyNjA3IiwiYlBhcnRuZXIiOiJGYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoib2wxIiwiVXNlcklEIjoiYnN5b29uIiwiTW9kZSI6MH0=/</StartArguments>
|
|
| 17 | 17 |
</PropertyGroup> |
| 18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| ... | ... | |
| 62 | 62 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| 63 | 63 |
</PropertyGroup> |
| 64 | 64 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x86'"> |
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6Ijc2NzEiLCJiUGFydG5lciI6ImZhbHNlIiwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoiZmFsc2UiLCJOZXdDb21tZW50UGVybWlzc2lvbiI6ImZhbHNlIiwiUHJvamVjdE5PIjoiUFA0IiwiVXNlcklEIjoiUkVQT0lOVFxcc3lzdGVtIiwiTW9kZSI6MH0=/</StartArguments>
|
|
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE2MzgwIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IkxQRyIsIlVzZXJJRCI6ImJzeW9vbiIsIk1vZGUiOjB9/</StartArguments>
|
|
| 66 | 66 |
</PropertyGroup> |
| 67 | 67 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> |
| 68 | 68 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
| KCOM/PageManager/PageStorage.cs | ||
|---|---|---|
| 97 | 97 |
|
| 98 | 98 |
PageImage = BitmapFrame.Create(pageItem.LocalUri, BitmapCreateOptions.None, BitmapCacheOption.OnLoad); |
| 99 | 99 |
} |
| 100 |
catch (Exception ex)
|
|
| 100 |
catch (Exception) |
|
| 101 | 101 |
{
|
| 102 |
throw new Exception("GetPageAsync(string BasePageUri,int PageNo)", ex);
|
|
| 102 |
PageImage = await GetPageAsync(PageNo); |
|
| 103 |
//throw new Exception("GetPageAsync(string BasePageUri,int PageNo)", ex);
|
|
| 103 | 104 |
} |
| 104 | 105 |
finally |
| 105 | 106 |
{
|
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 379 | 379 |
})); |
| 380 | 380 |
|
| 381 | 381 |
var currentUser = e.Result.Where(data => data.UserID == App.ViewInfo.UserID && data.AvoidConsolidate == 0).FirstOrDefault(); |
| 382 |
|
|
| 382 | 383 |
if (currentUser == null) |
| 383 | 384 |
{
|
| 384 | 385 |
/// create a new markupinfo to do comments |
| KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user | ||
|---|---|---|
| 10 | 10 |
</PropertyGroup> |
| 11 | 11 |
<ItemGroup> |
| 12 | 12 |
<File Include="bin/CommonLib.dll"> |
| 13 |
<publishTime>02/25/2020 10:44:46</publishTime>
|
|
| 13 |
<publishTime>03/05/2020 15:02:27</publishTime>
|
|
| 14 | 14 |
</File> |
| 15 | 15 |
<File Include="bin/CommonLib.pdb"> |
| 16 |
<publishTime>02/25/2020 10:44:46</publishTime>
|
|
| 16 |
<publishTime>03/05/2020 15:02:27</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/03/2020 16:40:46</publishTime>
|
|
| 55 |
<publishTime>03/05/2020 15:02:27</publishTime>
|
|
| 56 | 56 |
</File> |
| 57 | 57 |
<File Include="bin/IFinalPDF.pdb"> |
| 58 |
<publishTime>03/03/2020 16:40:46</publishTime>
|
|
| 58 |
<publishTime>03/05/2020 15:02:27</publishTime>
|
|
| 59 | 59 |
</File> |
| 60 | 60 |
<File Include="bin/IKCOM.dll"> |
| 61 |
<publishTime>02/27/2020 10:01:48</publishTime>
|
|
| 61 |
<publishTime>03/05/2020 15:02:29</publishTime>
|
|
| 62 | 62 |
</File> |
| 63 | 63 |
<File Include="bin/IKCOM.pdb"> |
| 64 |
<publishTime>02/27/2020 10:01:48</publishTime>
|
|
| 64 |
<publishTime>03/05/2020 15:02:29</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>02/25/2020 10:44:46</publishTime>
|
|
| 73 |
<publishTime>03/05/2020 15:02:27</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>02/25/2020 10:44:46</publishTime>
|
|
| 79 |
<publishTime>03/05/2020 15:02:27</publishTime>
|
|
| 80 | 80 |
</File> |
| 81 | 81 |
<File Include="bin/KCOM_API.dll"> |
| 82 |
<publishTime>02/28/2020 08:53:06</publishTime>
|
|
| 82 |
<publishTime>03/06/2020 13:40:40</publishTime>
|
|
| 83 | 83 |
</File> |
| 84 | 84 |
<File Include="bin/KCOM_API.pdb"> |
| 85 |
<publishTime>02/28/2020 08:53:06</publishTime>
|
|
| 85 |
<publishTime>03/06/2020 13:40:40</publishTime>
|
|
| 86 | 86 |
</File> |
| 87 | 87 |
<File Include="bin/Leadtools.Codecs.Cmp.dll"> |
| 88 | 88 |
<publishTime>06/29/2017 11:38:22</publishTime> |
| ... | ... | |
| 109 | 109 |
<publishTime>09/14/2015 12:37:22</publishTime> |
| 110 | 110 |
</File> |
| 111 | 111 |
<File Include="bin/Markus.Image.dll"> |
| 112 |
<publishTime>02/27/2020 09:51:16</publishTime>
|
|
| 112 |
<publishTime>03/05/2020 00:11:52</publishTime>
|
|
| 113 | 113 |
</File> |
| 114 | 114 |
<File Include="bin/OpenCvSharp.dll"> |
| 115 | 115 |
<publishTime>11/17/2017 00:22:52</publishTime> |
| ... | ... | |
| 190 | 190 |
<publishTime>07/10/2019 14:11:36</publishTime> |
| 191 | 191 |
</File> |
| 192 | 192 |
<File Include="Web.config"> |
| 193 |
<publishTime>03/03/2020 16:41:06</publishTime>
|
|
| 193 |
<publishTime>03/06/2020 13:40:40</publishTime>
|
|
| 194 | 194 |
</File> |
| 195 | 195 |
</ItemGroup> |
| 196 | 196 |
</Project> |
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 2178 | 2178 |
|
| 2179 | 2179 |
if (memberQuery.Count() > 0) |
| 2180 | 2180 |
{
|
| 2181 |
rstmember = new MEMBER(); |
|
| 2182 |
|
|
| 2181 | 2183 |
string userName = memberQuery.First()["NAME"]?.ToString().Trim(); |
| 2182 | 2184 |
string ID = memberQuery.First()["ID"]?.ToString().Trim(); |
| 2183 | 2185 |
string depatment = memberQuery.First()["DEPARTMENT"]?.ToString().Trim(); |
내보내기 Unified diff
