프로젝트

일반

사용자정보

개정판 65fbe3cb

ID65fbe3cb05ee77094425dfcaf60d5ac3176d504e
상위 aff63364
하위 7575b5e5, f363a40e

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

version Change

Change-Id: I41891cf115aea14b125b05a1a0aa563222cec101

차이점 보기:

ConvertService/ServiceBase/ConnectionStringBuild/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("2.5.2.0")]
55
[assembly: AssemblyFileVersion("2.5.2.0")]
54
[assembly: AssemblyVersion("2.5.1.0")]
55
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/ConvertionWebService/Properties/AssemblyInfo.cs
31 31
//
32 32
// You can specify all the values or you can default the Revision and Build Numbers 
33 33
// by using the '*' as shown below:
34
[assembly: AssemblyVersion("2.5.2.0")]
35
[assembly: AssemblyFileVersion("2.5.2.0")]
34
[assembly: AssemblyVersion("2.5.1.0")]
35
[assembly: AssemblyFileVersion("2.5.1.0")]
36 36
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
ConvertService/ServiceBase/FileDownloadTest/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.0")]
36
[assembly: AssemblyFileVersion("1.0.0.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/IServiceBase/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
33 33
// 기본값으로 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/Markus.Service.Convert/ConvertService.cs
57 57
        {
58 58
            try
59 59
            {
60
                gMarkusPDF.Dispose();
61
                gSaveTask.Dispose();
60
                if(gMarkusPDF != null)
61
                {
62
                    gMarkusPDF.Dispose();
63
                    gMarkusPDF = null;
64
                }
65

  
66
                if (gSaveTask != null)
67
                {
68
                    gSaveTask.StateChangeEvent -= MarkusPdfStateChangeEvent;
69
                    gSaveTask.Dispose();
70
                    gSaveTask = null;
71
                }
62 72

  
63 73
                //if (System.IO.File.Exists(gTempFileName))
64 74
                //{
......
68 78
            }
69 79
            catch (Exception ex)
70 80
            {
71
                logger.Error("Convert Service Dispose Error", ex);
81
               logger.Error("Convert Service Dispose Error", ex);
72 82
            }
73 83
            finally
74 84
            {
......
107 117
                    case StatusCodeType.Saving:
108 118
                        break;
109 119
                    case StatusCodeType.Completed:
110
                        gSaveTask.StateChangeEvent -= MarkusPdfStateChangeEvent;
111
                        gSaveTask.Dispose();
112
                        GC.Collect(2);
113
                        GC.Collect(2);
120
             
114 121
                        break;
115 122
                    case StatusCodeType.FileError:
116 123
                        break;
......
162 169
            return result;
163 170
        }
164 171

  
172
        [System.Security.Permissions.FileIOPermission(System.Security.Permissions.SecurityAction.LinkDemand)]
165 173
        private async Task<SaveResult> ConvertAsync(SaveItem saveitem)
166 174
        { 
167 175
            SaveResult result = new SaveResult();
......
208 216
                        await Task.Factory.StartNew(new Action(() =>
209 217
                        {
210 218
                            gMarkusPDF.Dispose();
219
                            gMarkusPDF = null;
220

  
211 221
                            result = gSaveTask.SaveFile(saveitem);
212 222

  
213 223
                        }), TaskCreationOptions.LongRunning);
......
407 417
                        Console.WriteLine($"physical memory : {Environment.WorkingSet}");
408 418

  
409 419
                        gMarkusPDF.Dispose();
410

  
420
                        gMarkusPDF = null;
411 421
                        System.Threading.Thread.SpinWait(5);
412 422

  
413 423
                        gMarkusPDF = new MarkusPDF();
ConvertService/ServiceBase/Markus.Service.Convert/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
33 33
// 기본값으로 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
37 37
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
ConvertService/ServiceBase/Markus.Service.ConvertProcess/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
37 37
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs
421 421

  
422 422
                    StatusCodeType statusCode = (StatusCodeType)State;
423 423

  
424
                    if (statusCode > StatusCodeType.None && statusCode < StatusCodeType.Saving && items.START_DATETIME == null)
424
                    if (items.START_DATETIME == null)
425 425
                    {
426 426
                        items.START_DATETIME = DateTime.Now;
427 427
                    }
ConvertService/ServiceBase/Markus.Service.DataBase/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
33 33
// 기본값으로 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/Markus.Service.Extensions/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
33 33
// 기본값으로 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/Markus.Service.Monitor/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/Markus.Service.Station/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
37 37
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.ini
2 2
WINDOW = true
3 3
IS_STATAION = true
4 4

  
5
STATAION_ADDRESS = http://192.168.0.83:9101/StationService
5
STATAION_ADDRESS = http://192.168.0.129:9101/StationService
6 6

  
7 7
SERVICE_ID = 0AC6FD8E-5060-4B0F-9E6B-A7380B9FCF7B
8 8
# 구분자는 ','
......
12 12
#MarkusDataBaseConnectionString = yRW0I8OJY/boJcR9rTFeH229g456BwO8BaXQbW8h6iCR10JRc5tOl2BDWa1595q0bvW9uD5HsHn9ke4oK3yaw2OYHh8pgYKdhW48xeAl49510h1DPv8uSbqcWdwZ2AjernORxxaEAUqHZb5DFlndcWuid82ZwP/EGxGNhaaCG+KVogeHwI5FZZKrmUTWe3159qk11Q4XswrHeLy8HQn5Qg==
13 13

  
14 14
# local test
15
MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==
15
#MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==
16 16

  
17 17
# remote test MARKUS_V3
18
#MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==
18
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5pT5Vi9KdIFiJ/icpeXrUfa2LTnWdibJ7Oz+4QcYCftqVNPaS3nbiAo67l93XLRVqCpyt4tTSgwhRhdJob48gZhx+zmvoKmAwBR/ofCam3SNjx85gHFWc+gFffVOACIGbvM940SGroUFzK85kDd7Xlg==
19 19

  
20 20
DownloadTempFolder = C:\CONVERT_SERVICE_TEMP
21 21
MULTI_TRHEAD_MAX_PAGE = 150
ConvertService/ServiceBase/Markus.Service.StationController/Behaviors/StatusTypeSet.cs
9 9

  
10 10
namespace Markus.Service.StationController.Behaviors
11 11
{
12
    public  class StatusTypeSet : FrameworkElement
12
    public  class StatusTypeSet : DependencyObject
13 13
    {
14 14
        public static List<StatusCodeType> GetStatusTypes(DependencyObject obj)
15 15
        {
ConvertService/ServiceBase/Markus.Service.StationController/Controls/TraceTextSource.cs
23 23

  
24 24
        public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id, string message)
25 25
        {
26
            //_eventType = eventType;
27
           // base.TraceEvent(eventCache, source, eventType, id, message);
26
            _eventType = eventType;
27
            base.TraceEvent(eventCache, source, eventType, id, message);
28 28
        }
29 29

  
30 30
        public override void Write(string message)
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
56 56
    <Prefer32Bit>false</Prefer32Bit>
57 57
    <DocumentationFile>
58 58
    </DocumentationFile>
59
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
59 60
  </PropertyGroup>
60 61
  <PropertyGroup />
61 62
  <ItemGroup>
ConvertService/ServiceBase/Markus.Service.StationController/Properties/AssemblyInfo.cs
43 43
// [assembly: AssemblyVersion("1.0.*")]
44 44
[assembly: AssemblyVersion("1.0.0.0")]
45 45
[assembly: AssemblyFileVersion("1.0.0.0")]
46
[assembly: NeutralResourcesLanguage("en-US")]
46 47

  
47 48
//[assembly: NeutralResourcesLanguage("")]
48 49

  
ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini
1 1
[SERVICE]
2 2
SERVICE_ADDRESS = http://172.20.120.142:9991/StationService,http://172.20.120.143:9991/StationService
3 3

  
4
#http://172.20.120.142:9991/StationService,http://172.20.120.143:9991/StationService
4 5
# http://172.20.120.142:9991/StationService,http://172.20.120.143:9991/StationService
5 6
#,http://192.168.0.68:9101/StationService
6 7
#http://172.20.120.142:9991/StationService
......
10 11

  
11 12

  
12 13
# remote test MARKUS_V3
13
MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==
14
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5pT5Vi9KdIFiJ/icpeXrUfa2LTnWdibJ7Oz+4QcYCftqVNPaS3nbiAo67l93XLRVqCpyt4tTSgwhRhdJob48gZhx+zmvoKmAwBR/ofCam3SNjx85gHFWc+gFffVOACIGbvM940SGroUFzK85kDd7Xlg==
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/AliveViewModel.cs
102 102
                                }
103 103
                                catch (Exception ex)
104 104
                                {
105
                                    System.Diagnostics.Trace.TraceError($"{client.Endpoint.Address} {ex.Message}");
105
                                    System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} {ex.Message}");
106 106
                                }
107 107
                            }
108 108
                            else
109 109
                            {
110
                                System.Diagnostics.Trace.TraceError($"{client.Endpoint.Address} ping Error");
110
                                System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} ping Error");
111 111
                            }
112 112
                        }
113 113

  
......
201 201
            {
202 202
                using (System.Net.Http.HttpClient Client = new System.Net.Http.HttpClient())
203 203
                {
204
                    Client.Timeout = new TimeSpan(0, 5,0);
204
                    Client.Timeout = new TimeSpan(0, 0,60);
205 205
                    
206 206
                    var message = await Client.GetAsync(uri);
207 207

  
ConvertService/ServiceBase/Markus.Service.WcfService/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/ServiceTestApp/MainWindow.xaml
58 58
                    <RowDefinition Height="Auto"/>
59 59
                    <RowDefinition Height="Auto"/>
60 60
                    <RowDefinition Height="Auto"/>
61
                    <RowDefinition Height="Auto"/>
62
                    <RowDefinition Height="Auto"/>
61 63
                </Grid.RowDefinitions>
62 64
                <StackPanel Orientation="Horizontal">
63 65
                    <TextBlock Text="Process Count : " VerticalAlignment="Center"/>
......
68 70
                <Button Grid.Row="2" Content="Web Service Test" Click="WebServiceTest_click"/>
69 71
                <Button Grid.Row="3" Content="Convert Web Service Test" Click="ConvertWebServiceTest_click"/>
70 72
                <Button Grid.Row="4" Content="FileDownload Test" Click="DownLoadTest_click"/>
73
                <Button Grid.Row="5" Content="ServiceCall Test" Click="ServiceCallTest_click"/>
71 74
            </Grid>
72 75
        </Grid>
73 76
    </Grid>
ConvertService/ServiceBase/ServiceTestApp/MainWindow.xaml.cs
5 5
using Microsoft.VisualStudio.TestTools.UnitTesting;
6 6
using Microsoft.Win32;
7 7
using Newtonsoft.Json;
8
using Newtonsoft.Json.Linq;
8 9
using System;
9 10
using System.Collections.Generic;
10 11
using System.Diagnostics;
......
652 653
            return result;
653 654
        }
654 655

  
656
        private void ServiceCallTest_click(object sender, RoutedEventArgs e)
657
        {
658
            using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(MarkusDBConnectionString))
659
            {
660

  
661
                var items = database.GetConvertItems(Markus.Message.StatusCodeType.Completed).Take(100).ToList();
662

  
663
                int count = 0;
664

  
665
                foreach (var item in items)
666
                {
667
                    database.SetCleanUpItem(item.ConvertID, 0);
668

  
669
                    System.Net.WebClient client = new System.Net.WebClient();
670
                    var convertResult = client.DownloadString($"http://192.168.0.129:9101/StationService/Rest/ConvertAdd?ProjectNo={item.ProjectNumber}&DocumentID={item.ConvertID}");
671

  
672
                    JObject jObject = JObject.Parse(convertResult, new JsonLoadSettings());
673
                    var result = jObject["ConvertAddResult"].ToString();
674
                    System.Diagnostics.Debug.WriteLine(item.ConvertID + " " + result.ToString());
675
                }
676
            }
677
        }
655 678
    }
656 679

  
657 680
    class IntegratedServiceInstaller
ConvertService/ServiceBase/ServiceTestApp/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("2.5.2.0")]
55
[assembly: AssemblyFileVersion("2.5.2.0")]
54
[assembly: AssemblyVersion("2.5.1.0")]
55
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/ServiceUnitTest/Properties/AssemblyInfo.cs
16 16
[assembly: Guid("6545946b-b453-4cfa-8126-c6ba71acb689")]
17 17

  
18 18
// [assembly: AssemblyVersion("1.0.*")]
19
[assembly: AssemblyVersion("2.5.2.0")]
20
[assembly: AssemblyFileVersion("2.5.2.0")]
19
[assembly: AssemblyVersion("2.5.1.0")]
20
[assembly: AssemblyFileVersion("2.5.1.0")]
ConvertService/ServiceBase/WcfCheck/Properties/AssemblyInfo.cs
32 32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33 33
// 지정되도록 할 수 있습니다.
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("2.5.2.0")]
36
[assembly: AssemblyFileVersion("2.5.2.0")]
35
[assembly: AssemblyVersion("2.5.1.0")]
36
[assembly: AssemblyFileVersion("2.5.1.0")]

내보내기 Unified diff

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