From 4d148e489c8d531652440139c55058d4b5f6a099 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Thu, 13 Mar 2025 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade_install/CUpgradeWorker.cpp | 6 ++-- .../upgrade_install/res/sys_upgrade.ico | Bin 10814 -> 4958 bytes .../upgrade/upgrade_install/sys_upgrade.ico | Bin 10814 -> 4958 bytes .../upgrade/upgrade_install/upgradeCommon.h | 34 +++--------------- .../upgrade/upgrade_package/MainWindow.cpp | 24 ++++++------- .../upgrade_package/res/upgrade_package.ico | Bin 9662 -> 4958 bytes .../upgrade_package/upgrade_package.ico | Bin 9662 -> 4958 bytes .../upgrade_package/upgrade_package.pro | 2 ++ 8 files changed, 22 insertions(+), 44 deletions(-) diff --git a/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp b/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp index 045c028e..c49cc3a0 100644 --- a/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp +++ b/product/src/tools/upgrade/upgrade_install/CUpgradeWorker.cpp @@ -338,8 +338,8 @@ void CUpgradeWorker::slotExeDb() connect(m_installHelperProcess,QOverload::of(&QProcess::finished),this,&CUpgradeWorker::slotInstallHelperFinishedHandler); connect(m_installHelperProcess,&QProcess::readyReadStandardOutput,this,&CUpgradeWorker::slotInstallHelperHandler); } - QString program = m_installPath + QDir::separator() + "product" +QDir::separator() + m_exePath + QDir::separator() + INSTALL_HELPER_EXEC_NAME; - //QString program = m_installPath + QDir::separator() + "platform" +QDir::separator() + m_exePath + QDir::separator() + INSTALL_HELPER_EXEC_NAME; + QString program = m_installPath + QDir::separator() + "product" +QDir::separator() + m_exePath + QDir::separator() + UPGRADE_HELPER_EXEC_NAME; + //QString program = m_installPath + QDir::separator() + "platform" +QDir::separator() + m_exePath + QDir::separator() + UPGRADE_HELPER_EXEC_NAME; qDebug() << "program "<start(program,arguments); @@ -504,7 +504,7 @@ QFileInfoList CUpgradeWorker::getOwnFile(const QString &path) for(int i = 0; i < file_list.size(); i++) { QString name = file_list.at(i).fileName(); - if(name == "iot_upgrade_abcdefghigklmnopqrstuvwxyz.txt") + if(name == "kbd_upgrade_abcdefghigklmnopqrstuvwxyz.txt") { list.append(file_list.at(i)); } diff --git a/product/src/tools/upgrade/upgrade_install/res/sys_upgrade.ico b/product/src/tools/upgrade/upgrade_install/res/sys_upgrade.ico index 5130bbf9a120a3a2122e7847801d7b331d2615ac..0b36ae0e7ad34395e206aac001f1b69f5e59a934 100644 GIT binary patch literal 4958 zcmeHLv2GJV5PcDmfYNy=C_9cJGKNa@KfuXLfep&d!ea46O09w+DU?aIgt%0eD8D2(L*Z zmuEoT=93jI1rJ}HA~4O7k?w?B6E*2An-tk3$4~lN2)FE;^p;JEOfV=}_No(Z=~HF% z6Fi^gc*l8<3o3CqGSvwW=?|}S?8M^ul4F;1UU~DnKBC*jo|$=N;TsRJPMdk37~HvL z8QxodeHr)Rt!vkNJHxH-)9Oz~_|UuWYThi`k5M?dzDb6!F*cHaRt#KOG>#G8 zOohBP*Y!gUH64J#{B(xJYUs| zC6)>fVwj#_U&au}*!Qpft~i$SWH@)RlsFs=9CxlhEgr(bv2o|t!7@9=3%RFg9GWl) zuHw8ZFYf}>mHRE@T2X;TvrA$`yV^Je=Ivg`3M{D@`mAG;yLCBf#UPX)8e8FY=hm7t zMb-w#ecXfSW7}Q3)sDSOM8|{oCg#(+<=d4NIoIo5-NoAWo-CNIh8QsSE?xW1?QB^a zKDldd+m`x7JV(SJzbQg)ZBd!aL;9rms1QyUhc%{2Z`q{Cin{YZyl4Nj{~Z>5E*PAW z-`uSF9{&aG%D5lEQ{mr$4Ua!6`V~Ip*jFT<)4npUssG3RqB38To#Is7x{ignKJEVo D5W1D7 literal 10814 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 diff --git a/product/src/tools/upgrade/upgrade_install/sys_upgrade.ico b/product/src/tools/upgrade/upgrade_install/sys_upgrade.ico index 5130bbf9a120a3a2122e7847801d7b331d2615ac..0b36ae0e7ad34395e206aac001f1b69f5e59a934 100644 GIT binary patch literal 4958 zcmeHLv2GJV5PcDmfYNy=C_9cJGKNa@KfuXLfep&d!ea46O09w+DU?aIgt%0eD8D2(L*Z zmuEoT=93jI1rJ}HA~4O7k?w?B6E*2An-tk3$4~lN2)FE;^p;JEOfV=}_No(Z=~HF% z6Fi^gc*l8<3o3CqGSvwW=?|}S?8M^ul4F;1UU~DnKBC*jo|$=N;TsRJPMdk37~HvL z8QxodeHr)Rt!vkNJHxH-)9Oz~_|UuWYThi`k5M?dzDb6!F*cHaRt#KOG>#G8 zOohBP*Y!gUH64J#{B(xJYUs| zC6)>fVwj#_U&au}*!Qpft~i$SWH@)RlsFs=9CxlhEgr(bv2o|t!7@9=3%RFg9GWl) zuHw8ZFYf}>mHRE@T2X;TvrA$`yV^Je=Ivg`3M{D@`mAG;yLCBf#UPX)8e8FY=hm7t zMb-w#ecXfSW7}Q3)sDSOM8|{oCg#(+<=d4NIoIo5-NoAWo-CNIh8QsSE?xW1?QB^a zKDldd+m`x7JV(SJzbQg)ZBd!aL;9rms1QyUhc%{2Z`q{Cin{YZyl4Nj{~Z>5E*PAW z-`uSF9{&aG%D5lEQ{mr$4Ua!6`V~Ip*jFT<)4npUssG3RqB38To#Is7x{ignKJEVo D5W1D7 literal 10814 zcmdU#d2CeI6~+hARIO0cN>!t(s?~5<*zQV$#Iy z28_dMzy@O*@5T#woAHjpVe^i$4G!4GKu92jBoJ)R+wML6&Kr+n4Sr)kgGvheeEjaa zbI$KO_ul96fWt8ie;@su17Cmd82M+1;~|H`F%o(d3Wj*x{DXVH9O02?!1}9RS2{v= zeH&o3H?-+h1*9L(A^k+&{S`A*Imu{mY?IwL1B`|;xEcH(?byLl+KIeeWq)|BJ0^tO zyXKL5C$ww+{gsztZwM)w;k9~Iey)BZchq2<8RzRqt0ntf?wBRiwe)G~TJ$91Gt?FG zEX47C3JlD&7)&8glY8${(#jHDqW#opf8J#Gtr2?jvC5vP1=PLhpVYnLRcMTTEywGY zzXEaee$Ur^<-LbElp0{`0;4;6AsJ_mRmz_4EcYaQ1t^&jb-X6sE8%D5*rCbf^zw4F zQg6?OTx$$V?C+4+evjsk?M-}#QYuRxRShrl-Q-@-ufo>tbHA?f7M=1FfywWx2#*>`DW!y zuW^#H2Yc|t=cs4RI0(K5EA9j4y4Ou0W#0#+>|aMp>MBywR*{+&PU^u;q~>h)!~+o+ zUqedraxg7{ubI>n24Abuo59vI=Z!O2l|2hduW^y3uamhRU!kMXKlrjE?gP)?FqzcM za8)abYt@SORA_~}k7AwfkXE?oDCShC`H_vv-bK{2exhf+?9{~EZm{xN=wP?>Rh>`D z-i0{d@D=u&J*~xhq37<%*@QiDgQQq4HD#n!-H%&J%8}yh&u3}n3FO`!L_I5CvR4y~ z%*xC<*a!5r0>0M4mmP&+tuWucZ3Y?j#fG@reob6%IVUbPw_ED-^XH6DtFEZ|+sM6X z8usDK_G+SDH&_SuRe*E65Pcg>?)6|CiZ+hNnOQ_yMIz~^%Smr2wor+AUpusql*pOn z-hj1UH_moVW@To*y1;t9YTzsWeR8jUf!yJ!V^{0Jh1Y1=;m7r38L4_zE|k~5YVuR{ z-8Z-Q+VqtSUmM_S3w+tpX8773h%-Eg zl$}9?dXLR@#n)Fxi7zjp=kT>2`@~L7o(on5%>H~C4Ng*17L&5^Wm2}`eS;ls4IpJl zAgOV4pmzuDOTw3gFEw!iDdAwWQ&JU-G`dJlUrNg6SJ8W%6+4PV@1mxXnlKl7Z}7gp z!FpZCdZoNi$|m&FPEDQ*R%T{)uMgj7oOY3x5kl(LF{JLo`#d|^Ig!-e(@0C23)%Oj zrM*w;7BJeW$#cQV%*^iV$9rx1%7m}&@D+{M*ijUG#lTkze5Kg(^_cwXg4ELCYa4vo zsmXJ}s)5+^wUmF zo(ooHHo)#(AKz#+!`A`$+Bpur$1}i=_MmsML8PV4gXY`tb;aW=V=<{a&`&!xc`jI) znc02)c&|lE5$Oj%AT8=O(qgAtD+V5-14xa6f6O(t3ww9>1k#dcLvPveb@}h|Mh9u> zc;0Mz?)!XZUgVF)`^}h1V42cC59Tp5vwMB`M$=a=eC>v>c=+m1amb(e2I-mjU9MmS z>G`1^<$XlDa}^n7o1o24_~y2{mbb5ul()V(ZXDiDdiIj<^KoA1O41K3M!jIL;OzFt z16Cc(etn(6dgZ}a416WPSAU8fPe$RYTe2ztqG+q^5a$o~s-nZZzHqWbTsZl#l@H%> zQoDXi%I$xNi`7R&YiXZ+$lHFj!)S3`GRimI(h`HD7C-q;Ca^NI0K0E)@3lBvL`K1X zNRNA+^rUJ1D`pJIPfJti_E&!u&CUmruUCZ+inApTit|TU!@W5Nitsdy+_!!t+CTZ3 zXv*)C4|#DdueClx*Uu&BX)`rFe&U@>U}a`zx2h#t;mi3U>G1)iCr|HRxF@P&FUpR} zc~*Ju<+wQOdR(>?bn0orLQj}{Clh#>nc1!Cn!a2(CkgPC3Sa#xWh&`e?~qZku}w6j zzipN4UW|*ztmloRkp)H$&T`re(o?X9e3`&%fZ4CFPm6JO;45hY>FGfhLjFXYu>*5R zoQNh-v+pHQ7iald>rnlPy2OV?bzF_%`T+IN=QQR)ZC@_1GP3}?RV{h0m_+eMWF$`{ zV?REB@u#$@WMt#Br>eaq8j{C~`h;OtdF_rP*F&Nq^@`!d`@WRP{yD(P%*<|8N1iVs zQ4&f<>LfBU-|(-DAl!#?-iEiRPSKS4j#XYePS$ zkb!&$uwM=$_dpC_6=3%3tG$#&#R?Lcfh2Nf+R&RMvZs+Km_xE5mf-7U=qFYl`i{${ zq~Y>((y!#{lnzmbpRaan^L#K%u=mZ|_j}m^Ux!zMaSDk%u-Z{B`oMC+TYb!z@=RuM z-`rN;%jVQS$maCVL|KR-a)LcM?9^peFf+SljSKK~1ilVnZa#e3RUUKA!1HMy$=Y45 zvNd~wRV^NuXEUFarxOl|Ls+ML?h9UPw4FXK}1&>i@Ddxbt z6LX8<>uyy9U##*4B&#FN$;OyNvUb}^d1M)K3 zs3?%Ad^XXcw|#-MVC9R)=|;;7)Ryg{x^SY>AfjUYI~~W;89xy9VPZyR z1+za--g|VZWE5R4&!(1`LaL9@s5XqKX6+9{%)(5}#*AR~at}6=_T6vjo3nLvG1PI>j88Z&n(?>yAP&d#m-GCO<1ivJ>k>&bK1GHZ ye@9AhylKXt(?v55rz2(@*30XS4(Z`{g!aZ?_(XJS;68c#>g_X<;y;EOj{gEi!i7`- diff --git a/product/src/tools/upgrade/upgrade_install/upgradeCommon.h b/product/src/tools/upgrade/upgrade_install/upgradeCommon.h index 9a77a05a..6547ac87 100644 --- a/product/src/tools/upgrade/upgrade_install/upgradeCommon.h +++ b/product/src/tools/upgrade/upgrade_install/upgradeCommon.h @@ -4,42 +4,16 @@ #pragma once #include +#include "setup/CommonDef.h" #ifdef OS_WINDOWS - #define SYS_CONFIG_PATH "C:/Program Files/PowerSCADA3000" -#endif - -#ifdef OS_LINUX - #define SYS_CONFIG_PATH "/etc/powerscada3000" -#endif - -#define INSTALLER_UNIQUE_NAME "iscs6000_installer" - -const static int pos_min_x=10; -const static int pos_max_x=560; -const static int pos_min_y=10; -const static int pos_max_y=400; - -#ifdef OS_WINDOWS - #define SYS_CONFIG_PATH "C:/Program Files/PowerSCADA3000" - #define UNINSTALL_EXEC_NAME "uninstall.exe" - #define INSTALL_HELPER_EXEC_NAME "upgrade_install_helper.exe" - #define INSTALL_FREFIX "D:" #define DB_MANAGER_EXE_NAME "db_manager.exe" #endif #ifdef OS_LINUX - #define SYS_CONFIG_PATH "/etc/powerscada3000" - #define UNINSTALL_EXEC_NAME "uninstall" - #define INSTALL_HELPER_EXEC_NAME "upgrade_install_helper" - #define INSTALL_FREFIX "/opt" #define DB_MANAGER_EXE_NAME "db_manager" #endif -#define USER_NAME_DEFINE "root"; -#define PASSWORD_DEFINE "kbdct@0755"; - - struct StOldProjectInfo { int projectId; @@ -68,6 +42,7 @@ struct StNewUpgradeInfo } }; +/* struct StDbInfo { QString dbIp; @@ -77,11 +52,12 @@ struct StDbInfo QString dbPassword; StDbInfo(){ dbIp = "127.0.0.1"; - dbName = "iscs6000"; + dbName = EMS_DEFAULT_DATABASE; dbUser ="root"; dbPort = 3306; - dbPassword ="kbdct@0755"; + dbPassword = EMS_DEFAULT_PASSWD; } }; +*/ #endif // UPGRADECOMMON_H diff --git a/product/src/tools/upgrade/upgrade_package/MainWindow.cpp b/product/src/tools/upgrade/upgrade_package/MainWindow.cpp index 3de26d89..4cf23d75 100644 --- a/product/src/tools/upgrade/upgrade_package/MainWindow.cpp +++ b/product/src/tools/upgrade/upgrade_package/MainWindow.cpp @@ -134,8 +134,8 @@ bool MainWindow::addDefaultEmptyDir(const QString &src_path) QString exePath = dir.currentPath(); QDir::setCurrent(src_path); qDebug()<cb_id->currentData().toInt(); - if(proId == 40) - { - ui->textEdit->append(tr("请选择一个产品线补丁")); - return ; - } +// if(proId == 40) +// { +// ui->textEdit->append(tr("请选择一个产品线补丁")); +// return ; +// } QString path = ui->lineEdit_path->text().trimmed(); QString name = ui->lineEdit_name->text().trimmed(); if(path.isEmpty()) @@ -457,7 +457,7 @@ QFileInfoList MainWindow::getOwnFile(const QString &path) for(int i = 0; i < file_list.size(); i++) { QString name = file_list.at(i).fileName(); - if(name == "iot_upgrade_abcdefghigklmnopqrstuvwxyz.txt") + if(name == "kbd_upgrade_abcdefghigklmnopqrstuvwxyz.txt") { list.append(file_list.at(i)); } @@ -631,20 +631,20 @@ void MainWindow::writeVerInfotoFile() } if(node.toElement().attribute("key")=="exe_path") { - QString exePath = "windows10_debug"; + QString exePath = QString("windows10_%1").arg(DIR_DEBUG_RELEASE_DIR); int type = ui->cb_plat->currentData().toInt(); if(type == 1) { - exePath = "windows10_debug"; + exePath = QString("windows10_%1").arg(DIR_DEBUG_RELEASE_DIR); } else if (type == 2) { - exePath = "centos7_debug"; + exePath = QString("centos7_%1").arg(DIR_DEBUG_RELEASE_DIR); } else if (type == 3) { - exePath = "kylin10d_debug"; + exePath = QString("kylin10d_%1").arg(DIR_DEBUG_RELEASE_DIR); } list.at(i).toElement().setAttribute("value",exePath); diff --git a/product/src/tools/upgrade/upgrade_package/res/upgrade_package.ico b/product/src/tools/upgrade/upgrade_package/res/upgrade_package.ico index 1602d1363e973d12504ae6795d5a2dbcedab3bf5..0b36ae0e7ad34395e206aac001f1b69f5e59a934 100644 GIT binary patch literal 4958 zcmeHLv2GJV5PcDmfYNy=C_9cJGKNa@KfuXLfep&d!ea46O09w+DU?aIgt%0eD8D2(L*Z zmuEoT=93jI1rJ}HA~4O7k?w?B6E*2An-tk3$4~lN2)FE;^p;JEOfV=}_No(Z=~HF% z6Fi^gc*l8<3o3CqGSvwW=?|}S?8M^ul4F;1UU~DnKBC*jo|$=N;TsRJPMdk37~HvL z8QxodeHr)Rt!vkNJHxH-)9Oz~_|UuWYThi`k5M?dzDb6!F*cHaRt#KOG>#G8 zOohBP*Y!gUH64J#{B(xJYUs| zC6)>fVwj#_U&au}*!Qpft~i$SWH@)RlsFs=9CxlhEgr(bv2o|t!7@9=3%RFg9GWl) zuHw8ZFYf}>mHRE@T2X;TvrA$`yV^Je=Ivg`3M{D@`mAG;yLCBf#UPX)8e8FY=hm7t zMb-w#ecXfSW7}Q3)sDSOM8|{oCg#(+<=d4NIoIo5-NoAWo-CNIh8QsSE?xW1?QB^a zKDldd+m`x7JV(SJzbQg)ZBd!aL;9rms1QyUhc%{2Z`q{Cin{YZyl4Nj{~Z>5E*PAW z-`uSF9{&aG%D5lEQ{mr$4Ua!6`V~Ip*jFT<)4npUssG3RqB38To#Is7x{ignKJEVo D5W1D7 literal 9662 zcmeI2KXTMC6vmaINV-rl>DYqIq)eGE;RcJ%0rmz!N0DLo2)O~2bUSv2n!N$J0dNAg zq{v!%pXBF#R&0}iVkwNA(SDLFJ^l1a{tHJKZ_HKeaC?fUzf5tvG>7!axBooGkitvJKh(DC zT;lI?$x14YD z<6W6Nt>@6i@3Mn;Q{)$Ie*4btyN;P%?eK4fHeLMI(=Feo%s!&6Z`Q7O7^m+5hwMY1 zescLy*J@LtF}{*b&lFUzs)AD5fUiJzSaqsjj; zzVoQbe|92_CjZ0u&Z8#(*@-Zk{14+hkDB~vC&Fm*KaB4@>Yx0_Z;-x!`}7=-__n_x zVqUWR*z*4azrM`ok2S%6O~>zfhpv@6Kz*N5FWaxJ6ml2!uI|$~@2Q@&I(cXG`e0_- zo$s9){jm4a=v+Oqy4W@C^lHD>=T?8zx<0jKjEDHwKdtJB)XZeZeBvLm>>>09pyTDb diff --git a/product/src/tools/upgrade/upgrade_package/upgrade_package.ico b/product/src/tools/upgrade/upgrade_package/upgrade_package.ico index 1602d1363e973d12504ae6795d5a2dbcedab3bf5..0b36ae0e7ad34395e206aac001f1b69f5e59a934 100644 GIT binary patch literal 4958 zcmeHLv2GJV5PcDmfYNy=C_9cJGKNa@KfuXLfep&d!ea46O09w+DU?aIgt%0eD8D2(L*Z zmuEoT=93jI1rJ}HA~4O7k?w?B6E*2An-tk3$4~lN2)FE;^p;JEOfV=}_No(Z=~HF% z6Fi^gc*l8<3o3CqGSvwW=?|}S?8M^ul4F;1UU~DnKBC*jo|$=N;TsRJPMdk37~HvL z8QxodeHr)Rt!vkNJHxH-)9Oz~_|UuWYThi`k5M?dzDb6!F*cHaRt#KOG>#G8 zOohBP*Y!gUH64J#{B(xJYUs| zC6)>fVwj#_U&au}*!Qpft~i$SWH@)RlsFs=9CxlhEgr(bv2o|t!7@9=3%RFg9GWl) zuHw8ZFYf}>mHRE@T2X;TvrA$`yV^Je=Ivg`3M{D@`mAG;yLCBf#UPX)8e8FY=hm7t zMb-w#ecXfSW7}Q3)sDSOM8|{oCg#(+<=d4NIoIo5-NoAWo-CNIh8QsSE?xW1?QB^a zKDldd+m`x7JV(SJzbQg)ZBd!aL;9rms1QyUhc%{2Z`q{Cin{YZyl4Nj{~Z>5E*PAW z-`uSF9{&aG%D5lEQ{mr$4Ua!6`V~Ip*jFT<)4npUssG3RqB38To#Is7x{ignKJEVo D5W1D7 literal 9662 zcmeI2KXTMC6vmaINV-rl>DYqIq)eGE;RcJ%0rmz!N0DLo2)O~2bUSv2n!N$J0dNAg zq{v!%pXBF#R&0}iVkwNA(SDLFJ^l1a{tHJKZ_HKeaC?fUzf5tvG>7!axBooGkitvJKh(DC zT;lI?$x14YD z<6W6Nt>@6i@3Mn;Q{)$Ie*4btyN;P%?eK4fHeLMI(=Feo%s!&6Z`Q7O7^m+5hwMY1 zescLy*J@LtF}{*b&lFUzs)AD5fUiJzSaqsjj; zzVoQbe|92_CjZ0u&Z8#(*@-Zk{14+hkDB~vC&Fm*KaB4@>Yx0_Z;-x!`}7=-__n_x zVqUWR*z*4azrM`ok2S%6O~>zfhpv@6Kz*N5FWaxJ6ml2!uI|$~@2Q@&I(cXG`e0_- zo$s9){jm4a=v+Oqy4W@C^lHD>=T?8zx<0jKjEDHwKdtJB)XZeZeBvLm>>>09pyTDb diff --git a/product/src/tools/upgrade/upgrade_package/upgrade_package.pro b/product/src/tools/upgrade/upgrade_package/upgrade_package.pro index 76f3d3e4..761412b6 100644 --- a/product/src/tools/upgrade/upgrade_package/upgrade_package.pro +++ b/product/src/tools/upgrade/upgrade_package/upgrade_package.pro @@ -15,6 +15,8 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +DEFINES += DIR_DEBUG_RELEASE_DIR=\\\"$$(DIR_DEBUG_RELEASE)\\\" + SOURCES += \ main.cpp \ MainWindow.cpp