From 44ecff34444064723c4d1f372bcbb4534c41f1f3 Mon Sep 17 00:00:00 2001
From: genggao110 <1508574735@qq.com>
Date: Mon, 6 May 2019 19:37:09 +0800
Subject: [PATCH] =?UTF-8?q?add=20createFile=20judgement=EF=BC=88directory?=
 =?UTF-8?q?=20exist=20or=20not=20,and=20create=20it=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CRC.config                  |   2 +-
 ComputerResourceConsole.suo | Bin 59392 -> 59904 bytes
 common/CommonMethod.cs      |  21 +++++++++++++++++----
 view/frm_update.cs          |  14 ++++++++++----
 view/frm_version.cs         |   8 +++++++-
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/CRC.config b/CRC.config
index 3b6dc41..3e6063c 100644
--- a/CRC.config
+++ b/CRC.config
@@ -4,4 +4,4 @@ MongoDBData MongoDB/data
 NodejsPath GeoModelServiceContainer/container_node.exe
 ContainerPath 1
 Containerlog log/containerlog.log
-CheckVersionURL http://localhost:8084/GeoModeling/modelContainer
\ No newline at end of file
+CheckVersionURL http://222.192.7.75:8084/GeoModeling/modelContainer
\ No newline at end of file
diff --git a/ComputerResourceConsole.suo b/ComputerResourceConsole.suo
index c5031b01acc388bdbedbde8761c983b0c824a137..8e4c1dd9b918742efdffbc26efbf9fab36b4e06d 100644
GIT binary patch
delta 1272
zcmZWpZA?>F7(VCT+j4LD?CNSMSXAaHTL&#*P=2sm+A%DRTthcE{0J;8?nASV)x^xG
z%pX896nbBDxM-q`>?1DD^_ZFHX3B60kg1H|{%j$`e~WI(l4}-SM)#i5_Rrpv=bY!f
zU+2B&<Mz*s{fpvdk0|vLLcl9_)0OxRTlHHwdmFJIaR3oTtfW$@Rvh0&^da6ugrTRX
zEZ*(VrTs<SXJ_xH#Jf~PeR3zfFWr`^k;2iW8`KRFJ7l^-r9G4o=FJ1MLd|F_$T%>g
zu$;OElcoPUHeWguzBTJ|9yUhu(29$u#mHwh#ivA=mV975p~-HvIWo}@vuSb=CzgzY
z88%IjT{tVwx!5}tYQ@>Qtj4fMU~$UBVrv%#P9Wyg=qC7Ssum2VCVSBDxvX!jtV1EZ
zoHZE@Gs+@@^kmNNx}%UvoR#G?6&fw&$(T_wFUU^RZ_L=tpCkFF7#?p7QG0s5SY-!H
zJAI~RH2lUMRemRg8jv0)eo{wT$qS^BG+^(;f?CqN9+?kYka&^#(>6acFE&3SK(=Dv
znr?}zv$SM6wlWd8I&Zz?B<E*~Q`4|Pa=@4F^)Pj+JW*}8SUV=$x@}#XMw{1_{(bIZ
z$&eXO*2bFZL)60${u3-`62bYWIDVGl7c(Q*e}$Y~Zm>xTDMI=bf*(FJwn%2$3y+%T
z1iEc?OP&u4ipf{wt?}`gZ7nfsJ*FO+FWfUZeBa52277N)!V7@qz-tQS7eL8mqi@2&
zV5d}@OCBtsiiJGHgI35jh>tXa+S;$Tsrrja`no=#!ikY%tiMeapys0>#K&u)c1)+&
z(X&Yp-;`~bXmc)ExL~W^u7Wyn(si`!uQx(tTaF*Pb@0aH<<6_T0A2_e+?fXhzfvhb
z7dUiB;8&AgU=Kgc7eH-qfgeKO(*!Q_L0+`)oqc^h2OvK7ES=#RQ0J_moo<AMlQ)<)
zT2JXUpkvo@<AVQ-(7|r!YiFe#Ng*Pb4neDp-~3gPlRZfAbHK0PwLX(o<LE_r;On^o
zs2Ep3Yj0$Kz+N%&anuaQWjFlZvW7iah|t8uOrF$&zN-iKMa1gs#1|Vuyo7ieu@mtM
z;#EW!Vi#gJg5Q9>e2niHOne)Z<t9wCHk&GTbJzq^P{r%zuO=&YB=}~q-V^Z4XdRj%
zI&Qa+-FSrqq@EmsRAm)>^K=6&>|3vIcR<~CH{9E$vC+k-2*YQ>EPU_02!GB*CVsT&
eOM&$NA-05Xy$v&$AXdL*sX(0gS;z!jG5rVGP@JFu

delta 1152
zcmX|AZ%k8H6o2>i_VvA5fl@3RxFQq-O*$--F>M$tN&vCyWAb4-=lB!n&`N=H6OAt2
zpO7sop*^xp;|EjRjN6A{?=qL@T!};tYzo>>OGj+7WLunmSl+TQo$TED+ME3H&iVa*
z_ndQkZ^KDLc+N2CHqa+aOH1G}bgjql(p!Qc>_xnd=tJy73?R6cU3^0ea)XE=gde)|
zN+Vq>qco5g9^N|h?xQ3zAfM=j!}J!lU<mIes=-%I*|6~&lIh4iCXf_CLeZfcn6`W+
zafl5~_WAoKdhg%+@PjQ68g`ga&369Q%xdz-4I+6C=BL(xR;bD^qWp|r075oZeioBz
zonV?x6=hz*mb2KmDZ(1e^0JI(@1%;JuuySQq|U4qDp6tD=>e@ol{X>zd`>9crjUHh
zigbo)rJW*m<#fkwg?KS5%`s&vso+yHt!z$|`H6~kP5K&x>lXO8qCLYe%k6REtlU|m
zGsZ>?_OV6h_aX#l>!ACjJzjN&K&n~>50zoMdKFyUTtu!ydb}*|vYV}qkG1`O{r2BP
zMeBD5s{#$5OL$i{=3U!P+`RAv);ovbSNa8h&+9SQIF|*Rtg}&taJmvL{5qMoj!MK2
zi;XjIjn*>l6~72ScNel(H|!@?%Vp<B#|}NT{VrThZ~wC1CGftG-q^#vWDmU4yd9EL
zZl*O`2#Bxwz}FHs8Eb1iHMK&d+-9WMWeg%6<<ZuJVipqkh)lv|Jk})^Zu5!o^5_ln
z1E#}K|FpaU&F0)#e#?58YQ>5pqmHw|hn1hWCQ|e1`q_VWyg9({nID3$ErsmQkrbi!
z+|G}0iwaqdsa2=QSM2X&%S7d+x}!&0f<p&xV#oKHcT6Hc+m1kZvjl&fDu!R$tC%mc
zmJmMR6=DK)<^&Xsz5w~Nc54IH%C340Tr4$SN%<Zw!yBJjjJ#b9Y@K-ki|t+(PWnjv
z^ne6+UhiV+j~)__-89i=^gR99FLYYTlSs#<_?2c^-hgyLRtilYH$wQX8`9At@Qztc
zy}|y_P%r@MSZ0<?Gyd*ZLu!0vMWC-|S6^@Nz(BBnPk$)uwVrCq_?Dy30vA8+i6zYw
ziJ!z+OoW0#5A$4a6JfGrC(P}3;6JMjZD(L`*HO4vzsks;?r~^R_eK{s!Zl|tgck4#
Rw;}6BJe_~RVu<}J{SV<#vIGDC

diff --git a/common/CommonMethod.cs b/common/CommonMethod.cs
index 46c947b..bcc0ae1 100644
--- a/common/CommonMethod.cs
+++ b/common/CommonMethod.cs
@@ -27,12 +27,25 @@ namespace ComputerResourceConsole.common
                 if (File.Exists(fileName))
                 {
                     File.Delete(fileName);
+                    Stream s = File.Create(fileName);
+                    s.Close();
+                    return true;
+                }
+                else
+                {
+                    FileInfo file = new FileInfo(fileName);
+                    DirectoryInfo direct_info = file.Directory;
+                    string directory = direct_info.FullName;
+                    if (!Directory.Exists(directory))
+                    {
+                        Directory.CreateDirectory(directory);
+                    }
+                    Stream s = File.Create(fileName);
+                    s.Close();
+                    return true;
                 }
-                Stream s = File.Create(fileName);
-                s.Close();
-                return true;
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
                 return false;
             }
diff --git a/view/frm_update.cs b/view/frm_update.cs
index 303b496..e5b4b78 100644
--- a/view/frm_update.cs
+++ b/view/frm_update.cs
@@ -50,9 +50,12 @@ namespace ComputerResourceConsole.view
 
                 string downloadUrl = this._pConfig.VersionCheckPath + "/downloadNewest";
                 string filePath = fileDirectory + "\\temp\\" + "container_node.exe";
-                DownloadFile(downloadUrl, filePath, this.progressBar1);
+                bool status = DownloadFile(downloadUrl, filePath, this.progressBar1);
                 //下载完成之后，替换文件
-                CopyFileAndReplace(filePath, originPath);
+                if (status)
+                {
+                    CopyFileAndReplace(filePath, originPath);
+                }        
             }
             else
             {
@@ -67,7 +70,7 @@ namespace ComputerResourceConsole.view
             this.Close();
         }
 
-        private void DownloadFile(string url, string filePath, System.Windows.Forms.ProgressBar progress)
+        private bool DownloadFile(string url, string filePath, System.Windows.Forms.ProgressBar progress)
         {
             try
             {
@@ -97,6 +100,7 @@ namespace ComputerResourceConsole.view
                     }
                     so.Close();
                     st.Close();
+                    return true;
 
                 }
                 else
@@ -106,6 +110,7 @@ namespace ComputerResourceConsole.view
                     this.Cancel.Enabled = true;
                     this.progressBar1.Visible = false;
                     this.splitContainer1.Panel2.Enabled = false;
+                    return false;
                 }
 
             }
@@ -116,6 +121,7 @@ namespace ComputerResourceConsole.view
                 this.Cancel.Enabled = true;
                 this.progressBar1.Visible = false;
                 this.splitContainer1.Panel2.Enabled = false;
+                return false;
             }
         }
 
@@ -136,7 +142,7 @@ namespace ComputerResourceConsole.view
         {
             File.Delete(destPath);
             File.Move(fromPath, destPath);
-            MessageBox.Show("Update Application finished! Please start the Model container", "Update Finish", MessageBoxButtons.OK, MessageBoxIcon.None);
+            MessageBox.Show("Update Application finished! Please start the Model container!", "Update Finish", MessageBoxButtons.OK, MessageBoxIcon.Information);
             this.Close();
         }
     }
diff --git a/view/frm_version.cs b/view/frm_version.cs
index f24bd44..1fe7010 100644
--- a/view/frm_version.cs
+++ b/view/frm_version.cs
@@ -53,6 +53,12 @@ namespace ComputerResourceConsole.view
             String path_exe = this._pConfig.NodejsPath;
             String test_Path = CommonMethod.getAppDirection() + path_exe;
             Console.WriteLine(test_Path);
+            if (!File.Exists(test_Path))
+            {
+                //文件不存在表明没有模型服务容器exe，为了使后面不报错，返回版本号为0.0.1
+                MessageBox.Show("Can not find the current model container application", "System Attention", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return "0.0.1";
+            }
             try
             {
                 Process process = new Process();
@@ -143,7 +149,7 @@ namespace ComputerResourceConsole.view
                         this._frm_update = new frm_update();
                         this._frm_update.Show();
 
-                        this.Close();
+                        //this.Close();
                     }
                 }
                 else
-- 
Gitee