개정판 5639752b
issue #00000 Compare 오류 수정
Change-Id: If0efab86e471922327866c6e89b3252e6f565df2
FileUploadWevService/FileUpload.asmx.cs | ||
---|---|---|
91 | 91 |
|
92 | 92 |
var item = entity.PROPERTIES.Where(data => data.TYPE == "SystemInfo" && data.PROPERTY == "Url").FirstOrDefault(); |
93 | 93 |
string result = ""; |
94 |
if (item != null) |
|
95 |
{ |
|
96 |
FileName = FileName.Replace(".png", ".svg"); |
|
97 |
|
|
98 |
result = string.Format(@"{0}/UserData/{1}/{2}/{3}", item.VALUE, ProjectNo, UserID, FileName); |
|
99 |
} |
|
100 |
else |
|
94 |
|
|
95 |
if (item == null) |
|
101 | 96 |
{ |
102 | 97 |
throw new Exception("SystemInfo 정보가 없습니다."); |
103 | 98 |
} |
... | ... | |
109 | 104 |
{ |
110 | 105 |
throw new Exception("TileSourceStorage 정보가 없습니다."); |
111 | 106 |
} |
107 |
|
|
112 | 108 |
/// 실제 이미지를 저장할 위치 |
113 | 109 |
string DirectoryPath = string.Format(Path.Combine(TileSourceProperty.VALUE, "UserData", ProjectNo, UserID)); |
114 | 110 |
DirectoryInfo directoryInfo_ = new DirectoryInfo(DirectoryPath); |
... | ... | |
118 | 114 |
directoryInfo_.Create(); |
119 | 115 |
} |
120 | 116 |
|
121 |
using (MemoryStream ms = new MemoryStream(f))
|
|
117 |
if (!ImageUploadWebService.Properties.Settings.Default.IsSaveSVG)
|
|
122 | 118 |
{ |
123 |
using (var image = Image.FromStream(ms)) |
|
119 |
MemoryStream ms = new MemoryStream(f); |
|
120 |
FileStream fs = new FileStream(directoryInfo_ + @"\" + FileName, FileMode.Create); |
|
121 |
ms.WriteTo(fs); |
|
122 |
|
|
123 |
ms.Close(); |
|
124 |
fs.Close(); |
|
125 |
fs.Dispose(); |
|
126 |
} |
|
127 |
else |
|
128 |
{ |
|
129 |
FileName = FileName.Replace(".png", ".svg"); |
|
130 |
|
|
131 |
using (MemoryStream ms = new MemoryStream(f)) |
|
124 | 132 |
{ |
125 |
using (var ig = new SvgGraphics(Color.Transparent))
|
|
133 |
using (var image = Image.FromStream(ms))
|
|
126 | 134 |
{ |
127 |
//ig.PixelOffsetMode = PixelOffsetMode.HighSpeed; |
|
128 |
ig.CompositingQuality = CompositingQuality.HighSpeed; |
|
129 |
|
|
130 |
ig.DrawImage(image, 0, 0); |
|
131 |
GraphicsContainer cnt = ig.BeginContainer(); |
|
132 |
ig.EndContainer(cnt); |
|
133 |
|
|
134 |
string s = ig.WriteSVGString(); |
|
135 |
string tempFile = Path.Combine(directoryInfo_.FullName, FileName); |
|
136 |
var tw = new StreamWriter(tempFile, false); |
|
137 |
tw.Write(s); |
|
138 |
tw.Close(); |
|
139 |
tw.Dispose(); |
|
140 |
ig.Dispose(); |
|
135 |
using (var ig = new SvgGraphics(Color.Transparent)) |
|
136 |
{ |
|
137 |
//ig.PixelOffsetMode = PixelOffsetMode.HighSpeed; |
|
138 |
ig.CompositingQuality = CompositingQuality.HighSpeed; |
|
139 |
|
|
140 |
ig.DrawImage(image, 0, 0); |
|
141 |
GraphicsContainer cnt = ig.BeginContainer(); |
|
142 |
ig.EndContainer(cnt); |
|
143 |
|
|
144 |
string s = ig.WriteSVGString(); |
|
145 |
string tempFile = Path.Combine(directoryInfo_.FullName, FileName); |
|
146 |
var tw = new StreamWriter(tempFile, false); |
|
147 |
tw.Write(s); |
|
148 |
tw.Close(); |
|
149 |
tw.Dispose(); |
|
150 |
ig.Dispose(); |
|
151 |
} |
|
141 | 152 |
} |
142 | 153 |
} |
143 | 154 |
} |
155 |
|
|
156 |
result = string.Format(@"{0}/UserData/{1}/{2}/{3}", item.VALUE, ProjectNo, UserID, FileName); |
|
144 | 157 |
} |
145 | 158 |
catch (Exception ex) |
146 | 159 |
{ |
FileUploadWevService/FileUploadWevService.csproj | ||
---|---|---|
73 | 73 |
<SubType>Component</SubType> |
74 | 74 |
</Compile> |
75 | 75 |
<Compile Include="Properties\AssemblyInfo.cs" /> |
76 |
<Compile Include="Properties\Settings.Designer.cs"> |
|
77 |
<AutoGen>True</AutoGen> |
|
78 |
<DesignTimeSharedInput>True</DesignTimeSharedInput> |
|
79 |
<DependentUpon>Settings.settings</DependentUpon> |
|
80 |
</Compile> |
|
76 | 81 |
</ItemGroup> |
77 | 82 |
<ItemGroup> |
78 | 83 |
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> |
84 |
<None Include="Properties\Settings.settings"> |
|
85 |
<Generator>SettingsSingleFileGenerator</Generator> |
|
86 |
<LastGenOutput>Settings.Designer.cs</LastGenOutput> |
|
87 |
</None> |
|
79 | 88 |
<None Include="Web.Debug.config"> |
80 | 89 |
<DependentUpon>Web.config</DependentUpon> |
81 | 90 |
</None> |
FileUploadWevService/Web.config | ||
---|---|---|
4 | 4 |
https://go.microsoft.com/fwlink/?LinkId=169433 |
5 | 5 |
--> |
6 | 6 |
<configuration> |
7 |
<configSections> |
|
8 |
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > |
|
9 |
<section name="ImageUploadWebService.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> |
|
10 |
</sectionGroup> |
|
11 |
</configSections> |
|
7 | 12 |
<connectionStrings> |
8 | 13 |
<add name="ConnectionString" |
9 | 14 |
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=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" |
... | ... | |
25 | 30 |
<remove name="ServiceRedirector"/> |
26 | 31 |
</modules> |
27 | 32 |
</system.webServer>--> |
33 |
<applicationSettings> |
|
34 |
<ImageUploadWebService.Properties.Settings> |
|
35 |
<setting name="IsSaveSVG" serializeAs="String"> |
|
36 |
<value>False</value> |
|
37 |
</setting> |
|
38 |
</ImageUploadWebService.Properties.Settings> |
|
39 |
</applicationSettings> |
|
28 | 40 |
</configuration> |
FinalService/KCOM_FinalService/KCOM_FinalService/FinalService.ini | ||
---|---|---|
16 | 16 |
STRING=EVCOYxwadMNh7qzjMvRTwOacwyFatXgWjx//sssrSKTsvMkdvpdBa3Sj3mmhwABTiweSqNnWYgsIxUWXaBe8XE8G1CLaux2zPbyBWvqxJruTX0H5MqABZSEXXG82XaGL |
17 | 17 |
[MARKUS_API] |
18 | 18 |
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc |
19 |
#[Remoting] |
|
20 |
#port=9098 |
|
19 |
[Remoting] |
|
20 |
port=9092 |
FinalService/KCOM_FinalService/KCOM_FinalService/KCOM_FinalService.csproj | ||
---|---|---|
96 | 96 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
97 | 97 |
<Name>KCOMDataModel</Name> |
98 | 98 |
</ProjectReference> |
99 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
100 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
101 |
<Name>MarkupToPDF</Name> |
|
102 |
</ProjectReference> |
|
99 | 103 |
</ItemGroup> |
100 | 104 |
<ItemGroup> |
101 | 105 |
<None Include="app.config" /> |
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
---|---|---|
38 | 38 |
public List<DOCPAGE> DocPageItem = null; |
39 | 39 |
public MARKUP_INFO MarkupInfoItem = null; |
40 | 40 |
public List<MARKUP_DATA> MarkupDataSet = null; |
41 |
public List<MARKUP_DATA> MarkupDataSet = null; |
|
42 | 41 |
//private string _PrintPDFStorgeLocal = null; |
43 | 42 |
//private string _PrintPDFStorgeRemote = null; |
44 | 43 |
public event EventHandler<MakeFinalErrorArgs> FinalMakeError; |
KCOM.sln | ||
---|---|---|
595 | 595 |
{F026B592-11B9-410C-B4FF-384E511A4666}.DeployWeb_SNI|x86.Build.0 = Deploy_Daelim|x86 |
596 | 596 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|Any CPU.ActiveCfg = Release_Default|Any CPU |
597 | 597 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|Any CPU.Build.0 = Release_Default|Any CPU |
598 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x64.ActiveCfg = Release_Default|x64
|
|
599 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x64.Build.0 = Release_Default|x64
|
|
598 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x64.ActiveCfg = Debug|x64
|
|
599 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x64.Build.0 = Debug|x64
|
|
600 | 600 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x86.ActiveCfg = Release_Default|x86 |
601 | 601 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_Default|x86.Build.0 = Release_Default|x86 |
602 | 602 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Release_PEMSS|Any CPU.ActiveCfg = Release_PEMSS|Any CPU |
... | ... | |
3267 | 3267 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.DeployWeb_SNI|x86.Build.0 = Debug|Any CPU |
3268 | 3268 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|Any CPU.ActiveCfg = Release|Any CPU |
3269 | 3269 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|Any CPU.Build.0 = Release|Any CPU |
3270 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x64.ActiveCfg = Release|x64
|
|
3271 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x64.Build.0 = Release|x64
|
|
3270 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x64.ActiveCfg = Debug|x64
|
|
3271 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x64.Build.0 = Debug|x64
|
|
3272 | 3272 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x86.ActiveCfg = Release|Any CPU |
3273 | 3273 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_Default|x86.Build.0 = Release|Any CPU |
3274 | 3274 |
{8B470D8E-ABFF-4C70-8059-0EFB51755E84}.Release_PEMSS|Any CPU.ActiveCfg = Release|Any CPU |
KCOM/App.xaml.cs | ||
---|---|---|
257 | 257 |
basicHttpBinding.HostNameComparisonMode = HostNameComparisonMode.StrongWildcard; |
258 | 258 |
|
259 | 259 |
|
260 |
System.ServiceModel.Channels.ReliableSessionBindingElement reliableSession = new System.ServiceModel.Channels.ReliableSessionBindingElement(); |
|
261 |
reliableSession.Ordered = true; |
|
262 |
reliableSession.MaxRetryCount = 3; |
|
263 |
basicHttpBinding.CreateBindingElements().Add(reliableSession); |
|
260 |
//System.ServiceModel.Channels.ReliableSessionBindingElement reliableSession = new System.ServiceModel.Channels.ReliableSessionBindingElement();
|
|
261 |
//reliableSession.Ordered = true;
|
|
262 |
//reliableSession.MaxRetryCount = 3;
|
|
263 |
//basicHttpBinding.CreateBindingElements().Add(reliableSession);
|
|
264 | 264 |
//basicHttpBinding.ProxyAddress = null; |
265 | 265 |
//basicHttpBinding.AllowCookies = false; |
266 | 266 |
//basicHttpBinding.BypassProxyOnLocal = false; |
KCOM/KCOM.csproj | ||
---|---|---|
58 | 58 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
59 | 59 |
<DebugSymbols>true</DebugSymbols> |
60 | 60 |
<OutputPath>bin\x64\Debug\</OutputPath> |
61 |
<DefineConstants>TRACE;DEBUG;CUSTOM_BINDING;_BASIC_BINDING</DefineConstants>
|
|
61 |
<DefineConstants>TRACE;DEBUG;_CUSTOM_BINDING;BASIC_BINDING</DefineConstants>
|
|
62 | 62 |
<DebugType>full</DebugType> |
63 | 63 |
<PlatformTarget>x64</PlatformTarget> |
64 | 64 |
<ErrorReport>prompt</ErrorReport> |
... | ... | |
208 | 208 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x64'"> |
209 | 209 |
<DebugSymbols>true</DebugSymbols> |
210 | 210 |
<OutputPath>bin\x64\Debug_SNI\</OutputPath> |
211 |
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
211 |
<DefineConstants>TRACE;DEBUG;_CUSTOM_BINDING;BASIC_BINDING</DefineConstants>
|
|
212 | 212 |
<WarningLevel>3</WarningLevel> |
213 | 213 |
<DebugType>full</DebugType> |
214 | 214 |
<PlatformTarget>x64</PlatformTarget> |
... | ... | |
1534 | 1534 |
call "appCast_DIG.bat" "@(VersionNumber)" |
1535 | 1535 |
rem call "appCast_DIG_DEBUG.bat" "@(VersionNumber)" |
1536 | 1536 |
rem call "appCast_SNI_SDMS.bat" "@(VersionNumber)" |
1537 |
rem call "appCast_SNI_XICNA.bat" "@(VersionNumber)"
|
|
1537 |
rem call "appCast_SNI_XICNA.bat" "@(VersionNumber)"
|
|
1538 | 1538 |
rem call "appCast_doftech.bat" "@(VersionNumber)" |
1539 | 1539 |
rem call "appCast_HS.bat" "@(VersionNumber)" |
1540 | 1540 |
rem "appCast_bseng.bat" "@(VersionNumber)" |
... | ... | |
1609 | 1609 |
xcopy /s "$(ProjectDir)..\INI\MARKUS_BSENG.ini" "$(TargetDir)MARKUS.*" /Y /F |
1610 | 1610 |
) |
1611 | 1611 |
if $(ConfigurationName) == Debug_SNI ( |
1612 |
xcopy /s "$(ProjectDir)..\INI\MARKUS_SNI.ini" "$(TargetDir)MARKUS.*" /Y /F |
|
1612 |
xcopy /s "$(ProjectDir)..\INI\MARKUS_SNI_XICNA.ini" "$(TargetDir)MARKUS.*" /Y /F
|
|
1613 | 1613 |
) |
1614 | 1614 |
|
1615 | 1615 |
rem xcopy /s "$(ProjectDir)..\INI\MARKUS_Daelim.ini" "$(TargetDir)MARKUS.*" /Y /F</PreBuildEvent> |
KCOM/KCOM.csproj.user | ||
---|---|---|
53 | 53 |
</PropertyGroup> |
54 | 54 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_SNI|x64'"> |
55 | 55 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
56 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxOGUyZjciLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6InlvbmdtaW4wMSJ9</StartArguments>
|
|
56 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxZjljZTMiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6Imhsbm9oMjcyIn0=</StartArguments>
|
|
57 | 57 |
</PropertyGroup> |
58 | 58 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|AnyCPU'"> |
59 | 59 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzOTMzIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJPTDEiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments> |
KCOM/MARKUS.ini | ||
---|---|---|
1 |
#DIG Project |
|
2 |
https://ddcsmarkus.dig-airgas.com/ServiceDeepView.svc |
|
3 | 1 |
[Internal] |
4 |
IP=ddcsmarkus.dig-airgas.com
|
|
2 |
IP=http://markus.xicna.com:5977/API_V4
|
|
5 | 3 |
[External] |
6 |
IP=ddcsmarkus.dig-airgas.com
|
|
4 |
IP=http://markus.xicna.com:5977/API_V4
|
|
7 | 5 |
[BaseClientAddress] |
8 |
URL=https://ddcsmarkus.dig-airgas.com
|
|
6 |
URL=http://markus.xicna.com:5977/API_V4
|
|
9 | 7 |
[HubAddress] |
10 |
URL=https://ddcsmarkus.dig-airgas.com/
|
|
8 |
URL=http://192.168.0.67:5100/
|
|
11 | 9 |
[UpdateVer64] |
12 |
URL=https://ddcsmarkus.dig-airgas.com/TileSource/Version/version_x64.xml
|
|
10 |
URL=http://localhost:8080/TileSource/Version/version_x64.xml
|
|
13 | 11 |
[UpdateVer86] |
14 |
URL=https://ddcsmarkus.dig-airgas.com/TileSource/Version/version_x86.xml
|
|
12 |
URL=http://localhost:8080/TileSource/Version/version_x86.xml
|
|
15 | 13 |
[excelFilePath] |
16 |
URL=https://ddcsmarkus.dig-airgas.com/TileSource/Check_Test/CheckList_T.xlsx
|
|
14 |
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
|
|
17 | 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
18 |
URL=https://ddcsmarkus.dig-airgas.com/Get_FInalImage/Get_PdfImage.asmx
|
|
16 |
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
|
|
19 | 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
20 |
URL=https://ddcsmarkus.dig-airgas.com/ImageUpload/FileUpload.asmx
|
|
18 |
URL=http://markus.xicna.com:5977/ImageUpload/FileUpload.asmx
|
|
21 | 19 |
[mainServerImageWebPath] |
22 |
URL=https://ddcsmarkus.dig-airgas.com/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
20 |
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
23 | 21 |
[subServerImageWebPath] |
24 |
URL=https://ddcsmarkus.dig-airgas.com/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
22 |
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
25 | 23 |
[Debug_BaseClientAddress] |
26 |
URL=https://ddcsmarkus.dig-airgas.com
|
|
24 |
URL=http://192.168.0.67:5979
|
|
27 | 25 |
[HOST_DOMAIN] |
28 | 26 |
DOMAIN= |
29 | 27 |
[GetConversionStateFailed] |
... | ... | |
33 | 31 |
[SetFinalPDFSuccess] |
34 | 32 |
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU |
35 | 33 |
[SetThumbnail] |
36 |
WIDTH=100
|
|
34 |
WIDTH=265
|
|
37 | 35 |
[Site] |
38 |
NAME=DAELIM
|
|
36 |
NAME=sdms
|
|
39 | 37 |
[PortForwarding] |
40 | 38 |
HUB=5100:5100 |
41 |
RESOURCE=8977:8977
|
|
42 |
BASE=5979:5979
|
|
39 |
RESOURCE=5977:5977
|
|
40 |
BASE=8080:8080
|
|
43 | 41 |
[GetImageResourceFailed] |
44 | 42 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
45 | 43 |
|
46 |
[DocumentDownloadPath]
|
|
47 |
url=http://10.10.130.10:8089/{0}
|
|
44 |
[COMMON]
|
|
45 |
IsDocumentHistory = false
|
KCOM/Properties/AssemblyInfo.cs | ||
---|---|---|
51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
52 | 52 |
// 지정되도록 할 수 있습니다. |
53 | 53 |
// [assembly: AssemblyVersion("1.0.*")] |
54 |
[assembly: AssemblyVersion("5.5.3.0")]
|
|
55 |
[assembly: AssemblyFileVersion("5.5.3.0")]
|
|
54 |
[assembly: AssemblyVersion("5.5.4.0")]
|
|
55 |
[assembly: AssemblyFileVersion("5.5.4.0")]
|
|
56 | 56 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
1201 | 1201 |
{ |
1202 | 1202 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID); |
1203 | 1203 |
|
1204 |
if (cts.IsCancellationRequested) |
|
1205 |
{ |
|
1206 |
return; |
|
1207 |
} |
|
1204 |
//if (cts.IsCancellationRequested)
|
|
1205 |
//{
|
|
1206 |
// return;
|
|
1207 |
//}
|
|
1208 | 1208 |
} |
1209 | 1209 |
} |
1210 | 1210 |
} |
KCOM_API/KCOM_API.csproj | ||
---|---|---|
18 | 18 |
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> |
19 | 19 |
<UseIISExpress>true</UseIISExpress> |
20 | 20 |
<Use64BitIISExpress>true</Use64BitIISExpress> |
21 |
<IISExpressSSLPort>44302</IISExpressSSLPort> |
|
21 |
<IISExpressSSLPort> |
|
22 |
</IISExpressSSLPort> |
|
22 | 23 |
<IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication> |
23 | 24 |
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication> |
24 | 25 |
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode> |
... | ... | |
634 | 635 |
<AutoAssignPort>True</AutoAssignPort> |
635 | 636 |
<DevelopmentServerPort>13009</DevelopmentServerPort> |
636 | 637 |
<DevelopmentServerVPath>/</DevelopmentServerVPath> |
637 |
<IISUrl>https://localhost:44393/</IISUrl>
|
|
638 |
<IISUrl>http://localhost:44301/</IISUrl>
|
|
638 | 639 |
<NTLMAuthentication>False</NTLMAuthentication> |
639 | 640 |
<UseCustomServer>False</UseCustomServer> |
640 | 641 |
<CustomServerUrl> |
KCOM_API/Web.Debug.config | ||
---|---|---|
20 | 20 |
<value>True</value> |
21 | 21 |
</setting> |
22 | 22 |
<setting name="FinalService" serializeAs="String"> |
23 |
<value>tcp://localhost:7707/remFinalPDF</value>
|
|
23 |
<value>tcp://localhost:9092/remFinalPDF</value>
|
|
24 | 24 |
</setting> |
25 | 25 |
</KCOM_API.Properties.Settings> |
26 | 26 |
</applicationSettings> |
KCOM_API/Web.config | ||
---|---|---|
50 | 50 |
</system.diagnostics>--> |
51 | 51 |
<connectionStrings> |
52 | 52 |
<add name="ConnectionString" |
53 |
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;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
53 |
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=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
54 | 54 |
providerName="System.Data.EntityClient"/> |
55 | 55 |
<add name="CIConnectionString" |
56 |
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;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
56 |
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=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
57 | 57 |
providerName="System.Data.EntityClient"/> |
58 | 58 |
</connectionStrings> |
59 | 59 |
<!-- |
... | ... | |
91 | 91 |
<add scheme="http" binding="basicHttpBinding" bindingConfiguration="LargeBuffer"/> |
92 | 92 |
</protocolMapping>--> |
93 | 93 |
<protocolMapping> |
94 |
<add scheme="http" binding="basicHttpBinding" bindingConfiguration="LargeBuffer"/> |
|
94 | 95 |
<add scheme="https" binding="customBinding" bindingConfiguration="CustomHttpsBinding"/> |
95 | 96 |
</protocolMapping> |
96 | 97 |
<diagnostics wmiProviderEnabled="true" performanceCounters="All"> |
... | ... | |
149 | 150 |
<services> |
150 | 151 |
<service behaviorConfiguration="ServiceBehavior" name="KCOM_API.ServiceDeepView"> |
151 | 152 |
<endpoint address="" binding="basicHttpBinding" bindingConfiguration="LargeBuffer" name="DeepViewPoint" contract="KCOM_API.ServiceDeepView"/> |
152 |
<endpoint address="" binding="customBinding" bindingConfiguration="CustomHttpsBinding" name="HTTPSMarkusAPI" contract="KCOM_API.ServiceDeepView"/>
|
|
153 |
<!--<endpoint address="" binding="customBinding" bindingConfiguration="CustomHttpsBinding" name="HTTPSMarkusAPI" contract="KCOM_API.ServiceDeepView"/>-->
|
|
153 | 154 |
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/> |
154 | 155 |
<!--<host> |
155 | 156 |
<baseAddresses> |
... | ... | |
181 | 182 |
<applicationSettings> |
182 | 183 |
<KCOM_API.Properties.Settings> |
183 | 184 |
<setting name="TileSoucePath" serializeAs="String"> |
184 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
185 |
<value>https://localhost:44301/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
185 | 186 |
</setting> |
186 | 187 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
187 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
188 |
<value>https://localhost:44301/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
188 | 189 |
</setting> |
189 | 190 |
<setting name="IsProjectNoPass" serializeAs="String"> |
190 | 191 |
<value>True</value> |
191 | 192 |
</setting> |
192 | 193 |
<setting name="FinalService" serializeAs="String"> |
193 |
<value>tcp://localhost:9093/remFinalPDF</value>
|
|
194 |
<value>tcp://localhost:9092/remFinalPDF</value>
|
|
194 | 195 |
</setting> |
195 | 196 |
</KCOM_API.Properties.Settings> |
196 | 197 |
</applicationSettings> |
MarkupToPDF/MarkupToPDF.csproj | ||
---|---|---|
298 | 298 |
</Reference> |
299 | 299 |
<Reference Include="PresentationCore" /> |
300 | 300 |
<Reference Include="PresentationFramework" /> |
301 |
<Reference Include="SharpVectors.Converters.Wpf, Version=1.8.1.0, Culture=neutral, PublicKeyToken=b532964b8548be77, processorArchitecture=MSIL">
|
|
302 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Converters.Wpf.dll</HintPath>
|
|
301 |
<Reference Include="SharpVectors.Converters.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=b532964b8548be77, processorArchitecture=MSIL">
|
|
302 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Converters.Wpf.dll</HintPath>
|
|
303 | 303 |
</Reference> |
304 |
<Reference Include="SharpVectors.Core, Version=1.8.1.0, Culture=neutral, PublicKeyToken=7407205e337c98ef, processorArchitecture=MSIL">
|
|
305 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Core.dll</HintPath>
|
|
304 |
<Reference Include="SharpVectors.Core, Version=1.8.4.0, Culture=neutral, PublicKeyToken=7407205e337c98ef, processorArchitecture=MSIL">
|
|
305 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Core.dll</HintPath>
|
|
306 | 306 |
</Reference> |
307 |
<Reference Include="SharpVectors.Css, Version=1.8.1.0, Culture=neutral, PublicKeyToken=7a46e3f532fdb787, processorArchitecture=MSIL">
|
|
308 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Css.dll</HintPath>
|
|
307 |
<Reference Include="SharpVectors.Css, Version=1.8.4.0, Culture=neutral, PublicKeyToken=7a46e3f532fdb787, processorArchitecture=MSIL">
|
|
308 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Css.dll</HintPath>
|
|
309 | 309 |
</Reference> |
310 |
<Reference Include="SharpVectors.Dom, Version=1.8.1.0, Culture=neutral, PublicKeyToken=517340b6277b1a7a, processorArchitecture=MSIL">
|
|
311 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Dom.dll</HintPath>
|
|
310 |
<Reference Include="SharpVectors.Dom, Version=1.8.4.0, Culture=neutral, PublicKeyToken=517340b6277b1a7a, processorArchitecture=MSIL">
|
|
311 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Dom.dll</HintPath>
|
|
312 | 312 |
</Reference> |
313 |
<Reference Include="SharpVectors.Model, Version=1.8.1.0, Culture=neutral, PublicKeyToken=2236cfc76b505845, processorArchitecture=MSIL">
|
|
314 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Model.dll</HintPath>
|
|
313 |
<Reference Include="SharpVectors.Model, Version=1.8.4.0, Culture=neutral, PublicKeyToken=2236cfc76b505845, processorArchitecture=MSIL">
|
|
314 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Model.dll</HintPath>
|
|
315 | 315 |
</Reference> |
316 |
<Reference Include="SharpVectors.Rendering.Wpf, Version=1.8.1.0, Culture=neutral, PublicKeyToken=d0902381100df30e, processorArchitecture=MSIL">
|
|
317 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Rendering.Wpf.dll</HintPath>
|
|
316 |
<Reference Include="SharpVectors.Rendering.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=d0902381100df30e, processorArchitecture=MSIL">
|
|
317 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Rendering.Wpf.dll</HintPath>
|
|
318 | 318 |
</Reference> |
319 |
<Reference Include="SharpVectors.Runtime.Wpf, Version=1.8.1.0, Culture=neutral, PublicKeyToken=d16e717f0a981fb9, processorArchitecture=MSIL">
|
|
320 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.1\lib\net46\SharpVectors.Runtime.Wpf.dll</HintPath>
|
|
319 |
<Reference Include="SharpVectors.Runtime.Wpf, Version=1.8.4.0, Culture=neutral, PublicKeyToken=d16e717f0a981fb9, processorArchitecture=MSIL">
|
|
320 |
<HintPath>..\packages\SharpVectors.Wpf.1.8.4\lib\net46\SharpVectors.Runtime.Wpf.dll</HintPath>
|
|
321 | 321 |
</Reference> |
322 | 322 |
<Reference Include="System" /> |
323 | 323 |
<Reference Include="System.ComponentModel.DataAnnotations" /> |
MarkupToPDF/packages.config | ||
---|---|---|
4 | 4 |
<package id="EntityFramework.ko" version="5.0.0" targetFramework="net45" /> |
5 | 5 |
<package id="iTextSharp" version="5.5.12" targetFramework="net40" /> |
6 | 6 |
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" /> |
7 |
<package id="SharpVectors.Wpf" version="1.8.1" targetFramework="net461" />
|
|
7 |
<package id="SharpVectors.Wpf" version="1.8.4" targetFramework="net461" />
|
|
8 | 8 |
</packages> |
내보내기 Unified diff