프로젝트

일반

사용자정보

개정판 a7bee7cf

IDa7bee7cfa12243d17603f1c9ce524ccee8445e7e
상위 77cdac33
하위 4fcb686a

김태성이(가) 약 3년 전에 추가함

issue #0000 final pdf ArcControl이 Markus와 틀리게 나오는 부분 수정
text가 꽉차는 문제/화살표 텍스트박스 사용시 final에서 잘못 그려지는 문제

Change-Id: Idc98fb47d254a6e11eadcd51a8ceaa42bc9ffa26

차이점 보기:

ConvertService/ServiceBase/Markus.Service.Monitor/Markus.Service.MonitorService.csproj
112 112
      <SubType>Designer</SubType>
113 113
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
114 114
    </Content>
115
    <None Include="ServiceMonitor.ini">
116
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
117
    </None>
115 118
    <None Include="packages.config" />
116 119
  </ItemGroup>
117 120
  <ItemGroup>
ConvertService/ServiceBase/Markus.Service.Monitor/ServiceMonitor.cs
13 13
using System.Timers;
14 14
using Markus.Service.WcfClient.StationServiceAsync;
15 15
using log4net;
16
using Salaros.Configuration;
16 17

  
17 18
namespace Markus.Service.MonitorService
18 19
{
......
23 24
            InitializeComponent();
24 25
        }
25 26

  
26
        private const string ConvertProcessName = "Markus.Service.ConvertProcess";
27
        private const string StationProcessName = "Markus.Service.Station";
28
        private const string StationServiceName = "ServiceStation";
27
        //private const string ConvertProcessName = "Markus.Service.ConvertProcess";
28
        private string StationProcessName = "Markus.Service.Station";
29
        private string StationServiceName = "ServiceStation";
30
        private string FinalServiceName = "FinalService";
31
        private string StationServiceUri = "";
29 32

  
33
        ServiceController finalServiceController;
30 34
        ServiceController serviceStationController;
31 35
        StationServiceClient stationServiceClient;
36

  
32 37
        System.Timers.Timer timer;
33 38
        protected ILog logger = LogManager.GetLogger(typeof(ServiceMonitor));
34 39

  
35 40
        protected override void OnStart(string[] args)
36 41
        {
42
            GetApplicationConfig();
43

  
37 44
            logger.Info("Markus.Service.MonitorService Start");
38 45
            #region 체크 타이머
39
            timer = new System.Timers.Timer(new TimeSpan(0, 0, 0, 10).TotalMilliseconds);
46
            timer = new System.Timers.Timer(new TimeSpan(0, 0, 0, 15).TotalMilliseconds);
40 47
            timer.Elapsed += OnTimedEvent;
41 48
            timer.AutoReset = true;
42 49
            timer.Start();
43 50
            #endregion
44 51
        }
45 52

  
53
        public void GetApplicationConfig()
54
        {
55
            try
56
            {
57
                ConfigParser config = null;
58

  
59
                try
60
                {
61
                    var configFileName = $"{typeof(ServiceMonitor).Name}.ini";
62
                    config = ConfigHelper.AppConfig(configFileName);
63

  
64
                    if (config != null)
65
                    {
66
                        StationServiceName = config.GetValue(CONFIG_DEFINE.SERVICE, "CONVERT_SERVICE", "ServiceStation");
67
                        StationProcessName = config.GetValue(CONFIG_DEFINE.SERVICE, "CONVERT_PROCESS", "ServiceStation");
68
                        FinalServiceName = config.GetValue(CONFIG_DEFINE.SERVICE, "FINAL_SERVICE", "FinalService");
69
                        StationServiceUri = config.GetValue(CONFIG_DEFINE.SERVICE, "CONVERT_SERVICE_URI", "");
70
                    }
71
                }
72
                catch (Exception ex)
73
                {
74
                    throw new Exception("Config Read Error.", ex);
75
                }
76

  
77
            }
78
            catch
79
            {
80

  
81
            }
82
        }
83

  
46 84
        public void Start(string[] args)
47 85
        {
48 86
            OnStart(args);
......
60 98
                serviceStationController = new ServiceController(StationServiceName);
61 99
                logger.Info("Station Service Initialize");
62 100
            }
101

  
102
            if (finalServiceController == null)
103
            {
104
                finalServiceController = new ServiceController(FinalServiceName);
105
                logger.Info("Final Service Initialize");
106
            }
63 107
        }
64 108

  
65 109
        private void WcfClientInitialize()
......
70 114
            {
71 115
                if (stationServiceClient == null)
72 116
                {
73
                    string serviceWorkDir = process.First().Arguments().WorkingDirectory;
74

  
75
                    var config = ConfigHelper.AppConfig(System.IO.Path.Combine(serviceWorkDir, $"{StationServiceName}.ini"));
76

  
77
                    var endpointName = config.GetValue(CONFIG_DEFINE.WCF_ENDPOINT, CONFIG_DEFINE.STATION_SERVICE_NAME);
78
                    var port = config.GetValue(CONFIG_DEFINE.WCF_ENDPOINT, CONFIG_DEFINE.STATION_PORT);
79

  
80
                    if (!string.IsNullOrWhiteSpace(endpointName) && port.IsNumber())
117
                    if (!string.IsNullOrWhiteSpace(StationServiceUri))
81 118
                    {
82
                        var serviceUri = UriHelper.UriCreate($"http://localhost:{port}/{endpointName}");
83 119
                        BasicHttpBinding myBinding = new BasicHttpBinding();
84
                        EndpointAddress myEndpoint = new EndpointAddress(serviceUri);
120
                        EndpointAddress myEndpoint = new EndpointAddress(StationServiceUri);
85 121

  
86 122
                        stationServiceClient = new StationServiceClient(myBinding, myEndpoint);
87 123

  
......
99 135
            {
100 136
                #region 서비스 체크 
101 137
                
102
                if (serviceStationController == null)
138
                if (serviceStationController == null || finalServiceController == null)
103 139
                {
104 140
                    serviceStationController = null;
141
                    finalServiceController = null;
105 142
                    ServiceInitialize();
106 143
                }
107 144
                else
108 145
                {
109 146
                    serviceStationController.Refresh();
110
                    System.Diagnostics.Debug.WriteLine(" serviceController.Status : " + serviceStationController.Status);
111

  
112 147
                    logger.Info("Station Service State : " + serviceStationController.Status);
113 148

  
149
                    finalServiceController.Refresh();
150
                    logger.Info("Final Service State : " + finalServiceController.Status);
151

  
152
                    if (finalServiceController.Status != ServiceControllerStatus.Running && finalServiceController.Status != ServiceControllerStatus.StartPending)
153
                    {
154
                        logger.Error("final Service ReStart");
155
                        finalServiceController.Start();
156
                    }
157

  
114 158
                    if (serviceStationController.Status != ServiceControllerStatus.Running && serviceStationController.Status != ServiceControllerStatus.StartPending)
115 159
                    {
116 160
                        logger.Error("Station Service ReStart");
......
159 203
            }
160 204
            finally
161 205
            {
206
                logger.Info("Service Check");
207
  
162 208
                timer.Enabled = true;
163 209
            }
164 210
        }
FinalService/KCOM_FinalService/ConnectionStrEncrypt/Program.cs
23 23

  
24 24
            if (args == null || args?.Count() == 0)
25 25
            {
26
                //args = new[] { "-en", "data source=10.10.0.101;database=markus;user id=doftech;password=xpdhtm!1" };
27
                args = new[] { "-en", "data source=10.11.142.77;database=markus;user id=doftech;password=dof1073#" };
26
                args = new[] { "-en", "data source=210.94.128.101;database=markus;user id=doftech;password=xpdhtm!1" };
27
                //args = new[] { "-en", "data source=10.11.142.77;database=markus;user id=doftech;password=dof1073#" };
28 28
            }
29 29

  
30 30
            String key = "Doftech1073#";
FinalService/KCOM_FinalService/MarkupToPDF/Common/CommonFont.cs
63 63
            double dFontSize = double.MaxValue;
64 64

  
65 65
            BaseFont bf = CreateBaseFont(fontFamilly,BaseFont.IDENTITY_H, BaseFont.EMBEDDED, BaseFont.CACHED);
66

  
66
            
67 67
            string[] tokens = text.Split(Environment.NewLine.ToArray(), StringSplitOptions.RemoveEmptyEntries);
68 68
            foreach (var token in tokens)
69 69
            {
......
73 73
                dFontSize = size < dFontSize ? size : dFontSize;
74 74
            }
75 75
            
76
            iTextSharp.text.Font itextFont = new iTextSharp.text.Font(bf, (float)(dFontSize));
76
            iTextSharp.text.Font itextFont = new iTextSharp.text.Font(bf, (float)dFontSize - 0.8f);
77 77

  
78 78
            itextFont.SetStyle(0);
79 79
            if (fontstyle == FontStyles.Italic)
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_Arc.cs
31 31

  
32 32
            if (p2.Y >= p1.Y || p2.Y >= p3.Y)  //중간 Mid Point 는 Curve 특성에 대한 10 범위 내의 오차 적용
33 33
            {
34
                contentByte.CurveTo((float)p1.X, (float)p1.Y, (float)p2.X, (float)p2.Y + 10, (float)p3.X, (float)p3.Y);
34
                contentByte.CurveTo((float)p1.X, (float)p1.Y, (float)p2.X, (float)p2.Y +2, (float)p3.X, (float)p3.Y);
35 35
            }
36 36
            else
37 37
            {
38
                contentByte.CurveTo((float)p1.X, (float)p1.Y, (float)p2.X, (float)p2.Y - 10, (float)p3.X, (float)p3.Y);
38
                contentByte.CurveTo((float)p1.X, (float)p1.Y, (float)p2.X, (float)p2.Y -2, (float)p3.X, (float)p3.Y);
39 39
            }
40 40

  
41 41
            contentByte.Stroke();
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_DrawString.cs
50 50
                rect.TopLeft, rect.BottomLeft,
51 51
                rect.BottomRight, rect.TopRight
52 52
            };
53
            rect.Inflate(lineSize * 0.5, lineSize * 0.5);   /// 점을 중심으로 라인 두께가 그려짐으로 사각형 안쪽으로 텍스트가 쓰여지게 사각형을 키움
53

  
54
            double textMargin =0.5;
55

  
56
            rect.Inflate(lineSize * textMargin, lineSize * textMargin);   /// 점을 중심으로 라인 두께가 그려짐으로 사각형 안쪽으로 텍스트가 쓰여지게 사각형을 키움
54 57

  
55 58
            var calRect = MathSet.GetPointsToRectX(points);
56 59
            if(lineSize*2 > calRect.Height) lineSize *= 0.3;    /// 텍스트가 뒤집어 지는것 방지
57 60
            if (calRect.Top > calRect.Bottom)
58 61
            {
59
                calRect.Left += (float)(lineSize*0.5);
60
                calRect.Top -= (float)(lineSize*0.5);
61
                calRect.Right -= (float)(lineSize*0.5);
62
                calRect.Bottom += (float)(lineSize*0.5);
62
                calRect.Left += (float)(lineSize* textMargin);
63
                calRect.Top -= (float)(lineSize* textMargin);
64
                calRect.Right -= (float)(lineSize* textMargin);
65
                calRect.Bottom += (float)(lineSize* textMargin);
63 66
            }
64 67
            else ///Top이 작을 경우(예: 문서를 회전하여 Comment 작업한 경우)
65 68
            {
66
                calRect.Left += (float)(lineSize*0.5);
67
                calRect.Top += (float)(lineSize*0.5);
68
                calRect.Right -= (float)(lineSize*0.5);
69
                calRect.Bottom -= (float)(lineSize*0.5);
69
                calRect.Left += (float)(lineSize* textMargin);
70
                calRect.Top += (float)(lineSize* textMargin);
71
                calRect.Right -= (float)(lineSize* textMargin);
72
                calRect.Bottom -= (float)(lineSize* textMargin);
70 73
            }
71 74

  
72 75
            contentByte.SetLineWidth((float)lineSize);
......
231 234
            {
232 235
                if (!bIsFixed)
233 236
                {
234
                    ptEnd = MathSet.getNearPoint(points, ptMid);
237
                    List<Point> newPoints = new List<Point>();
238

  
239
                    newPoints.Add(MidPoint(points[0], points[3]));
240
                    newPoints.Add(MidPoint(points[0], points[1]));
241
                    newPoints.Add(MidPoint(points[1], points[2]));
242
                    newPoints.Add(MidPoint(points[2], points[3]));
243
                    //newPoints.AddRange(points);
244

  
245
                    ptEnd = MathSet.getNearPoint(newPoints, ptMid);
235 246
                }
236 247
            }
237 248

  
238 249
            DrawLeaderLineNew(ptHead, ptMid, ptEnd, bIsFixed, lineSize, contentByte, color, opac);
239 250
        }
240 251

  
241
        /// <summary>
242
        /// draw leader line for arrow_text
243
        /// </summary>
244
        /// <author>humkyung</author>
245
        /// <date>2019.06.12</date>
246
        /// <param name="start"></param>
247
        /// <param name="mid"></param>
248
        /// <param name="border"></param>
249
        /// <param name="LineSize"></param>
250
        /// <param name="contentByte"></param>
251
        /// <param name="color"></param>
252
        /// <param name="opac"></param>
253
        private static void DrawLeaderLine(Point start, Point mid, bool bIsFixed, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
252
        private static Point MidPoint(Point a, Point b)
253
        {
254
            Point middle = a;
255

  
256
            middle.X = (a.X + b.X) / 2;
257
            middle.Y = (a.Y + b.Y) / 2;
258

  
259
            return middle;
260
        }
261
    /// <summary>
262
    /// draw leader line for arrow_text
263
    /// </summary>
264
    /// <author>humkyung</author>
265
    /// <date>2019.06.12</date>
266
    /// <param name="start"></param>
267
    /// <param name="mid"></param>
268
    /// <param name="border"></param>
269
    /// <param name="LineSize"></param>
270
    /// <param name="contentByte"></param>
271
    /// <param name="color"></param>
272
    /// <param name="opac"></param>
273
    private static void DrawLeaderLine(Point start, Point mid, bool bIsFixed, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
254 274
        {
255 275
            /// prepare connection points
256 276
            List<Point> ptConns = new List<Point>();
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
788 788
                                                            }
789 789
                                                            else
790 790
                                                            {
791
                                                                Controls_PDF.DrawSet_Arc.DrawArc(StartPoint, MidPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
791
                                                                Controls_PDF.DrawSet_Arc.DrawArc(StartPoint, MidPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
792 792
                                                            }
793 793

  
794 794
                                                            if (ControlT.Name == "ArrowArcControl")
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.csproj
56 56
    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
57 57
      <HintPath>..\packages\BouncyCastle.1.8.6.1\lib\BouncyCastle.Crypto.dll</HintPath>
58 58
    </Reference>
59
    <Reference Include="itextsharp, Version=5.5.13.2, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
60
      <HintPath>..\packages\iTextSharp.5.5.13.2\lib\itextsharp.dll</HintPath>
59
    <Reference Include="itextsharp, Version=5.5.13.1, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
60
      <HintPath>..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll</HintPath>
61 61
    </Reference>
62 62
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
63 63
      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
FinalService/KCOM_FinalService/MarkupToPDF/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3 3
  <package id="BouncyCastle" version="1.8.6.1" targetFramework="net461" />
4
  <package id="iTextSharp" version="5.5.13.2" targetFramework="net461" />
4
  <package id="iTextSharp" version="5.5.13.1" targetFramework="net461" />
5 5
  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" requireReinstallation="true" />
6 6
  <package id="Rx-Main" version="1.0.11226" targetFramework="net40" />
7 7
  <package id="Rxx" version="1.3.4451.33754" targetFramework="net40" />
INI/MARKUS_BSENG.ini
1 1
#BSENG
2 2
[Internal]
3
IP=210.94.128.125
3
IP=markus.bseng.co.kr
4 4
[External]
5
IP=210.94.128.125
5
IP=markus.bseng.co.kr
6 6
[BaseClientAddress]
7
URL=http://210.94.128.125:5979
7
URL=http://markus.bseng.co.kr:5979
8 8
[HubAddress]
9
URL=http://210.94.128.125:5100/
9
URL=http://markus.bseng.co.kr:5100/
10 10
[UpdateVer64]
11
URL=http://210.94.128.125:5977/TileSource/Version/version_x64.xml
11
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x64.xml
12 12
[UpdateVer86]
13
URL=http://210.94.128.125:5977/TileSource/Version/version_x86.xml
13
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x86.xml
14 14
[excelFilePath]
15
URL=http://210.94.128.125:5977/TileSource/Check_Test/CheckList_T.xlsx
15
URL=http://markus.bseng.co.kr:5977/TileSource/Check_Test/CheckList_T.xlsx
16 16
[KCOM_Get_FinalImage_Get_PdfImage]
17
URL=http://210.94.128.125:5977/Get_FInalImage/Get_PdfImage.asmx
17
URL=http://markus.bseng.co.kr:5977/Get_FInalImage/Get_PdfImage.asmx
18 18
[KCOM_kr_co_devdoftech_cloud_FileUpload]
19
URL=http://210.94.128.125:5977/ImageUpload/FileUpload.asmx
19
URL=http://markus.bseng.co.kr:5977/ImageUpload/FileUpload.asmx
20 20
[mainServerImageWebPath]
21
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
22 22
[subServerImageWebPath]
23
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
24
[DocumentDownloadPath]
25
url=http://210.94.128.128/upload/{0}
23
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
26 24
[Debug_BaseClientAddress]
27
URL=http://210.94.128.125:5979
25
URL=http://markus.bseng.co.kr:5979
28 26
[HOST_DOMAIN]
29 27
DOMAIN=
30 28
[GetConversionStateFailed]
KCOM/App.xaml.cs
239 239
                _binding = new BasicHttpBinding(BasicHttpSecurityMode.TransportCredentialOnly);
240 240
                _binding.MaxBufferSize = 2147483647;
241 241
                _binding.MaxReceivedMessageSize = 2147483647;
242
                _binding.OpenTimeout = new TimeSpan(0, 1, 0);
242
                _binding.OpenTimeout = new TimeSpan(0, 10, 0);
243 243
                _binding.ReceiveTimeout = new TimeSpan(0, 10, 0);
244
                _binding.CloseTimeout = new TimeSpan(0, 5, 0);
245
                _binding.SendTimeout = new TimeSpan(0, 5, 0);
244
                _binding.CloseTimeout = new TimeSpan(0, 10, 0);
245
                _binding.SendTimeout = new TimeSpan(0, 10, 0);
246 246
                _binding.TextEncoding = System.Text.Encoding.UTF8;
247 247
                _binding.TransferMode = TransferMode.Buffered;
248 248
                //_binding.TextEncoding = System.Text.Encoding.UTF8;
......
273 273

  
274 274
                App.FileLogger.Debug(string.Format("{0}/ServiceDeepView.svc", BaseAddress));
275 275
                _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", BaseAddress));
276

  
277 276
#if !DEBUG
278 277
#endif
279
                var license = new License.Validator.Valid(BaseAddress + "/License");
278
                //var license = new License.Validator.Valid(BaseAddress + "/License");
280 279

  
281
                license.ValidateError += License_ValidateError;
280
                //license.ValidateError += License_ValidateError;
282 281

  
283
                license.GetLicense("public.xml");
282
                //license.GetLicense("public.xml");
284 283

  
285
                if (license.Activate())
286
                {
284
                //if (license.Activate())
285
                //{
287 286

  
288
                }
289
                else
290
                {
287
                //}
288
                //else
289
                //{
291 290

  
292
                }
291
                //}
293 292

  
294 293

  
295 294
                await SplashScreenAsnyc();
KCOM/Events/ConsolidateCommand.cs
63 63
                //Logger.sendReqLog("Consolidate", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID + "," + sDocID + "," + InfoList, 1);
64 64
                //Logger.sendResLog("Consolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList).ToString(), 1);
65 65

  
66
                result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList);
66
                result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList);
67 67

  
68 68
                //Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + sDocID, 1);
69
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, sDocID);
69
                if(result)
70
                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, sDocID);
70 71
            }
71 72
            catch (Exception ex)
72 73
            {
KCOM/KCOM.csproj.user
14 14
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
15 15
  </PropertyGroup>
16 16
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIyMzcyNDk1OTIiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
17
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMTMxIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
18 18
  </PropertyGroup>
19 19
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
20 20
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
KCOM/MARKUS.ini
1
#BSENG
2 1
[Internal]
3
IP=210.94.128.125
2
IP=localhost
4 3
[External]
5
IP=210.94.128.125
4
IP=125.129.196.207
6 5
[BaseClientAddress]
7
URL=http://210.94.128.125:5979
6
URL=http://localhost:44301
8 7
[HubAddress]
9
URL=http://210.94.128.125:5100/
8
URL=http://192.168.0.67:5100/
10 9
[UpdateVer64]
11
URL=http://210.94.128.125:5977/TileSource/Version/version_x64.xml
10
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml
12 11
[UpdateVer86]
13
URL=http://210.94.128.125:5977/TileSource/Version/version_x86.xml
12
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml
14 13
[excelFilePath]
15
URL=http://210.94.128.125:5977/TileSource/Check_Test/CheckList_T.xlsx
14
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx
16 15
[KCOM_Get_FinalImage_Get_PdfImage]
17
URL=http://210.94.128.125:5977/Get_FInalImage/Get_PdfImage.asmx
16
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
18 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
19
URL=http://210.94.128.125:5977/ImageUpload/FileUpload.asmx
18
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
20 19
[mainServerImageWebPath]
21
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
22 21
[subServerImageWebPath]
23
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
24
[DocumentDownloadPath]
25
URL=http://210.94.128.128/upload/{0}
22
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
26 23
[Debug_BaseClientAddress]
27
URL=http://210.94.128.125:5979
24
URL=http://192.168.0.67:5979
28 25
[HOST_DOMAIN]
29 26
DOMAIN=
30 27
[GetConversionStateFailed]
......
36 33
[SetThumbnail]
37 34
WIDTH=100
38 35
[Site]
39
NAME=
36
NAME=DAELIM
40 37
[PortForwarding]
41 38
HUB=5100:5100
42 39
RESOURCE=5977:5977
43 40
BASE=5979:5979
44 41
[GetImageResourceFailed]
45 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
43

  
44

  
45
[COMMON]
46
IsDocumentHistory = false
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("4.7.6.0")]
55
[assembly: AssemblyFileVersion("4.7.6.0")]
54
[assembly: AssemblyVersion("4.9.7.0")]
55
[assembly: AssemblyFileVersion("4.9.7.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM_API/Web.config
11 11
  </configSections>
12 12
  <connectionStrings>
13 13
    <add name="ConnectionString"
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=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
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=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
15 15
      providerName="System.Data.EntityClient"/>
16 16
    <add name="CIConnectionString"
17
      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=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
17
      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=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
18 18
      providerName="System.Data.EntityClient"/>
19 19
  </connectionStrings>
20 20
  <!--
......
26 26
      </system.Web>
27 27
  -->
28 28
  <system.web>
29

  
29
    <httpRuntime executionTimeout="600"/>
30 30
    <compilation targetFramework="4.5" debug="true"/>
31 31
    <pages controlRenderingCompatibilityVersion="4.0"/>
32 32
    <globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
......
35 35
	  </httpModules>
36 36
  </system.web>
37 37
  <system.serviceModel>
38
    <diagnostics wmiProviderEnabled="true" performanceCounters="Default">
38
    <!--<diagnostics wmiProviderEnabled="true" performanceCounters="Default">
39 39
      <messageLogging logEntireMessage="true" logMalformedMessages="true"
40 40
        logMessagesAtTransportLevel="true" />
41 41
      <endToEndTracing activityTracing="true" messageFlowTracing="true" />
42
    </diagnostics>
42
    </diagnostics>-->
43
    <diagnostics performanceCounters="Default" />
43 44
    <behaviors>
44 45
      <endpointBehaviors>
45 46
        <behavior name="WebHttpBehavior">
......
89 90
          </identity>
90 91
        </endpoint>
91 92
        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
93
        <host>
94
          <timeouts closeTimeout="00:30:00" openTimeout="00:30:00" />
95
        </host>
92 96
      </service>
93 97
      <service name="KCOM_API.MarkusService">
94 98
        <endpoint address="Rest" behaviorConfiguration="WebHttpBehavior"
......
117 121
        <value>True</value>
118 122
      </setting>
119 123
      <setting name="FinalService" serializeAs="String">
120
        <value>tcp://localhost:9093/remFinalPDF</value>
124
        <value>tcp://localhost:9092/remFinalPDF</value>
121 125
      </setting>
122 126
    </KCOM_API.Properties.Settings>
123 127
  </applicationSettings>
MarkusAutoUpdate/INI/MARKUS_BSENG.ini
1 1
#BSENG
2 2
[Internal]
3
IP=210.94.128.125
3
IP=markus.bseng.co.kr
4 4
[External]
5
IP=210.94.128.125
5
IP=markus.bseng.co.kr
6 6
[BaseClientAddress]
7
URL=http://210.94.128.125:5979
7
URL=http://markus.bseng.co.kr:5979
8 8
[HubAddress]
9
URL=http://210.94.128.125:5100/
9
URL=http://markus.bseng.co.kr:5100/
10 10
[UpdateVer64]
11
URL=http://210.94.128.125:5977/TileSource/Version/version_x64.xml
11
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x64.xml
12 12
[UpdateVer86]
13
URL=http://210.94.128.125:5977/TileSource/Version/version_x86.xml
13
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x86.xml
14 14
[excelFilePath]
15
URL=http://210.94.128.125:5977/TileSource/Check_Test/CheckList_T.xlsx
15
URL=http://markus.bseng.co.kr:5977/TileSource/Check_Test/CheckList_T.xlsx
16 16
[KCOM_Get_FinalImage_Get_PdfImage]
17
URL=http://210.94.128.125:5977/Get_FInalImage/Get_PdfImage.asmx
17
URL=http://markus.bseng.co.kr:5977/Get_FInalImage/Get_PdfImage.asmx
18 18
[KCOM_kr_co_devdoftech_cloud_FileUpload]
19
URL=http://210.94.128.125:5977/ImageUpload/FileUpload.asmx
19
URL=http://markus.bseng.co.kr:5977/ImageUpload/FileUpload.asmx
20 20
[mainServerImageWebPath]
21
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
22 22
[subServerImageWebPath]
23
URL=http://210.94.128.125:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
23
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
24 24
[Debug_BaseClientAddress]
25
URL=http://210.94.128.125:5979
25
URL=http://markus.bseng.co.kr:5979
26 26
[HOST_DOMAIN]
27 27
DOMAIN=
28 28
[GetConversionStateFailed]
MarkusAutoUpdate/INI/Markus.AppUpdate_BSENG.ini
3 3
DOMAIN=
4 4

  
5 5
[APP_CAST]
6
URI = http://210.94.128.125:5979/MarkusUpdate/appcast.xml
7
EXTERNAL_URI = 210.94.128.125:5979
6
URI = http://markus.bseng.co.kr:5979/MarkusUpdate/appcast.xml
7
EXTERNAL_URI = markus.bseng.co.kr:5979
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.0.0" ?>
10
<?define Version = "1.6.0" ?>
11 11
<!-- UpgradeCode must be unique and not changed once the first version of the program is installed. -->
12
<?define UpgradeCode = "{25DA3824-3F14-4040-826B-F8D1783E1288}" ?>
12
<?define UpgradeCode = "{DAD69AEE-3912-4DCA-BF2E-FDF900C30AD0}" ?>
13 13
<!-- The name of the Cabinet -->
14 14
<?define CabName = "MarkusUpdate.cab" ?>
15 15

  
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/MARKUS.ini
1
#BSENG
1 2
[Internal]
2
IP=http://sdms.co.kr:8080/API_V3
3
IP=markus.bseng.co.kr
3 4
[External]
4
IP=http://sdms.co.kr:8080/API_V3
5
IP=markus.bseng.co.kr
5 6
[BaseClientAddress]
6
URL=http://sdms.co.kr:8080/API_V3
7
URL=http://markus.bseng.co.kr:5979
7 8
[HubAddress]
8
URL=http://192.168.0.67:5100/
9
URL=http://markus.bseng.co.kr:5100/
9 10
[UpdateVer64]
10
URL=http://localhost:8080/TileSource/Version/version_x64.xml
11
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x64.xml
11 12
[UpdateVer86]
12
URL=http://localhost:8080/TileSource/Version/version_x86.xml
13
URL=http://markus.bseng.co.kr:5977/TileSource/Version/version_x86.xml
13 14
[excelFilePath]
14
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
15
URL=http://markus.bseng.co.kr:5977/TileSource/Check_Test/CheckList_T.xlsx
15 16
[KCOM_Get_FinalImage_Get_PdfImage]
16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
17
URL=http://markus.bseng.co.kr:5977/Get_FInalImage/Get_PdfImage.asmx
17 18
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
19
URL=http://markus.bseng.co.kr:5977/ImageUpload/FileUpload.asmx
19 20
[mainServerImageWebPath]
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
21
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 22
[subServerImageWebPath]
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
23
URL=http://markus.bseng.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 24
[Debug_BaseClientAddress]
24
URL=http://192.168.0.67:5979
25
URL=http://markus.bseng.co.kr:5979
25 26
[HOST_DOMAIN]
26 27
DOMAIN=
27 28
[GetConversionStateFailed]
......
31 32
[SetFinalPDFSuccess]
32 33
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU
33 34
[SetThumbnail]
34
WIDTH=265
35
WIDTH=100
35 36
[Site]
36
NAME=sdms
37
NAME=
37 38
[PortForwarding]
38 39
HUB=5100:5100
39 40
RESOURCE=5977:5977
40
BASE=8080:8080
41
BASE=5979:5979
41 42
[GetImageResourceFailed]
42 43
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
43

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

  
3 5
[APP_CAST]
4
URI = http://10.11.142.22:8080/MarkusUpdate/appcast.xml
6
URI = http://markus.bseng.co.kr:5979/MarkusUpdate/appcast.xml
7
EXTERNAL_URI = markus.bseng.co.kr:5979
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.5.3.0")]
55
[assembly: AssemblyFileVersion("1.5.3.0")]
54
[assembly: AssemblyVersion("1.8.3.0")]
55
[assembly: AssemblyFileVersion("1.8.3.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
appCast_BSENG.bat
15 15

  
16 16
rem version
17 17

  
18
set hostbaseUrl=http://210.94.128.125:5979/MarkusUpdate/
18
set hostbaseUrl=http://markus.bseng.co.kr:5979/MarkusUpdate/
19 19
set updateVersion=%1
20 20

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

내보내기 Unified diff

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