프로젝트

일반

사용자정보

개정판 2091a7e5

ID2091a7e5b8d234bee28ba648a3f390719fff5698
상위 2d0113f1
하위 c7015188, 8f15cc2b, 1a75ccbe

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

사용자 해상도 추가

Change-Id: Id0ccab2c93476e47c43607725fc05fbb58d9c8fe

차이점 보기:

ConvertService/ServiceBase/IServiceBase/Markus.Service.Interface.csproj
49 49
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
50 50
  </PropertyGroup>
51 51
  <ItemGroup>
52
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
53
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
52
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
53
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
54 54
    </Reference>
55 55
    <Reference Include="System" />
56 56
    <Reference Include="System.Core" />
ConvertService/ServiceBase/IServiceBase/ProcessContext.cs
30 30

  
31 31
        public int MinFontSize { get; set; }
32 32

  
33
        public int UseResolution { get; set; }
34

  
33 35
        public int SendStatusInterval { get; set; }
34 36
    }
35 37
}
ConvertService/ServiceBase/IServiceBase/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
3
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
4 4
</packages>
ConvertService/ServiceBase/Markus.Service.Convert/ConvertService.cs
140 140
                PdfFilePath = ConvertProcessContext.OriginFilePath,
141 141
                SavePath = ConvertProcessContext.SaveDirectory,
142 142
                Status = StatusCodeType.None,
143
                MinimumFontSize = ConvertProcessContext.MinFontSize
143
                MinimumFontSize = ConvertProcessContext.MinFontSize,
144
                UseResolution = ConvertProcessContext.UseResolution
144 145
            };
145 146

  
146 147
            try
......
193 194
                {
194 195
                    gTempFileName = saveitem.PdfFilePath;
195 196

  
196
                    gMarkusPDF.pdfLoad(saveitem.PdfFilePath, ConvertProcessContext.MinFontSize);
197
                    gMarkusPDF.pdfLoad(saveitem.PdfFilePath, saveitem.MinimumFontSize, saveitem.UseResolution);
197 198

  
198 199
                    /// 설정된 MultiThreadMaxPages에 따른 컨버터 분기
199 200
                    if (gMarkusPDF.PageCount() > ConvertProcessContext.MultiThreadMaxPages)
......
207 208
                        await Task.Factory.StartNew(new Action(() =>
208 209
                        {
209 210
                            result = gSaveTask.SaveFile(saveitem);
211
                            
210 212
                        }), TaskCreationOptions.LongRunning);
211 213
                    }
212 214

  
......
227 229
                                PAGE_NUMBER = f.PageNo
228 230
                            }).ToList();
229 231

  
230
                            docSetResult = database.SetDocumentInfo(ConvertProcessContext.ConvertID, result.PageInfoList.Count, docPageList);
232
                            docSetResult = database.SetDocumentInfo(saveitem.Id, result.PageInfoList.Count, docPageList);
231 233
                        }
232 234

  
233 235
                        if (docSetResult)
......
301 303

  
302 304
                if (saveItem.PdfFilePath.Contains("VPCS_DOCLIB") || !saveItem.PdfFilePath.Contains("fileName"))
303 305
                {
304
                    FileName = saveItem.PdfFilePath.Remove(0, saveItem.PdfFilePath.LastIndexOf("/") + 1);
306
                    if (!Path.IsPathRooted(saveItem.PdfFilePath))
307
                    {
308
                        FileName = saveItem.PdfFilePath.Remove(0, saveItem.PdfFilePath.LastIndexOf("/") + 1);
309
                    }
310
                    else
311
                    {
312
                        FileName =  saveItem.PdfFilePath.Remove(0, saveItem.PdfFilePath.LastIndexOf("\\") + 1);
313
                    }
305 314
                }
306 315
                else
307 316
                {
......
410 419
                        GC.Collect();
411 420

  
412 421
                        gMarkusPDF = new MarkusPDF();
413
                        gMarkusPDF.pdfLoad(saveitem.PdfFilePath, ConvertProcessContext.MinFontSize);
422
                        gMarkusPDF.pdfLoad(saveitem.PdfFilePath, saveitem.MinimumFontSize, saveitem.UseResolution);
414 423
                    }
415 424
                }
416 425

  
ConvertService/ServiceBase/Markus.Service.Convert/Markus.Service.Convert.csproj
54 54
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
55 55
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
56 56
    </Reference>
57
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
58
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
57
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
58
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
59 59
    </Reference>
60
    <Reference Include="MarkusPDF, Version=1.0.7115.26994, Culture=neutral, processorArchitecture=AMD64">
61
      <HintPath>..\packages\MarkusPDF.1.5.5\lib\net45\MarkusPDF.dll</HintPath>
60
    <Reference Include="MarkusPDF, Version=1.0.7117.28839, Culture=neutral, processorArchitecture=AMD64">
61
      <HintPath>..\packages\MarkusPDF.1.5.6\lib\net45\MarkusPDF.dll</HintPath>
62 62
    </Reference>
63 63
    <Reference Include="System" />
64 64
    <Reference Include="System.Core" />
ConvertService/ServiceBase/Markus.Service.Convert/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3 3
  <package id="log4net" version="2.0.8" targetFramework="net45" />
4
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
5
  <package id="MarkusPDF" version="1.5.5" targetFramework="net45" />
4
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
5
  <package id="MarkusPDF" version="1.5.6" targetFramework="net45" />
6 6
</packages>
ConvertService/ServiceBase/Markus.Service.ConvertProcess/Markus.Service.ConvertProcess.csproj
71 71
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
72 72
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
73 73
    </Reference>
74
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
75
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
74
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
75
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
76 76
    </Reference>
77 77
    <Reference Include="System" />
78 78
    <Reference Include="System.ComponentModel.DataAnnotations" />
ConvertService/ServiceBase/Markus.Service.ConvertProcess/packages.config
2 2
<packages>
3 3
  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
4 4
  <package id="log4net" version="2.0.8" targetFramework="net45" />
5
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
5
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
6 6
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
7 7
  <package id="Obfuscar" version="2.2.19" targetFramework="net45" developmentDependency="true" />
8 8
  <package id="Salaros.ConfigParser" version="0.3.3" targetFramework="net45" />
ConvertService/ServiceBase/Markus.Service.DataBase/Markus.Service.DataBase.csproj
70 70
    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
71 71
      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
72 72
    </Reference>
73
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
74
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
73
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
74
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
75 75
    </Reference>
76 76
    <Reference Include="System" />
77 77
    <Reference Include="System.ComponentModel.DataAnnotations" />
ConvertService/ServiceBase/Markus.Service.DataBase/packages.config
2 2
<packages>
3 3
  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
4 4
  <package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" />
5
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
5
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
6 6
</packages>
ConvertService/ServiceBase/Markus.Service.Station/ApplicationDefine.cs
23 23
        public const string STATION_SERVICE_NAME = "STATION_SERVICE_NAME";
24 24
        public const string MULTI_TRHEAD_MAX_PAGE = "MULTI_TRHEAD_MAX_PAGE";
25 25
        public const string MIN_FONT_SIZE = "MIN_FONT_SIZE";
26
        public const string USE_RESOLUTION = "USE_RESOLUTION";
26 27

  
27 28
        public const string SAVE_STATUS_INTERVAL = "SAVE_STATUS_INTERVAL";
28 29
        public const string FITER_PROCECT = "FITER_PROCECT";
ConvertService/ServiceBase/Markus.Service.Station/Markus.Service.Station.csproj
89 89
    <Reference Include="Markus.LibraryInstaller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
90 90
      <HintPath>..\packages\Markus.LibraryInstaller.1.5.1\lib\net45\Markus.LibraryInstaller.dll</HintPath>
91 91
    </Reference>
92
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
93
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
92
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
93
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
94 94
    </Reference>
95 95
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
96 96
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.cs
35 35
        private string DownloadTempFolder;
36 36
        private int MultiThreadMaxPages;
37 37
        private int MinFontSize;
38
        private int UseResolution;
38 39
        private bool CreateProcessWindow;
39 40

  
40 41
        private int SaveStatusInterval;
......
71 72

  
72 73
                if (config != null)
73 74
                {
74
                    var processCount = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.CONVERT_SERVICE_PROCESS);
75

  
76
                    if (!string.IsNullOrWhiteSpace(processCount))
77
                    {
78
                        int outValue = 1;
79

  
80
                        if (int.TryParse(processCount, out outValue))
81
                        {
82
                            MultiProcessCount = outValue;
83
                        }
84
                    }
75
                    MultiProcessCount = System.Convert.ToInt16(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.CONVERT_SERVICE_PROCESS,"5"));
85 76

  
86 77
                    CreateProcessWindow = System.Convert.ToBoolean(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.CREATE_WINDOW, "false"));
87 78

  
88 79
                    // PDF 임시 다운로드 폴더
89
                    DownloadTempFolder = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.DOWNLOAD_TEMP_FOLDER);
80
                    DownloadTempFolder = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.DOWNLOAD_TEMP_FOLDER,"C:\\temp");
90 81

  
91 82
                    MultiThreadMaxPages = System.Convert.ToInt16(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MULTI_TRHEAD_MAX_PAGE, "500"));
92 83

  
......
94 85

  
95 86
                    MinFontSize = System.Convert.ToInt16(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MIN_FONT_SIZE, "10"));
96 87

  
88
                    UseResolution = System.Convert.ToInt16(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.USE_RESOLUTION, "0"));
89

  
97 90
                    // CONVERT DATABASE 연결 문자열
98 91
                    MarkusDBConnectionString = AESEncrypter.Decrypt(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MARKUS_CONNECTION_STRING));
99 92

  
100
                    var projectList = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.FITER_PROCECT);
93
                    var projectList = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.FITER_PROCECT,"");
101 94

  
102 95
                    if(!projectList.IsNullOrEmpty())
103 96
                    {
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.ini
5 5
#MarkusDataBaseConnectionString = data source=DESKTOP-MARKUS;initial catalog=Markus_V3;persist security info=True;user id=doftech;Password=dof1073#;MultipleActiveResultSets=True;
6 6

  
7 7
# local test
8
#MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==
8
MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==
9 9

  
10 10
# remote test
11
MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==
11
#MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==
12 12

  
13 13
DownloadTempFolder = D:\CONVERT_SERVICE_TEMP
14 14
MULTI_TRHEAD_MAX_PAGE = 10000
15

  
16
# MIN_FONT_SIZE = -1 인 경우 기본 Resolution 100으로 사용
17
# 페이지에 설정된 폰트 이하의 문자가 있는 경우 Resolution 200으로 변환
18
# 기본 = 10
15 19
MIN_FONT_SIZE = 10
16 20

  
21
# 설정된 Resolution으로 강제 변환
22
# 기본 = 0
23
USE_RESOLUTION = 300
24

  
25
# 상태 저장 간격(페이지당 상태 저장 간각)
26
# 기본 5
17 27
SAVE_STATUS_INTERVAL = 5
18 28

  
19 29
# 구분자는 콤마
20
FITER_PROCECT = 110000,00000
30
FITER_PROCECT = 110000,00000,111111
21 31

  
22 32
[WCF_ENDPOINT]
23 33
STATION_PORT =	9101
ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationTask.cs
47 47
                    ReleaseWorkMemory = 1073741824,
48 48
                    MultiThreadMaxPages = MultiThreadMaxPages,
49 49
                    MinFontSize = MinFontSize,
50
                    SendStatusInterval = SaveStatusInterval
50
                    SendStatusInterval = SaveStatusInterval,
51
                    UseResolution = UseResolution
51 52
                };
52 53

  
53 54
                var sendData = ObjectToBytesStringConvert.ObjectToBytesString(processSendData);
ConvertService/ServiceBase/Markus.Service.Station/packages.config
4 4
  <package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" />
5 5
  <package id="log4net" version="2.0.8" targetFramework="net45" />
6 6
  <package id="Markus.LibraryInstaller" version="1.5.1" targetFramework="net45" />
7
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
7
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
8 8
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />
9 9
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
10 10
  <package id="Obfuscar" version="2.2.19" targetFramework="net45" developmentDependency="true" />
ConvertService/ServiceBase/Markus.Service.WcfService/Markus.Service.IWcfService.csproj
66 66
    <SignManifests>false</SignManifests>
67 67
  </PropertyGroup>
68 68
  <ItemGroup>
69
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
70
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
69
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
70
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
71 71
    </Reference>
72 72
    <Reference Include="Microsoft.CSharp" />
73 73
    <Reference Include="System" />
ConvertService/ServiceBase/Markus.Service.WcfService/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
3
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
4 4
</packages>
ConvertService/ServiceBase/ServiceTestApp/ServiceTestApp.csproj
92 92
    <Reference Include="Markus.LibraryInstaller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
93 93
      <HintPath>..\packages\Markus.LibraryInstaller.1.5.1\lib\net45\Markus.LibraryInstaller.dll</HintPath>
94 94
    </Reference>
95
    <Reference Include="Markus.Message, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
96
      <HintPath>..\packages\Markus.Message.1.5.2\lib\net45\Markus.Message.dll</HintPath>
95
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
96
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
97 97
    </Reference>
98 98
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions">
99 99
      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
ConvertService/ServiceBase/ServiceTestApp/packages.config
3 3
  <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
4 4
  <package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" />
5 5
  <package id="Markus.LibraryInstaller" version="1.5.1" targetFramework="net45" />
6
  <package id="Markus.Message" version="1.5.2" targetFramework="net45" />
6
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />
7 7
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
8 8
</packages>

내보내기 Unified diff

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