프로젝트

일반

사용자정보

개정판 66bd3240

ID66bd32406cca227c13fbec844b115eb99715efc6
상위 4e4b3e82
하위 c095f3cb

김태성이(가) 일년 이상 전에 추가함

issue #0000 fileupload api - svg 추가

Change-Id: I3e3fdf586fd732c226f08ab9e2fbb300cb82ebc7

차이점 보기:

DownloadManager/DownloadManager.csproj
31 31
    <OutputPath>..\publish\Downloader\</OutputPath>
32 32
    <Prefer32Bit>false</Prefer32Bit>
33 33
    <Optimize>false</Optimize>
34
    <DefineConstants>DEBUG;TRACE</DefineConstants>
34
    <DefineConstants>TRACE;DEBUG;_XACNA_TEST</DefineConstants>
35 35
  </PropertyGroup>
36 36
  <ItemGroup>
37 37
    <Reference Include="ConfigParser, Version=0.3.4.3, Culture=neutral, processorArchitecture=MSIL">
DownloadManager/PageStorage.cs
41 41
                _TotalPages = totalPages;
42 42
                _TakeCount = takeCount;
43 43

  
44
                _token = Authenticate(_BaseUri);
44
                //_token = Authenticate(_BaseUri);
45 45

  
46 46
                System.IO.Directory.CreateDirectory(_localStorage);
47 47

  
......
261 261

  
262 262
                    using (System.Net.WebClient client = new System.Net.WebClient())
263 263
                    {
264
                        client.Headers.Add(HttpRequestHeader.Authorization, _token);
264
                        //client.Headers.Add(HttpRequestHeader.Authorization, _token);
265 265
                        client.UseDefaultCredentials = true;
266 266
                        //client.Headers.Add("user-agent", "Your User-Agent");
267 267
                        System.Net.IWebProxy webProxy = client.Proxy;
DownloadManager/Program.cs
55 55
        {
56 56
            try
57 57
            {
58
#if XACNA_TEST
59
                args = ("MONITOR False 78820 79568 75952 C:\\Users\\kts\\AppData\\Local\\Temp\\MARKUS\\qxpvmgdt.pmr C:\\Users\\kts\\AppData\\Local\\Temp\\MARKUS\\ehdjbhoj.2j5 C:\\Users\\kts\\AppData\\Local\\Temp\\MARKUS\\ow0bp4w4.pdf http://markus.xicna.com:5977/API_V4")
60
                        .Split(' ').ToArray();
61
#endif
58 62
                ChangeLogFileName($"{DateTime.Now.ToString("yyMMddssmm")}_{args[0]}");
59 63

  
60 64
                logger.Info($"param : {string.Join(",", args)}");
......
145 149
                        }
146 150
                        else if (args[0] == IIpc.ProcessTypeDefine.DEFINE_FILE)
147 151
                        {
148
                            var token = Authenticate(new Uri(System.Web.HttpUtility.UrlDecode(args[3])).ToString());
152
                            //var token = Authenticate(new Uri(System.Web.HttpUtility.UrlDecode(args[3])).ToString());
149 153

  
150 154
                            using (System.Net.WebClient client = new System.Net.WebClient())
151 155
                            {
152
                                client.Headers.Add(HttpRequestHeader.Authorization, token);
156
                                //client.Headers.Add(HttpRequestHeader.Authorization, token);
153 157
                                
154 158
                                client.DownloadFileCompleted += Client_DownloadFileCompleted;
155 159
                                client.DownloadProgressChanged += Client_DownloadProgressChanged;
FileUploadWevService/FileUpload.asmx.cs
1 1
using KCOMDataModel.DataModel;
2
using SvgNet;
3
using SvgNet.Elements;
4
using SvgNet.Interfaces;
2 5
using System;
3 6
using System.Collections.Generic;
4 7
using System.Configuration;
5 8
using System.Drawing;
9
using System.Drawing.Drawing2D;
6 10
using System.IO;
7 11
using System.Linq;
12
using System.Text;
8 13
using System.Web;
9 14
using System.Web.Services;
10 15

  
......
29 34
            KCOMEntities entity = new KCOMEntities(sConnString);
30 35

  
31 36
            /// 사용자가 Comment한 이미지 URL를 생성한다.
32
            
37

  
33 38
            var item = entity.PROPERTIES.Where(data => data.TYPE == "SystemInfo" && data.PROPERTY == "Url").FirstOrDefault();
34 39
            string result = "";
35
            if (item!=null)
40
            if (item != null)
36 41
            {
37 42
                result = string.Format(@"{0}/UserData/{1}/{2}/{3}", item.VALUE, ProjectNo, UserID, FileName);
38 43
            }
39 44
            else
40 45
            {
41
                throw new Exception("SystemInfo 정보가 없습니다."); 
46
                throw new Exception("SystemInfo 정보가 없습니다.");
42 47
            }
43 48

  
44 49
            try
45 50
            {
46 51
                var TileSourceProperty = entity.PROPERTIES.Where(data => data.TYPE == "TileSorceStorage" && data.PROPERTY == ProjectNo).FirstOrDefault();
47
                if(TileSourceProperty == null)
52
                if (TileSourceProperty == null)
48 53
                {
49 54
                    throw new Exception("TileSourceStorage 정보가 없습니다.");
50 55
                }
51 56
                /// 실제 이미지를 저장할 위치
52
                string DirectoryPath = string.Format(Path.Combine(TileSourceProperty.VALUE , "UserData", ProjectNo, UserID));
57
                string DirectoryPath = string.Format(Path.Combine(TileSourceProperty.VALUE, "UserData", ProjectNo, UserID));
53 58
                DirectoryInfo directoryInfo_ = new DirectoryInfo(DirectoryPath);
54 59

  
55 60
                if (!directoryInfo_.Exists)
......
75 80
            return result;
76 81
        }
77 82

  
83
        [WebMethod]
84
        //public string Run(string ProjectNo, string VPNo, string UserID, string FileName, byte[] imageBytes)
85
        public string RunSymbol(string ProjectNo, string VPNo, string UserID, string FileName, byte[] f)
86
        {
87
            string sConnString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
88
            KCOMEntities entity = new KCOMEntities(sConnString);
89

  
90
            /// 사용자가 Comment한 이미지 URL를 생성한다.
91

  
92
            var item = entity.PROPERTIES.Where(data => data.TYPE == "SystemInfo" && data.PROPERTY == "Url").FirstOrDefault();
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
101
            {
102
                throw new Exception("SystemInfo 정보가 없습니다.");
103
            }
104

  
105
            try
106
            {
107
                var TileSourceProperty = entity.PROPERTIES.Where(data => data.TYPE == "TileSorceStorage" && data.PROPERTY == ProjectNo).FirstOrDefault();
108
                if (TileSourceProperty == null)
109
                {
110
                    throw new Exception("TileSourceStorage 정보가 없습니다.");
111
                }
112
                /// 실제 이미지를 저장할 위치
113
                string DirectoryPath = string.Format(Path.Combine(TileSourceProperty.VALUE, "UserData", ProjectNo, UserID));
114
                DirectoryInfo directoryInfo_ = new DirectoryInfo(DirectoryPath);
115

  
116
                if (!directoryInfo_.Exists)
117
                {
118
                    directoryInfo_.Create();
119
                }
120

  
121
                using (MemoryStream ms = new MemoryStream(f))
122
                {
123
                    using (var image = Image.FromStream(ms))
124
                    {
125
                        using (var ig = new SvgGraphics(Color.Transparent))
126
                        {
127
                            ig.PixelOffsetMode = PixelOffsetMode.HighSpeed;
128
                            ig.DrawImage(image, 0, 0);
129
                            GraphicsContainer cnt = ig.BeginContainer();
130
                            ig.EndContainer(cnt);
131

  
132
                            string s = ig.WriteSVGString();
133
                            string tempFile = Path.Combine(directoryInfo_.FullName, FileName);
134
                            var tw = new StreamWriter(tempFile, false);
135
                            tw.Write(s);
136
                            tw.Close();
137
                            tw.Dispose();
138
                            ig.Dispose();
139
                        }
140
                    }
141
                }
142
            }
143
            catch (Exception ex)
144
            {
145
                result = ex.ToString();
146
            }
147

  
148
            return result;
149
        }
150

  
151

  
152

  
153
        [WebMethod]
154
        public string ServerMapPathTest(string uri)
155
        {
156
            return GetFilePath(uri);
157
        }
158

  
159
        private string GetFilePath(string fileUri)
160
        {
161
            string filePath = null;
162

  
163
            try
164
            {
165
                string sConnString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
166
                KCOMEntities entity = new KCOMEntities(sConnString);
167

  
168
                var sysinfo = entity.PROPERTIES.Where(data => data.TYPE == "SystemInfo" && data.PROPERTY == "Url").FirstOrDefault();
169

  
170
                filePath = HttpContext.Current.Server.MapPath(new Uri(fileUri.Replace(sysinfo.VALUE, $"{ "Http://" + HttpContext.Current.Request.Url.Authority}")).LocalPath);
171
            }
172
            catch (Exception ex)
173
            {
174
                throw;
175
            }
176

  
177
            return filePath;
178
        }
179

  
180

  
181
        [WebMethod]
182
        public string SymbolRegen()
183
        {
184
            string result = "";
185

  
186
            try
187
            {
188
                StringBuilder sb = new StringBuilder();
189

  
190
                string sConnString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
191
                KCOMEntities entity = new KCOMEntities(sConnString);
192

  
193
                var sysinfo = entity.PROPERTIES.Where(data => data.TYPE == "SystemInfo" && data.PROPERTY == "Url").FirstOrDefault();
194

  
195
                foreach (var symbol in entity.SYMBOL_PRIVATE.Where(x => !x.IMAGE_URL.EndsWith(".svg")))
196
                {
197
                    //if (symbol.IMAGE_URL.StartsWith(sysinfo.VALUE))
198
                    //{
199
                    //    symbol.IMAGE_URL = symbol.IMAGE_URL.Replace(sysinfo.VALUE, "");
200
                    //}
201

  
202
                    if (symbol.IMAGE_URL.EndsWith(".png") || symbol.IMAGE_URL.EndsWith(".jpg"))
203
                    {
204
                        var filePath = GetFilePath(symbol.IMAGE_URL);
205

  
206
                        symbol.IMAGE_URL = symbol.IMAGE_URL.Replace(".png", ".svg").Replace(".jpg", ".svg");
207

  
208
                        using (var image = Image.FromFile(filePath))
209
                        {
210
                            using (var ig = new SvgGraphics(Color.Transparent))
211
                            {
212
                                ig.SmoothingMode = SmoothingMode.HighSpeed;
213
                                ig.DrawImage(image, 0, 0);
214
                                GraphicsContainer cnt = ig.BeginContainer();
215
                                ig.EndContainer(cnt);
216

  
217
                                string s = ig.WriteSVGString();
218
                                string svgFile = filePath.Replace(".png", ".svg").Replace(".jpg", ".svg");
219

  
220
                                var tw = new StreamWriter(svgFile, false);
221
                                tw.Write(s);
222
                                tw.Close();
223
                                tw.Dispose();
224
                                ig.Dispose();
225
                            }
226
                        }
227
                    }
228
                }
229

  
230
                foreach (var symbol in entity.SYMBOL_PUBLIC.Where(x => !x.IMAGE_URL.EndsWith(".svg")))
231
                {
232
                    //if (symbol.IMAGE_URL.StartsWith(sysinfo.VALUE))
233
                    //{
234
                    //    symbol.IMAGE_URL = symbol.IMAGE_URL.Replace(sysinfo.VALUE, "");
235
                    //}
236

  
237
                    if (symbol.IMAGE_URL.EndsWith(".png") || symbol.IMAGE_URL.EndsWith(".jpg"))
238
                    {
239
                        var filePath = GetFilePath(symbol.IMAGE_URL);
240

  
241
                        symbol.IMAGE_URL = symbol.IMAGE_URL.Replace(".png", ".svg").Replace(".jpg", ".svg");
242

  
243
                        using (var image = Image.FromFile(filePath))
244
                        {
245
                            using (var ig = new SvgGraphics(Color.Transparent))
246
                            {
247
                                ig.DrawImage(image, 0, 0);
248
                                GraphicsContainer cnt = ig.BeginContainer();
249
                                ig.EndContainer(cnt);
250

  
251
                                string s = ig.WriteSVGString();
252
                                string svgFile = filePath.Replace(".png", ".svg").Replace(".jpg", ".svg");
253

  
254
                                var tw = new StreamWriter(svgFile, false);
255
                                tw.Write(s);
256
                                tw.Close();
257
                                tw.Dispose();
258
                                ig.Dispose();
259
                            }
260
                        }
261
                    }
262
                }
263

  
264
                entity.SaveChanges();
265

  
266
                result = "OK";
267
            }
268
            catch (Exception)
269
            {
270
                throw;
271
            }
272
            return result;
273
        }
274

  
275

  
78 276
        public Image Converter(string base64String)
79 277
        {
80 278
            byte[] imageBytes = Convert.FromBase64String(base64String);
FileUploadWevService/FileUploadWevService.csproj
90 90
      <Name>KCOMDataModel</Name>
91 91
    </ProjectReference>
92 92
  </ItemGroup>
93
  <ItemGroup>
94
    <PackageReference Include="SvgNet">
95
      <Version>3.3.3</Version>
96
    </PackageReference>
97
  </ItemGroup>
93 98
  <PropertyGroup>
94 99
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
95 100
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
INI/MARKUS_SNI.ini
1 1
[Internal]
2
IP=http://sdms.co.kr:8080/API_V3
2
IP=http://markus.xicna.com:5977/API_V4
3 3
[External]
4
IP=http://sdms.co.kr:8080/API_V3
4
IP=http://markus.xicna.com:5977/API_V4
5 5
[BaseClientAddress]
6
URL=http://sdms.co.kr:8080/API_V3
6
URL=http://markus.xicna.com:5977/API_V4
7 7
[HubAddress]
8 8
URL=http://192.168.0.67:5100/
9 9
[UpdateVer64]
......
15 15
[KCOM_Get_FinalImage_Get_PdfImage]
16 16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
17 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
18
URL=http://markus.xicna.com:5977/ImageUpload/FileUpload.asmx
19 19
[mainServerImageWebPath]
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 21
[subServerImageWebPath]
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
22
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 23
[Debug_BaseClientAddress]
24 24
URL=http://192.168.0.67:5979
25 25
[HOST_DOMAIN]
KCOM.sln
152 152
EndProject
153 153
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TokenAuthenticateModule", "TokenAuthenticateModule\TokenAuthenticateModule.csproj", "{A6C3AFC7-EBFC-489B-BB85-80C2A46A1E8C}"
154 154
EndProject
155
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddressModule", "AddressModule\AddressModule.csproj", "{99F05F7F-AE88-4507-8F65-D401B1D7356F}"
156
EndProject
155 157
Global
156 158
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
157 159
		Daelim_RemoteTest|Any CPU = Daelim_RemoteTest|Any CPU
......
3665 3667
		{A6C3AFC7-EBFC-489B-BB85-80C2A46A1E8C}.Release|x64.Build.0 = Release|Any CPU
3666 3668
		{A6C3AFC7-EBFC-489B-BB85-80C2A46A1E8C}.Release|x86.ActiveCfg = Release|Any CPU
3667 3669
		{A6C3AFC7-EBFC-489B-BB85-80C2A46A1E8C}.Release|x86.Build.0 = Release|Any CPU
3670
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|Any CPU.ActiveCfg = Debug|Any CPU
3671
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|Any CPU.Build.0 = Debug|Any CPU
3672
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|x64.ActiveCfg = Debug|Any CPU
3673
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|x64.Build.0 = Debug|Any CPU
3674
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|x86.ActiveCfg = Debug|Any CPU
3675
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Daelim_RemoteTest|x86.Build.0 = Debug|Any CPU
3676
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|Any CPU.ActiveCfg = Debug|Any CPU
3677
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|Any CPU.Build.0 = Debug|Any CPU
3678
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|x64.ActiveCfg = Debug|Any CPU
3679
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|x64.Build.0 = Debug|Any CPU
3680
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|x86.ActiveCfg = Debug|Any CPU
3681
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_CadExport|x86.Build.0 = Debug|Any CPU
3682
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3683
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|Any CPU.Build.0 = Debug|Any CPU
3684
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|x64.ActiveCfg = Debug|Any CPU
3685
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|x64.Build.0 = Debug|Any CPU
3686
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|x86.ActiveCfg = Debug|Any CPU
3687
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_Daelim|x86.Build.0 = Debug|Any CPU
3688
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
3689
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
3690
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
3691
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|x64.Build.0 = Debug|Any CPU
3692
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|x86.ActiveCfg = Debug|Any CPU
3693
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_DevDoftech|x86.Build.0 = Debug|Any CPU
3694
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|Any CPU.ActiveCfg = Debug|Any CPU
3695
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|Any CPU.Build.0 = Debug|Any CPU
3696
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|x64.ActiveCfg = Debug|Any CPU
3697
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|x64.Build.0 = Debug|Any CPU
3698
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|x86.ActiveCfg = Debug|Any CPU
3699
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_HyoSung|x86.Build.0 = Debug|Any CPU
3700
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3701
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|Any CPU.Build.0 = Debug|Any CPU
3702
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|x64.ActiveCfg = Debug|Any CPU
3703
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|x64.Build.0 = Debug|Any CPU
3704
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|x86.ActiveCfg = Debug|Any CPU
3705
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug_SNI|x86.Build.0 = Debug|Any CPU
3706
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3707
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|Any CPU.Build.0 = Debug|Any CPU
3708
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|x64.ActiveCfg = Debug|Any CPU
3709
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|x64.Build.0 = Debug|Any CPU
3710
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|x86.ActiveCfg = Debug|Any CPU
3711
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Debug|x86.Build.0 = Debug|Any CPU
3712
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|Any CPU.ActiveCfg = Debug|Any CPU
3713
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|Any CPU.Build.0 = Debug|Any CPU
3714
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|x64.ActiveCfg = Debug|Any CPU
3715
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|x64.Build.0 = Debug|Any CPU
3716
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|x86.ActiveCfg = Debug|Any CPU
3717
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_BSENG|x86.Build.0 = Debug|Any CPU
3718
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|Any CPU.ActiveCfg = Debug|Any CPU
3719
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|Any CPU.Build.0 = Debug|Any CPU
3720
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|x64.ActiveCfg = Debug|Any CPU
3721
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|x64.Build.0 = Debug|Any CPU
3722
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|x86.ActiveCfg = Debug|Any CPU
3723
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Daelim|x86.Build.0 = Debug|Any CPU
3724
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|Any CPU.ActiveCfg = Debug|Any CPU
3725
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|Any CPU.Build.0 = Debug|Any CPU
3726
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|x64.ActiveCfg = Debug|Any CPU
3727
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|x64.Build.0 = Debug|Any CPU
3728
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|x86.ActiveCfg = Debug|Any CPU
3729
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Demo|x86.Build.0 = Debug|Any CPU
3730
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|Any CPU.ActiveCfg = Debug|Any CPU
3731
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|Any CPU.Build.0 = Debug|Any CPU
3732
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|x64.ActiveCfg = Debug|Any CPU
3733
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|x64.Build.0 = Debug|Any CPU
3734
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|x86.ActiveCfg = Debug|Any CPU
3735
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung_X86|x86.Build.0 = Debug|Any CPU
3736
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|Any CPU.ActiveCfg = Debug|Any CPU
3737
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|Any CPU.Build.0 = Debug|Any CPU
3738
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|x64.ActiveCfg = Debug|Any CPU
3739
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|x64.Build.0 = Debug|Any CPU
3740
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|x86.ActiveCfg = Debug|Any CPU
3741
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_Hyosung|x86.Build.0 = Debug|Any CPU
3742
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|Any CPU.ActiveCfg = Debug|Any CPU
3743
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|Any CPU.Build.0 = Debug|Any CPU
3744
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|x64.ActiveCfg = Debug|Any CPU
3745
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|x64.Build.0 = Debug|Any CPU
3746
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|x86.ActiveCfg = Debug|Any CPU
3747
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.DeployWeb_SNI|x86.Build.0 = Debug|Any CPU
3748
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|Any CPU.ActiveCfg = Release|Any CPU
3749
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|Any CPU.Build.0 = Release|Any CPU
3750
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|x64.ActiveCfg = Release|Any CPU
3751
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|x64.Build.0 = Release|Any CPU
3752
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|x86.ActiveCfg = Release|Any CPU
3753
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_Default|x86.Build.0 = Release|Any CPU
3754
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|Any CPU.ActiveCfg = Release|Any CPU
3755
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|Any CPU.Build.0 = Release|Any CPU
3756
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|x64.ActiveCfg = Release|Any CPU
3757
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|x64.Build.0 = Release|Any CPU
3758
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|x86.ActiveCfg = Release|Any CPU
3759
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release_PEMSS|x86.Build.0 = Release|Any CPU
3760
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|Any CPU.ActiveCfg = Release|Any CPU
3761
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|Any CPU.Build.0 = Release|Any CPU
3762
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|x64.ActiveCfg = Release|Any CPU
3763
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|x64.Build.0 = Release|Any CPU
3764
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|x86.ActiveCfg = Release|Any CPU
3765
		{99F05F7F-AE88-4507-8F65-D401B1D7356F}.Release|x86.Build.0 = Release|Any CPU
3668 3766
	EndGlobalSection
3669 3767
	GlobalSection(SolutionProperties) = preSolution
3670 3768
		HideSolutionNode = FALSE
KCOM/App.xaml.cs
48 48
        public static string Custom_ViewInfoId;
49 49
        public static bool ParameterMode = false;
50 50
        public static bool isExternal = false;
51
        public static bool isAuthenticate = false;
52
        public static string AuthenticateToken = null;
51 53

  
52 54
        /// <summary>
53 55
        /// logger
......
236 238
                //_binding.ReceiveTimeout = new TimeSpan(0, 10, 0);
237 239
                //_binding.CloseTimeout = new TimeSpan(0, 5, 0);
238 240
                //_binding.SendTimeout = new TimeSpan(0, 5, 0);
241
#if BASIC_BINDING
239 242

  
240 243
                #region 기본 binding
241 244
                BasicHttpBinding basicHttpBinding = new BasicHttpBinding(BasicHttpSecurityMode.None);
......
273 276
                //httpTransport.HostNameComparisonMode = HostNameComparisonMode.StrongWildcard;
274 277
                //System.ServiceModel.Channels.CustomBinding binding = new System.ServiceModel.Channels.CustomBinding(reliableSession, httpTransport);
275 278
                #endregion
276

  
279
#elif CUSTOM_BINDING
277 280
                #region custombinding
278
                //var customBinding = new System.ServiceModel.Channels.CustomBinding()
279
                //{
280
                //    OpenTimeout = new TimeSpan(0, 15, 0),
281
                //    ReceiveTimeout = new TimeSpan(0, 15, 0),
282
                //    CloseTimeout = new TimeSpan(0, 15, 0),
283
                //    SendTimeout = new TimeSpan(0, 15, 0),
284
                //};
281
                var customBinding = new System.ServiceModel.Channels.CustomBinding()
282
                {
283
                    OpenTimeout = new TimeSpan(0, 15, 0),
284
                    ReceiveTimeout = new TimeSpan(0, 15, 0),
285
                    CloseTimeout = new TimeSpan(0, 15, 0),
286
                    SendTimeout = new TimeSpan(0, 15, 0),
287
                };
285 288

  
286
                //var messageEncoding = new WcfExtensions.ServiceModel.Channels.CompressionBindingElement();
287
                //messageEncoding.Level = WcfExtensions.ServiceModel.Channels.CompressionLevel.Fast;
289
                var messageEncoding = new WcfExtensions.ServiceModel.Channels.CompressionBindingElement();
290
                messageEncoding.Level = WcfExtensions.ServiceModel.Channels.CompressionLevel.Fast;
288 291

  
289
                //var httpTranport = new System.ServiceModel.Channels.HttpTransportBindingElement
290
                //{
291
                //    MaxBufferPoolSize = Int32.MaxValue,
292
                //    MaxBufferSize = Int32.MaxValue,
293
                //    MaxReceivedMessageSize = Int32.MaxValue,
294
                //    RequestInitializationTimeout = new TimeSpan(0, 10, 0),
295
                //    UseDefaultWebProxy = false,
296
                //    ProxyAddress = new Uri("Http://127.0.0.1:8888")
297
                //};
292
                var httpTranport = new System.ServiceModel.Channels.HttpTransportBindingElement
293
                {
294
                    MaxBufferPoolSize = Int32.MaxValue,
295
                    MaxBufferSize = Int32.MaxValue,
296
                    MaxReceivedMessageSize = Int32.MaxValue,
297
                    RequestInitializationTimeout = new TimeSpan(0, 10, 0),
298
                    //UseDefaultWebProxy = false,
299
                    //ProxyAddress = new Uri("Http://127.0.0.1:8888")
300
                };
298 301

  
299 302

  
300
                //customBinding.CreateBindingElements();
301
                //customBinding.Elements.Add(messageEncoding);
302
                //customBinding.Elements.Add(httpTranport);
303
                customBinding.CreateBindingElements();
304
                customBinding.Elements.Add(messageEncoding);
305
                customBinding.Elements.Add(httpTranport);
303 306

  
304 307

  
305
                //_binding = customBinding;
308
                _binding = customBinding;
306 309
                #endregion
307 310

  
311
#endif
312

  
308 313
                //Support.SetLicense();
309 314

  
310 315
#if DEBUG
......
314 319
#else
315 320
                BaseAddress = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", isExternal);
316 321
#endif
317
                
322

  
323
                if (isAuthenticate)
324
                {
325
                    App.AuthenticateToken = Authenticate(BaseAddress);
326
                }
327

  
318 328
                var UploadAddress = CommonLib.Common.GetConfigString("KCOM_kr_co_devdoftech_cloud_FileUpload", "URL", "");
319 329

  
320 330
                if (!string.IsNullOrWhiteSpace(UploadAddress) && !string.IsNullOrWhiteSpace(BaseAddress))
......
327 337

  
328 338
                    FileUploadUri = uploadUri.ToString();
329 339
                }
340
#if BASIC_BINDING
341
                _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc/", BaseAddress));
342
#elif CUSTOM_BINDING
343
                _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc/gzip", BaseAddress));
344
#endif
345

  
346
                App.FileLogger.Debug(_EndPoint.Uri);
330 347

  
331
                App.FileLogger.Debug(string.Format("{0}/ServiceDeepView.svc/gzip", BaseAddress));
332
                _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", BaseAddress));
333
                
334 348
#if !DEBUG
335 349
#endif
336 350
                //var license = new License.Validator.Valid(BaseAddress + "/License");
......
366 380
                await SplashScreenAsnyc();
367 381
            }
368 382
        }
383
        private string Authenticate(string baseUri)
384
        {
385
            string result = null;
386

  
387
            try
388
            {
389
                Uri uri = new Uri(baseUri);
390
                string baseUrl = uri.Scheme + "://" + uri.Host + (uri.IsDefaultPort ? "" : ":" + uri.Port);
391

  
392
                using (System.Net.WebClient client = new System.Net.WebClient())
393
                {
394
                    client.Headers.Add(HttpRequestHeader.Authorization, "!dsfadsfa@@~");
395
                    var response = client.DownloadString(baseUrl + "/Authenticate");
396

  
397
                    if (response != null)
398
                    {
399
                        result = response;
400
                    }
401
                }
402
            }
403
            catch (Exception)
404
            {
405

  
406
                throw;
407
            }
408

  
409
            return result;
410
        }
369 411

  
370 412
        private void License_ValidateError(object sender, ValidateErrorArgs e)
371 413
        {
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>DEBUG;TRACE</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>
......
993 993
      <SubType>Designer</SubType>
994 994
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
995 995
    </None>
996
    <None Include="MARKUS - 복사본.ini">
997
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
998
    </None>
996
    <None Include="MARKUS - 복사본.ini" />
999 997
    <None Include="MARKUS.ini">
1000 998
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
1001 999
    </None>
KCOM/KCOM.csproj.user
17 17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
18 18
  </PropertyGroup>
19 19
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
20
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2giLCJNb2RlIjowfQ==</StartArguments>
20
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxZjY4MDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
21 21
    <StartAction>Project</StartAction>
22 22
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
23 23
  </PropertyGroup>
KCOM/MARKUS.ini
1 1
[Internal]
2
IP=localhost
2
IP=http://markus.xicna.com:5977/API_V4
3 3
[External]
4
IP=125.129.196.207
4
IP=http://markus.xicna.com:5977/API_V4
5 5
[BaseClientAddress]
6
URL=http://localhost:44301
6
URL=http://markus.xicna.com:5977/API_V4
7 7
[HubAddress]
8 8
URL=http://192.168.0.67:5100/
9 9
[UpdateVer64]
10
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml
10
URL=http://localhost:8080/TileSource/Version/version_x64.xml
11 11
[UpdateVer86]
12
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml
12
URL=http://localhost:8080/TileSource/Version/version_x86.xml
13 13
[excelFilePath]
14
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx
14
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
15 15
[KCOM_Get_FinalImage_Get_PdfImage]
16
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
17 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
18
URL=http://markus.xicna.com:5977/ImageUpload/FileUpload.asmx
19 19
[mainServerImageWebPath]
20
URL=http://localhost:44301/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 21
[subServerImageWebPath]
22
URL=http://localhost:44301/TileSource/{0}_Tile/{1}/{2}/{3}.png
22
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 23
[Debug_BaseClientAddress]
24 24
URL=http://192.168.0.67:5979
25 25
[HOST_DOMAIN]
......
31 31
[SetFinalPDFSuccess]
32 32
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU
33 33
[SetThumbnail]
34
WIDTH=100
34
WIDTH=265
35 35
[Site]
36
NAME=DAELIM
36
NAME=sdms
37 37
[PortForwarding]
38 38
HUB=5100:5100
39 39
RESOURCE=5977:5977
40
BASE=5979:5979
40
BASE=8080:8080
41 41
[GetImageResourceFailed]
42 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
43 43

  
44

  
45 44
[COMMON]
46 45
IsDocumentHistory = false
KCOM/PageManager/PageStorage.cs
46 46
                _TotalPages = totalPages;
47 47
                _TakeCount = takeCount;
48 48

  
49
                _token = Authenticate();
49
                //_token = Authenticate();
50 50

  
51 51
                System.IO.DirectoryInfo info = System.IO.Directory.CreateDirectory(LocalStorage);
52 52

  
......
275 275
                    }
276 276
                }
277 277
            }
278
            catch (Exception)
278
            catch (Exception ex)
279 279
            {
280

  
281
                throw;
280
                throw ex;
282 281
            }
283 282

  
284 283
            return result;
......
333 332
                    System.Diagnostics.Debug.WriteLine("download start " + downloadFilePath);
334 333
                    client.CachePolicy = new System.Net.Cache.RequestCachePolicy(System.Net.Cache.RequestCacheLevel.NoCacheNoStore);
335 334
                    client.Headers.Add("Cache-Control", "no-cache");
336
                    client.Headers.Add(HttpRequestHeader.Authorization, _token);
335
                    //client.Headers.Add(HttpRequestHeader.Authorization, _token);
337 336

  
338 337
                    //client.ResponseHeaders.Add(HttpRequestHeader.Authorization,)
339 338
                    client.UseDefaultCredentials = true;
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("5.3.0.0")]
55
[assembly: AssemblyFileVersion("5.3.0.0")]
54
[assembly: AssemblyVersion("5.3.1.0")]
55
[assembly: AssemblyFileVersion("5.3.1.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM_API/KCOM_API.csproj
199 199
    </None>
200 200
  </ItemGroup>
201 201
  <ItemGroup>
202
    <ProjectReference Include="..\AddressModule\AddressModule.csproj">
203
      <Project>{99f05f7f-ae88-4507-8f65-d401b1d7356f}</Project>
204
      <Name>AddressModule</Name>
205
    </ProjectReference>
202 206
    <ProjectReference Include="..\FinalService\KCOM_FinalService\IFinalPDF\IFinalPDF.csproj">
203 207
      <Project>{784438be-2074-41ae-a692-24e1a4a67fe3}</Project>
204 208
      <Name>IFinalPDF</Name>
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-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>
10
    <History>True|2023-08-05T08:11:18.9473506Z;True|2023-08-05T17:10:51.1260416+09:00;True|2023-08-05T17:10:15.6768362+09:00;True|2023-08-05T17:05:00.6983156+09:00;True|2023-08-05T17:03:52.8404213+09:00;True|2023-08-05T17:02:21.8070007+09:00;True|2023-08-05T16:59:21.4828422+09:00;True|2023-04-26T09:20:18.0086339+09:00;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
    <File Include="bin/AddressModule.dll">
17
      <publishTime>08/05/2023 17:11:02</publishTime>
18
    </File>
19
    <File Include="bin/AddressModule.pdb">
20
      <publishTime>08/05/2023 17:11:02</publishTime>
21
    </File>
16 22
    <File Include="bin/CommonLib.dll">
17
      <publishTime>04/24/2023 09:48:09</publishTime>
23
      <publishTime>08/05/2023 17:11:01</publishTime>
18 24
    </File>
19 25
    <File Include="bin/CommonLib.pdb">
20
      <publishTime>04/24/2023 09:48:09</publishTime>
26
      <publishTime>08/05/2023 17:11:01</publishTime>
21 27
    </File>
22 28
    <File Include="bin/CompareLib.dll">
23 29
      <publishTime>03/27/2018 10:07:16</publishTime>
......
62 68
      <publishTime>09/19/2015 15:28:04</publishTime>
63 69
    </File>
64 70
    <File Include="bin/IFinalPDF.dll">
65
      <publishTime>04/25/2023 21:26:29</publishTime>
71
      <publishTime>08/05/2023 17:11:01</publishTime>
66 72
    </File>
67 73
    <File Include="bin/IFinalPDF.pdb">
68
      <publishTime>04/25/2023 21:26:29</publishTime>
74
      <publishTime>08/05/2023 17:11:01</publishTime>
69 75
    </File>
70 76
    <File Include="bin/IKCOM.dll">
71
      <publishTime>04/25/2023 20:44:05</publishTime>
77
      <publishTime>08/05/2023 17:11:06</publishTime>
72 78
    </File>
73 79
    <File Include="bin/IKCOM.pdb">
74
      <publishTime>04/25/2023 20:44:05</publishTime>
80
      <publishTime>08/05/2023 17:11:06</publishTime>
75 81
    </File>
76 82
    <File Include="bin/it/ZedGraph.resources.dll">
77 83
      <publishTime>09/19/2015 15:28:04</publishTime>
......
80 86
      <publishTime>09/19/2015 15:28:04</publishTime>
81 87
    </File>
82 88
    <File Include="bin/KCOMDataModel.dll">
83
      <publishTime>04/24/2023 09:48:09</publishTime>
89
      <publishTime>08/05/2023 17:11:02</publishTime>
84 90
    </File>
85 91
    <File Include="bin/KCOMDataModel.dll.config">
86 92
      <publishTime>06/08/2020 15:07:57</publishTime>
87 93
    </File>
88 94
    <File Include="bin/KCOMDataModel.pdb">
89
      <publishTime>04/24/2023 09:48:09</publishTime>
95
      <publishTime>08/05/2023 17:11:02</publishTime>
90 96
    </File>
91 97
    <File Include="bin/KCOM_API.dll">
92
      <publishTime>04/26/2023 09:18:38</publishTime>
98
      <publishTime>08/05/2023 17:11:08</publishTime>
93 99
    </File>
94 100
    <File Include="bin/KCOM_API.pdb">
95
      <publishTime>04/26/2023 09:18:38</publishTime>
101
      <publishTime>08/05/2023 17:11:08</publishTime>
96 102
    </File>
97 103
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
98 104
      <publishTime>06/29/2017 11:38:22</publishTime>
......
124 130
    <File Include="bin/Markus.Image.OpenCV.dll">
125 131
      <publishTime>06/19/2020 06:34:52</publishTime>
126 132
    </File>
133
    <File Include="bin/Markus.ImageHandler.dll">
134
      <publishTime>08/05/2023 17:11:02</publishTime>
135
    </File>
136
    <File Include="bin/Markus.ImageHandler.pdb">
137
      <publishTime>08/05/2023 17:11:02</publishTime>
138
    </File>
139
    <File Include="bin/Microsoft.IdentityModel.Abstractions.dll">
140
      <publishTime>07/28/2023 11:14:36</publishTime>
141
    </File>
142
    <File Include="bin/Microsoft.IdentityModel.JsonWebTokens.dll">
143
      <publishTime>07/28/2023 10:52:56</publishTime>
144
    </File>
145
    <File Include="bin/Microsoft.IdentityModel.Logging.dll">
146
      <publishTime>07/28/2023 10:54:06</publishTime>
147
    </File>
148
    <File Include="bin/Microsoft.IdentityModel.Tokens.dll">
149
      <publishTime>07/28/2023 10:59:02</publishTime>
150
    </File>
127 151
    <File Include="bin/Newtonsoft.Json.dll">
128 152
      <publishTime>03/18/2021 05:03:36</publishTime>
129 153
    </File>
......
154 178
    <File Include="bin/sv/ZedGraph.resources.dll">
155 179
      <publishTime>09/19/2015 15:28:04</publishTime>
156 180
    </File>
181
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
182
      <publishTime>07/28/2023 10:48:30</publishTime>
183
    </File>
157 184
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
158 185
      <publishTime>02/21/2020 03:58:04</publishTime>
159 186
    </File>
......
230 257
      <publishTime>07/10/2019 14:11:36</publishTime>
231 258
    </File>
232 259
    <File Include="Web.config">
233
      <publishTime>04/26/2023 09:20:12</publishTime>
260
      <publishTime>08/05/2023 17:11:18</publishTime>
234 261
    </File>
235 262
  </ItemGroup>
236 263
</Project>
KCOM_API/Web.config
74 74
	  </httpModules>-->
75 75
  </system.web>
76 76
  <system.webServer>
77
	  <!--<modules>
78
		  <add name="SessionEndModule" type="Markus.AddressModule"/>
79
	  </modules>-->
77 80
	  <handlers>
78 81
		  <add name="ImageHandler1" type="Markus.ImageHandler" verb="*" path="Authenticate"/>
79 82
		  <add name="ImageHandler2" type="Markus.ImageHandler" verb="*" path="*.png"/>
MarkusAutoUpdate/INI/MARKUS_SNI.ini
1 1
[Internal]
2
IP=http://sdms.co.kr:8080/API_V3
2
IP=http://markus.xicna.com:5977/API_V4
3 3
[External]
4
IP=http://sdms.co.kr:8080/API_V3
4
IP=http://markus.xicna.com:5977/API_V4
5 5
[BaseClientAddress]
6
URL=http://sdms.co.kr:8080/API_V3
6
URL=http://markus.xicna.com:5977/API_V4
7 7
[HubAddress]
8 8
URL=http://192.168.0.67:5100/
9 9
[UpdateVer64]
......
15 15
[KCOM_Get_FinalImage_Get_PdfImage]
16 16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
17 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
18
URL=http://markus.xicna.com:5977/ImageUpload/FileUpload.asmx
19 19
[mainServerImageWebPath]
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 21
[subServerImageWebPath]
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
22
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 23
[Debug_BaseClientAddress]
24 24
URL=http://192.168.0.67:5979
25 25
[HOST_DOMAIN]
MarkusAutoUpdate/INI/Markus.AppUpdate_Daelim.ini
4 4

  
5 5
[APP_CAST]
6 6
URI = http://172.20.120.141:5977/MarkusUpdate/appcast.xml
7
EXTERNAL_URI = 203.226.6.165:5977
7
EXTERNAL_URI = 203.226.6.165:5977
8

  
9
[VERSION]
10
VERSION=1.0.0
MarkusAutoUpdate/INI/Markus.AppUpdate_SNI.ini
1 1
#SNI APP_CAST address
2 2

  
3 3
[APP_CAST]
4
URI = http://sdms.co.kr:8080/MarkusUpdate/appcast.xml
4
URI = http://markus.xicna.com:5977/MarkusUpdate_V4/appcast.xml
5

  
6
[VERSION]
7
VERSION=1.0.0
MarkusAutoUpdate/SetupWix/Product.wxs
7 7
<!-- The manufacturer, for setup package publisher and folder info -->
8 8
<?define Manufacturer = "Doftech (c)" ?>
9 9
<!-- The version number of this setup package-->
10
<?define Version = "1.6.0" ?>
10
<?define Version = "1.6.1" ?>
11 11
<!-- UpgradeCode must be unique and not changed once the first version of the program is installed. -->
12
<?define UpgradeCode = "{DAD69AEE-3912-4DCA-BF2E-FDF900C30AD0}" ?>
12
<?define UpgradeCode = "{DAD69AEE-3912-4DCA-BF2E-FDF900C30AD1}" ?>
13 13
<!-- The name of the Cabinet -->
14 14
<?define CabName = "MarkusUpdate.cab" ?>
15 15

  
......
118 118
			<File Id="Markus.AppUpdate.ini" Name="Markus.AppUpdate.ini" Source="$(var.NetSparkle.Samples.NetFramework.WPF_TargetDir)Markus.AppUpdate.ini" />
119 119
	    </Component>
120 120
	    <Component Id="MARKUS.ini" Guid="406e6027-fcfc-47e9-bff8-868bae6b9498">
121
			<RemoveFile Id="remove_comp_12D9BA535F5443E0B23AF72ED10A3381" Name="MARKUS.ini" On="install"/>
121 122
	      <File Id="MARKUS.ini" Name="MARKUS.ini" Source="$(var.NetSparkle.Samples.NetFramework.WPF_TargetDir)MARKUS.ini" />
122 123
	    </Component>
123 124
	    <Component Id="Markus.AppUpdate.exe" Guid="7855cf56-af12-40f8-8a44-3740268876e3">
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/MARKUS.ini
1
#DevDoftech 연결 INI
2 1
[Internal]
3
IP=192.168.0.67
2
IP=http://sdms.co.kr:8080/API_V3
4 3
[External]
5
IP=192.168.0.67
4
IP=http://sdms.co.kr:8080/API_V3
6 5
[BaseClientAddress]
7
URL=http://192.168.0.67:5979
6
URL=http://sdms.co.kr:8080/API_V3
8 7
[HubAddress]
9 8
URL=http://192.168.0.67:5100/
10 9
[UpdateVer64]
11
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml
10
URL=http://localhost:8080/TileSource/Version/version_x64.xml
12 11
[UpdateVer86]
13
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml
12
URL=http://localhost:8080/TileSource/Version/version_x86.xml
14 13
[excelFilePath]
15
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx
14
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
16 15
[KCOM_Get_FinalImage_Get_PdfImage]
17
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
18 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
19
URL=http://192.168.0.67:5977/ImageUpload/FileUpload.asmx
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
20 19
[mainServerImageWebPath]
21
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
22 21
[subServerImageWebPath]
23
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
24 23
[Debug_BaseClientAddress]
25 24
URL=http://192.168.0.67:5979
26 25
[HOST_DOMAIN]
......
32 31
[SetFinalPDFSuccess]
33 32
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU
34 33
[SetThumbnail]
35
WIDTH=100
34
WIDTH=265
36 35
[Site]
37
NAME=DAELIM
36
NAME=sdms
38 37
[PortForwarding]
39 38
HUB=5100:5100
40 39
RESOURCE=5977:5977
41
BASE=5979:5979
40
BASE=8080:8080
42 41
[GetImageResourceFailed]
43 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
43

  
44
[COMMON]
45
IsDocumentHistory = false
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/Markus.AppUpdate.ini
1
#daelim APP_CAST address
2
[HOST_DOMAIN]
3
DOMAIN=doftech.co.kr
1
#SNI APP_CAST address
4 2

  
5 3
[APP_CAST]
6
URI = http://192.168.0.67:5979/MarkusUpdate/appcast.xml
7
EXTERNAL_URI = 192.168.0.67:5979
4
URI = http://markus.xicna.com:5977/MarkusUpdate_V4/appcast.xml
5

  
6

  
7
[VERSION]
8
VERSION=1.0.0
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/Properties/AssemblyInfo.cs
51 51
// You can specify all the values or you can default the Build and Revision Numbers 
52 52
// by using the '*' as shown below:
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("1.8.3.0")]
55
[assembly: AssemblyFileVersion("1.8.3.0")]
54
[assembly: AssemblyVersion("1.9.4.0")]
55
[assembly: AssemblyFileVersion("1.9.4.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/VistaSecurity.cs
61 61
                return; //If cancelled, do nothing
62 62
            }
63 63

  
64
            System.Windows.Forms.Application.Exit();
65
            System.Windows.Application.Current.Shutdown();
64
        //System.Windows.Forms.Application.Exit();
65

  
66
            if (System.Windows.Application.Current != null)
67
            {
68
                System.Windows.Application.Current.Shutdown();
69
            }
66 70
        }
67 71
    }
appCast_SNI.bat
15 15

  
16 16
rem version
17 17

  
18
rem set hostbaseUrl=http://10.11.142.22:8080/MarkusUpdate/
19
set hostbaseUrl=http://sdms.co.kr:8080/MarkusUpdate/
20
rem set hostbaseUrl=http://10.11.132.77:5977/MarkusUpdate/
18
set hostbaseUrl=http://markus.xicna.com:5977/MarkusUpdate_V4/
21 19
set updateVersion=%1
22 20

  
23 21
IF [%hostbaseUrl%]==[] goto :ERROR

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)