개정판 45ac2822
issue #0000 SEC ID2대응 빌드 추가
Change-Id: If0bc3217415f5cba3417ec08939fe7fc1cc8afab
KCOM/App.xaml.cs | ||
---|---|---|
251 | 251 |
basicHttpBinding.TransferMode = TransferMode.Buffered; |
252 | 252 |
basicHttpBinding.MessageEncoding = WSMessageEncoding.Text; |
253 | 253 |
basicHttpBinding.HostNameComparisonMode = HostNameComparisonMode.StrongWildcard; |
254 |
//basicHttpBinding.ProxyAddress = null; |
|
254 | 255 |
//basicHttpBinding.AllowCookies = false; |
255 | 256 |
//basicHttpBinding.BypassProxyOnLocal = false; |
256 | 257 |
//basicHttpBinding.UseDefaultWebProxy = false; |
KCOM/KCOM.csproj.user | ||
---|---|---|
17 | 17 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments> |
18 | 18 |
</PropertyGroup> |
19 | 19 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MH0=</StartArguments>
|
|
20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2giLCJNb2RlIjowfQ==</StartArguments>
|
|
21 | 21 |
<StartAction>Project</StartAction> |
22 | 22 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
23 | 23 |
</PropertyGroup> |
KCOM/MARKUS.ini | ||
---|---|---|
1 |
#DevDoftech ???? INI |
|
1 | 2 |
[Internal] |
2 |
IP=localhost
|
|
3 |
IP=192.168.0.67
|
|
3 | 4 |
[External] |
4 |
IP=125.129.196.207
|
|
5 |
IP=192.168.0.67
|
|
5 | 6 |
[BaseClientAddress] |
6 |
URL=http://localhost:44301
|
|
7 |
URL=http://192.168.0.67:5979
|
|
7 | 8 |
[HubAddress] |
8 | 9 |
URL=http://192.168.0.67:5100/ |
9 | 10 |
[UpdateVer64] |
... | ... | |
15 | 16 |
[KCOM_Get_FinalImage_Get_PdfImage] |
16 | 17 |
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx |
17 | 18 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
18 |
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
|
|
19 |
URL=http://192.168.0.67:5977/ImageUpload/FileUpload.asmx
|
|
19 | 20 |
[mainServerImageWebPath] |
20 | 21 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png |
21 | 22 |
[subServerImageWebPath] |
22 | 23 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png |
23 | 24 |
[Debug_BaseClientAddress] |
24 |
URL=http://192.168.0.67:5979 |
|
25 |
URL=http://192.168.0.67:5979
|
|
25 | 26 |
[HOST_DOMAIN] |
26 | 27 |
DOMAIN= |
27 | 28 |
[GetConversionStateFailed] |
... | ... | |
40 | 41 |
BASE=5979:5979 |
41 | 42 |
[GetImageResourceFailed] |
42 | 43 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
43 |
|
|
44 |
|
|
45 |
[COMMON] |
|
46 |
IsDocumentHistory = false |
KCOM/Services/BaseServices.cs | ||
---|---|---|
267 | 267 |
else |
268 | 268 |
{ |
269 | 269 |
string sFolder = _ViewInfo.DocumentItemID.All(char.IsDigit) ? (Convert.ToUInt32(_ViewInfo.DocumentItemID) / 100).ToString() : (_ViewInfo.DocumentItemID.Length >= 5 ? _ViewInfo.DocumentItemID.Substring(0, 5) : _ViewInfo.DocumentItemID); |
270 |
|
|
271 |
/// 화면의 좌측 Thumbnail의 주소 |
|
270 | 272 |
var MainUrl = string.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal).Replace("png", "jpg"), _ViewInfo.ProjectNO, sFolder, _ViewInfo.DocumentItemID, "{PageNo}"); |
271 | 273 |
_DocInfo = e.Result; |
272 | 274 |
_DocInfo.ORIGINAL_FILE = HttpUtility.UrlDecode(_DocInfo.ORIGINAL_FILE); |
... | ... | |
284 | 286 |
Document_NO = _DocItem?.DOCUMENT_NO, |
285 | 287 |
File_Result = _DocItem?.RESULT_FILE, |
286 | 288 |
Group_No = _DocItem?.GROUP_NO, |
287 |
ProjectNo = _DocItem?.PROJECT_NO, |
|
289 |
ProjectNo = _DocItem?.PROJECT_NO,
|
|
288 | 290 |
Revision = _DocItem?.REVISION, |
289 | 291 |
}; |
290 | 292 |
|
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
698 | 698 |
ViewerDataModel.Instance.ImageViewWidth = 1; |
699 | 699 |
ViewerDataModel.Instance.ImageViewHeight = 1; |
700 | 700 |
|
701 |
await PageChangingAsync(page, PageNo, ViewerDataModel.Instance.NewPagImageCancelToken()); |
|
702 |
|
|
703 | 701 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Clear(); |
704 | 702 |
Common.ViewerDataModel.Instance.MarkupControls_USER.Clear(); //전체 제거 |
705 | 703 |
Common.ViewerDataModel.Instance.MarkupControls.Clear(); //전체 제거 |
706 | 704 |
|
705 |
await PageChangingAsync(page, PageNo, ViewerDataModel.Instance.NewPagImageCancelToken()); |
|
706 |
|
|
707 | 707 |
await MarkupLoadAsync(PageNo, ViewerDataModel.Instance.PageAngle, ViewerDataModel.Instance.NewMarkupCancelToken()); |
708 | 708 |
|
709 | 709 |
//var pagechangeTask = PageChangingAsync(page, page.PAGE_NUMBER, ViewerDataModel.Instance.NewPagImageCancelToken()); |
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user | ||
---|---|---|
7 | 7 |
<PropertyGroup> |
8 | 8 |
<TimeStampOfAssociatedLegacyPublishXmlFile /> |
9 | 9 |
<_PublishTargetUrl>D:\Source\Repos\MARKUS\publish\MarkusAPI</_PublishTargetUrl> |
10 |
<History>True|2023-04-07T07:43:58.8972257Z;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
|
|
10 |
<History>True|2023-04-26T00:20:18.0086339Z;True|2023-04-07T16:43:58.8972257+09:00;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
|
|
11 | 11 |
</PropertyGroup> |
12 | 12 |
<ItemGroup> |
13 | 13 |
<File Include="ActiveService.svc"> |
14 | 14 |
<publishTime>06/22/2021 14:27:43</publishTime> |
15 | 15 |
</File> |
16 | 16 |
<File Include="bin/CommonLib.dll"> |
17 |
<publishTime>04/07/2023 16:42:58</publishTime>
|
|
17 |
<publishTime>04/24/2023 09:48:09</publishTime>
|
|
18 | 18 |
</File> |
19 | 19 |
<File Include="bin/CommonLib.pdb"> |
20 |
<publishTime>04/07/2023 16:42:58</publishTime>
|
|
20 |
<publishTime>04/24/2023 09:48:09</publishTime>
|
|
21 | 21 |
</File> |
22 | 22 |
<File Include="bin/CompareLib.dll"> |
23 | 23 |
<publishTime>03/27/2018 10:07:16</publishTime> |
... | ... | |
62 | 62 |
<publishTime>09/19/2015 15:28:04</publishTime> |
63 | 63 |
</File> |
64 | 64 |
<File Include="bin/IFinalPDF.dll"> |
65 |
<publishTime>04/07/2023 16:42:58</publishTime>
|
|
65 |
<publishTime>04/25/2023 21:26:29</publishTime>
|
|
66 | 66 |
</File> |
67 | 67 |
<File Include="bin/IFinalPDF.pdb"> |
68 |
<publishTime>04/07/2023 16:42:58</publishTime>
|
|
68 |
<publishTime>04/25/2023 21:26:29</publishTime>
|
|
69 | 69 |
</File> |
70 | 70 |
<File Include="bin/IKCOM.dll"> |
71 |
<publishTime>04/07/2023 16:43:04</publishTime>
|
|
71 |
<publishTime>04/25/2023 20:44:05</publishTime>
|
|
72 | 72 |
</File> |
73 | 73 |
<File Include="bin/IKCOM.pdb"> |
74 |
<publishTime>04/07/2023 16:43:04</publishTime>
|
|
74 |
<publishTime>04/25/2023 20:44:05</publishTime>
|
|
75 | 75 |
</File> |
76 | 76 |
<File Include="bin/it/ZedGraph.resources.dll"> |
77 | 77 |
<publishTime>09/19/2015 15:28:04</publishTime> |
... | ... | |
80 | 80 |
<publishTime>09/19/2015 15:28:04</publishTime> |
81 | 81 |
</File> |
82 | 82 |
<File Include="bin/KCOMDataModel.dll"> |
83 |
<publishTime>04/07/2023 16:42:59</publishTime>
|
|
83 |
<publishTime>04/24/2023 09:48:09</publishTime>
|
|
84 | 84 |
</File> |
85 | 85 |
<File Include="bin/KCOMDataModel.dll.config"> |
86 | 86 |
<publishTime>06/08/2020 15:07:57</publishTime> |
87 | 87 |
</File> |
88 | 88 |
<File Include="bin/KCOMDataModel.pdb"> |
89 |
<publishTime>04/07/2023 16:42:59</publishTime>
|
|
89 |
<publishTime>04/24/2023 09:48:09</publishTime>
|
|
90 | 90 |
</File> |
91 | 91 |
<File Include="bin/KCOM_API.dll"> |
92 |
<publishTime>04/07/2023 16:43:54</publishTime>
|
|
92 |
<publishTime>04/26/2023 09:18:38</publishTime>
|
|
93 | 93 |
</File> |
94 | 94 |
<File Include="bin/KCOM_API.pdb"> |
95 |
<publishTime>04/07/2023 16:43:54</publishTime>
|
|
95 |
<publishTime>04/26/2023 09:18:38</publishTime>
|
|
96 | 96 |
</File> |
97 | 97 |
<File Include="bin/Leadtools.Codecs.Cmp.dll"> |
98 | 98 |
<publishTime>06/29/2017 11:38:22</publishTime> |
... | ... | |
230 | 230 |
<publishTime>07/10/2019 14:11:36</publishTime> |
231 | 231 |
</File> |
232 | 232 |
<File Include="Web.config"> |
233 |
<publishTime>04/07/2023 16:43:56</publishTime>
|
|
233 |
<publishTime>04/26/2023 09:20:12</publishTime>
|
|
234 | 234 |
</File> |
235 | 235 |
</ItemGroup> |
236 | 236 |
</Project> |
KCOM_API/Web.Debug_SEC.config | ||
---|---|---|
1 |
<?xml version="1.0"?> |
|
2 |
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 --> |
|
3 |
<!-- In case configuration is not the root element, replace it with root element in source configuration file --> |
|
4 |
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform"> |
|
5 |
<connectionStrings xdt:Transform="Replace"> |
|
6 |
<add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus_sec;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/> |
|
7 |
<add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus_sec;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/> |
|
8 |
</connectionStrings> |
|
9 |
<applicationSettings xdt:Transform="Replace"> |
|
10 |
<KCOM_API.Properties.Settings> |
|
11 |
<setting name="TileSoucePath" serializeAs="String"> |
|
12 |
<value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value> |
|
13 |
</setting> |
|
14 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
|
15 |
<value>http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value> |
|
16 |
</setting> |
|
17 |
<setting name="IsProjectNoPass" serializeAs="String"> |
|
18 |
<value>True</value> |
|
19 |
</setting> |
|
20 |
<setting name="FinalService" serializeAs="String"> |
|
21 |
<value>tcp://localhost:9092/remFinalPDF</value> |
|
22 |
</setting> |
|
23 |
</KCOM_API.Properties.Settings> |
|
24 |
</applicationSettings> |
|
25 |
</configuration> |
내보내기 Unified diff