프로젝트

일반

사용자정보

개정판 5622deac

ID5622deaca90cf31de642adc94f570534cd8cd729
상위 3ae68e58
하위 1a3a81f7

김태성이(가) 9달 전에 추가함

issue #00000 dig appcast 추가

Change-Id: I96b46b734bcae1a2df07e5fd5e705284cb18770d

차이점 보기:

FinalService/KCOM_FinalService/Upload/UploadFinal_ETECH/UploadPDF.cs
48 48
                            value = (true).ToString();
49 49
                        }
50 50

  
51
                        result = new KeyValuePair<bool, string>(true, "");
52
                        //if (value.ToLower() == "sucess")
53
                        //{
54
                            
55
                        //}
56
                        //else
57
                        //{
58
                        //    throw new Exception("return Value false");
59
                        //}
51
                        bool ContentResult = false;
52

  
53
                        if (bool.TryParse(value,out ContentResult))
54
                        {
55
                            result = new KeyValuePair<bool, string>(ContentResult, "");
56
                        }
57
                        else
58
                        {
59
                            throw new Exception("return Value false");
60
                        }
60 61
                    }
61 62
                }
62 63
                
......
78 79
            var request = new RestRequest(Method.GET);
79 80
            var response = client.Get<string>(request);
80 81
            
81
            var values = SimpleJson.DeserializeObject(response.Content);
82
            
83
            object value = null;
84

  
85
            (values as RestSharp.JsonObject).TryGetValue("resultMsg", out value);
86

  
87
            if(value != null)
82
            if(response.StatusCode == HttpStatusCode.OK)
88 83
            {
89
                result = value.ToString();
84
                result = response.Content;
90 85
            }
91 86

  
92 87
            return result;
FinalService/KCOM_FinalService/UploadTest/MainWindow.xaml
1
<Window x:Class="UploadTest.MainWindow"
2
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6
        xmlns:local="clr-namespace:UploadTest"
7
        mc:Ignorable="d"
8
        Title="MainWindow" Height="450" Width="800">
1
<Window
2
    x:Class="UploadTest.MainWindow"
3
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6
    xmlns:local="clr-namespace:UploadTest"
7
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8
    Title="MainWindow"
9
    Width="800"
10
    Height="450"
11
    mc:Ignorable="d">
9 12
    <Grid>
10 13
        <Grid.RowDefinitions>
11
            <RowDefinition Height="Auto"/>
12
            <RowDefinition Height="Auto"/>
13
            <RowDefinition Height="Auto"/>
14
            <RowDefinition Height="*"/>
14
            <RowDefinition Height="Auto" />
15
            <RowDefinition Height="Auto" />
16
            <RowDefinition Height="Auto" />
17
            <RowDefinition Height="*" />
18
            <RowDefinition Height="Auto" />
15 19
        </Grid.RowDefinitions>
16
        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="2">
17
            <TextBlock Width="100" TextAlignment="Right" Text="FinalPDF ID"/>
18
            <TextBlock Width="10" Text=" : "/>
19
            <TextBox MinWidth="200" Name="tbFinalPDFID"/>
20
            <Button Content="Call" HorizontalAlignment="Right" Width="100" Margin="2" Click="Button_Click"/>
20
        <StackPanel
21
            Margin="2"
22
            HorizontalAlignment="Left"
23
            Orientation="Horizontal">
24
            <TextBlock
25
                Width="100"
26
                Text="FinalPDF ID"
27
                TextAlignment="Right" />
28
            <TextBlock Width="10" Text=" : " />
29
            <TextBox Name="tbFinalPDFID" MinWidth="200" />
30
            <Button
31
                Width="100"
32
                Margin="2"
33
                HorizontalAlignment="Right"
34
                Click="Button_Click"
35
                Content="Call" />
21 36
        </StackPanel>
22
        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="2" Grid.Row="1">
23
            <TextBlock Width="100" TextAlignment="Right" Text="Remote File Path"/>
24
            <TextBlock Width="10" Text=" : "/>
25
            <TextBox MinWidth="200" Name="tbRemoteFilePath"/>
37
        <StackPanel
38
            Grid.Row="1"
39
            Margin="2"
40
            HorizontalAlignment="Left"
41
            Orientation="Horizontal">
42
            <TextBlock
43
                Width="100"
44
                Text="Remote File Path"
45
                TextAlignment="Right" />
46
            <TextBlock Width="10" Text=" : " />
47
            <TextBox Name="tbRemoteFilePath" MinWidth="200" />
26 48
        </StackPanel>
27
        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="2" Grid.Row="2">
28
            <TextBlock Width="100" TextAlignment="Right" Text="Upload Service Url"/>
29
            <TextBlock Width="10" Text=" : "/>
30
            <TextBox MinWidth="200" Name="tbServiceUri"/>
49
        <StackPanel
50
            Grid.Row="2"
51
            Margin="2"
52
            HorizontalAlignment="Left"
53
            Orientation="Horizontal">
54
            <TextBlock
55
                Width="100"
56
                Text="Upload Service Url"
57
                TextAlignment="Right" />
58
            <TextBlock Width="10" Text=" : " />
59
            <TextBox Name="tbServiceUri" MinWidth="200" />
31 60
        </StackPanel>
32
        <TextBox Grid.Row="3" Name="tbLog" AcceptsReturn="True"/>
61
        <TextBox
62
            Name="tbLog"
63
            Grid.Row="3"
64
            AcceptsReturn="True" />
65
        <Button
66
            Grid.Row="4"
67
            Click="btnStamp_Click"
68
            Content="Stamp" />
33 69
    </Grid>
34 70
</Window>
FinalService/KCOM_FinalService/UploadTest/MainWindow.xaml.cs
32 32
        {
33 33
            try
34 34
            {
35
                //UploadCall2();
36
                UploadCall();
35
                UploadCall2();
36
                //UploadCall();
37 37
            }
38 38
            catch (Exception ex)
39 39
            {
......
132 132
            builder.AppendLine(Msg);
133 133
            tbLog.Text = builder.ToString();
134 134
        }
135

  
136
        string value = @"<Grid Name=""aa32D0608B"" xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Width=""205"" Height=""89"">
137
    <Grid.Background>
138
        <SolidColorBrush Color=""#FFFFFFFF"" Opacity=""0.1"" />
139
    </Grid.Background>
140
    <Rectangle Stretch=""Fill"" Stroke=""#FFFF0000"" StrokeThickness=""5"" StrokeLineJoin=""Round"" Name=""Rectangle"" Width=""205"" Height=""89"" Canvas.Left=""-2.5"" Canvas.Top=""-2.5"" />
141
    <Grid>
142
        <Grid.RowDefinitions>
143
            <RowDefinition Height=""*"" />
144
            <RowDefinition Height=""3.5*"" />
145
            <RowDefinition Height=""*"" />
146
        </Grid.RowDefinitions>
147
        <TextBlock Text=""APPROVED"" FontWeight=""ExtraBold"" FontSize=""30"" Foreground=""#FFFF0000"" HorizontalAlignment=""Center"" VerticalAlignment=""Center"" Grid.Row=""1"" />
148
    </Grid>
149
</Grid>";
150

  
151
        private void btnStamp_Click(object sender, RoutedEventArgs e)
152
        {
153
            var stamp = MarkupToPDF.Serialize.Core.JsonSerializerHelper.CompressStamp(value);
154
            Console.WriteLine(stamp);
155
        }
135 156
    }
136 157
}
FinalService/KCOM_FinalService/UploadTest/UploadTest.csproj
105 105
      <Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project>
106 106
      <Name>KCOMDataModel</Name>
107 107
    </ProjectReference>
108
    <ProjectReference Include="..\Upload\UploadFinal_DIG\UploadFinal_DIG.csproj">
109
      <Project>{70b9ff4a-8848-4284-9183-13c9f3acdfe5}</Project>
110
      <Name>UploadFinal_DIG</Name>
108
    <ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj">
109
      <Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project>
110
      <Name>MarkupToPDF</Name>
111
    </ProjectReference>
112
    <ProjectReference Include="..\Upload\UploadFinal_ETECH\UploadFinal_ETECH.csproj">
113
      <Project>{ee38a009-bd78-42fd-8ec6-6a0ec72dbb3c}</Project>
114
      <Name>UploadFinal_ETECH</Name>
111 115
    </ProjectReference>
112 116
  </ItemGroup>
113 117
  <ItemGroup>
KCOM/App.xaml.cs
26 26
        public string UserID { get; set; }
27 27
        public int Mode { get; set; }
28 28
    }
29
    public static OpenProperties ParamDecoding(string DecodingText, System.Text.Encoding oEncoding = null)
30
    {
31
        if (oEncoding == null)
32
            oEncoding = System.Text.Encoding.UTF8;
33

  
34
        byte[] byteArray = Convert.FromBase64String(DecodingText);
35

  
36
        string jsonBack = oEncoding.GetString(byteArray);
37 29

  
38
        return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenProperties>(jsonBack);
39
    }
40 30
    /// <summary>
41 31
    /// App.xaml에 대한 상호 작용 논리
42 32
    /// </summary>
......
117 107

  
118 108
        public static IKCOM.KCOM_SystemInfo SystemInfo { get; set; }
119 109

  
110
        public static OpenProperties ParamDecoding(string DecodingText, System.Text.Encoding oEncoding = null)
111
        {
112
            if (oEncoding == null)
113
                oEncoding = System.Text.Encoding.UTF8;
114

  
115
            byte[] byteArray = Convert.FromBase64String(DecodingText);
116

  
117
            string jsonBack = oEncoding.GetString(byteArray);
120 118

  
119
            return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenProperties>(jsonBack);
120
        }
121 121

  
122 122
        private string versionPath = null;
123 123
        //public SplashScreen splash = new SplashScreen("splash.png");
......
459 459
                await SplashScreenAsnyc();
460 460
            }
461 461
        }
462

  
463

  
462 464
        private string Authenticate(string baseUri)
463 465
        {
464 466
            string result = null;
KCOM/KCOM.csproj
497 497
      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
498 498
      <Private>True</Private>
499 499
    </Reference>
500
    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
501
      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
502
      <Private>True</Private>
503
    </Reference>
500 504
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
501 505
      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
502 506
    </Reference>
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("5.5.5.0")]
55
[assembly: AssemblyFileVersion("5.5.5.0")]
54
[assembly: AssemblyVersion("5.5.6.0")]
55
[assembly: AssemblyFileVersion("5.5.6.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM/packages.config
6 6
  <package id="log4net" version="2.0.8" targetFramework="net45" />
7 7
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net461" />
8 8
  <package id="Microsoft.Net.Compilers" version="4.2.0" targetFramework="net461" developmentDependency="true" />
9
  <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net40" />
9
  <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net461" />
10 10
  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
11 11
  <package id="Obfuscar" version="2.2.29" targetFramework="net461" developmentDependency="true" />
12 12
  <package id="Salaros.ConfigParser" version="0.3.4" targetFramework="net461" />
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.7.1" ?>
10
<?define Version = "1.7.2" ?>
11 11
<!-- UpgradeCode must be unique and not changed once the first version of the program is installed. -->
12 12
<?define UpgradeCode = "{16D0E8BF-31DD-439C-BCB8-C3C414B18A44}" ?>
13 13
<!-- The name of the Cabinet -->
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/MARKUS.ini
46 46
[DocumentDownloadPath]
47 47
url=FULL
48 48
IsRest=True
49

  
50
[COMMON]
51
IsDocumentHistory = false
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.9.6.0")]
55
[assembly: AssemblyFileVersion("1.9.6.0")]
54
[assembly: AssemblyVersion("1.9.7.0")]
55
[assembly: AssemblyFileVersion("1.9.7.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
appCast_DIG.bat
1
@echo off
2
rem datetime stamp file name
3

  
4
@REM use FOR /F to 'break out' the components of %DATE% and %TIME%, assuming 'yyyy/mm/dd' format date i.e.
5

  
6
for /F "tokens=1-6* delims=.:-/ " %%i IN ("%DATE% %TIME%") DO Set "YYYY=%%i"& Set "MM=%%j"& Set "DD=%%k"& Set "HH=%%l"& Set "MI=%%m"& Set "SS=%%n"
7

  
8
@REM Switch the year and day if appropriate
9

  
10
IF NOT "X%DD:~2%" == "X" Set "YYYY=%DD%"& Set "DD=%YYYY%"
11

  
12
Set "TimeStamp=%YYYY%%MM%%DD%%HH%%MI%%SS%"
13

  
14
rem datetime stamp file name
15

  
16
rem version
17

  
18
set hostbaseUrl=https://ddcsmarkus.dig-airgas.com/MarkusUpdate/
19
set updateVersion=%1
20

  
21
IF [%hostbaseUrl%]==[] goto :ERROR
22
if [%updateVersion%]==[] goto :ERROR
23

  
24
echo "Update Version %updateVersion%"
25

  
26
rem set APPCAST_PUBLISH_PATH=%cd%\publish\AppCast\%TimeStamp%
27
set APPCAST_PUBLISH_PATH=%cd%\publish\AppCast_DIG\
28
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
29

  
30
echo "current  : %current_dir%"
31
echo "APPCAST PUBLISH PATH : %APPCAST_PUBLISH_PATH%"
32

  
33
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
34

  
35
IF "%2"=="" GOTO Continue
36

  
37
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
38
echo "generate-keys pass"
39
del %LocalAppData%\netsparkle\*.* /q
40
	rem .\AppCast\generate_appcast.exe --key-path %APPCAST_PUBLISH_PATH%Keys
41
	.\AppCast\generate_appcast.exe --generate-keys
42
)
43

  
44
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
45
set SolutionPath=%cd%
46
SET SIGNPATH=%SolutionPath%\Sign\www.doftech.co.kr.pfx
47

  
48
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
49
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
50

  
51
start %APPCAST_PUBLISH_PATH%
52

  
53
:Continue 
54

  
55
xcopy /s %cd%\INI\MARKUS_DIG.ini %MARKUS_PUBLISH_PATH%\MARKUS.* /Y /F
56

  
57
 Xcopy %cd%\Accessories\* %APPCAST_PUBLISH_PATH% /I /E /S /Y /F
58
   
59
.\AppCast\generate_appcast.exe -u %hostbaseUrl% -p %cd%\ChangeLog -a %APPCAST_PUBLISH_PATH% -e * -b %MARKUS_PUBLISH_PATH% -o windows -n Markus -x -v %updateVersion%
60

  
61
:ERROR
62
echo arg1 exits
63
echo ex : appCast.bat http://hostname:port x.x.x
appCast_DIG_DEBUG.bat
1
@echo off
2
rem datetime stamp file name
3

  
4
@REM use FOR /F to 'break out' the components of %DATE% and %TIME%, assuming 'yyyy/mm/dd' format date i.e.
5

  
6
for /F "tokens=1-6* delims=.:-/ " %%i IN ("%DATE% %TIME%") DO Set "YYYY=%%i"& Set "MM=%%j"& Set "DD=%%k"& Set "HH=%%l"& Set "MI=%%m"& Set "SS=%%n"
7

  
8
@REM Switch the year and day if appropriate
9

  
10
IF NOT "X%DD:~2%" == "X" Set "YYYY=%DD%"& Set "DD=%YYYY%"
11

  
12
Set "TimeStamp=%YYYY%%MM%%DD%%HH%%MI%%SS%"
13

  
14
rem datetime stamp file name
15

  
16
rem version
17

  
18
set hostbaseUrl=http://192.168.0.67:8977/MarkusUpdate/
19
set updateVersion=%1
20

  
21
IF [%hostbaseUrl%]==[] goto :ERROR
22
if [%updateVersion%]==[] goto :ERROR
23

  
24
echo "Update Version %updateVersion%"
25

  
26
rem set APPCAST_PUBLISH_PATH=%cd%\publish\AppCast\%TimeStamp%
27
set APPCAST_PUBLISH_PATH=%cd%\publish\AppCast_DIG_DEBUG\
28
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
29

  
30
echo "current  : %current_dir%"
31
echo "APPCAST PUBLISH PATH : %APPCAST_PUBLISH_PATH%"
32

  
33
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
34

  
35
IF "%2"=="" GOTO Continue
36

  
37
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
38
echo "generate-keys pass"
39
del %LocalAppData%\netsparkle\*.* /q
40
	rem .\AppCast\generate_appcast.exe --key-path %APPCAST_PUBLISH_PATH%Keys
41
	.\AppCast\generate_appcast.exe --generate-keys
42
)
43

  
44
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
45
set SolutionPath=%cd%
46
SET SIGNPATH=%SolutionPath%\Sign\www.doftech.co.kr.pfx
47

  
48
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
49
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
50

  
51
start %APPCAST_PUBLISH_PATH%
52

  
53
:Continue 
54

  
55
xcopy /s %cd%\INI\MARKUS_DIG_DEBUG.ini %MARKUS_PUBLISH_PATH%\MARKUS.* /Y /F
56

  
57
 Xcopy %cd%\Accessories\* %APPCAST_PUBLISH_PATH% /I /E /S /Y /F
58
   
59
.\AppCast\generate_appcast.exe -u %hostbaseUrl% -p %cd%\ChangeLog -a %APPCAST_PUBLISH_PATH% -e * -b %MARKUS_PUBLISH_PATH% -o windows -n Markus -x -v %updateVersion%
60

  
61
:ERROR
62
echo arg1 exits
63
echo ex : appCast.bat http://hostname:port x.x.x

내보내기 Unified diff

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