Merge branch 'zt' of http://git.youdatasum.com/ljg/cpas6-install into zt

Jenkinsfile

@@ -107,8 +107,8 @@ pipeline {
             description: '输入 agent 节点 (可选:ljgWinMachine or lzxWinMachine，windowsPackageMachine)'
         )
         string(name: 'NODE_WORKING_DIR', defaultValue: ' G:\\cpas-framework', description: 'electron打包脚本执行的工作目录 G:\\cpas-framework or C:/Users/Administrator/Desktop/youdatasumCode/framework')
-        string(name: 'BRANCH_NAME', defaultValue: 'unknown', description: '要构建的分支名称')
-        string(name: 'INSTALLATION_DIR', defaultValue: '', description: '安装包打包目录：E:/CPAS6-101-UFCPAS6-zt')
+        string(name: 'BRANCH_NAME', defaultValue: 'release-report-060320-deploy', description: '要构建的分支名称')
+        string(name: 'INSTALLATION_DIR', defaultValue: 'E:/CPAS6-101-UFCPAS6-zt', description: '安装包打包目录：E:/CPAS6-101-UFCPAS6-zt')
         string(name: 'PUBLISH_DIR', defaultValue: 'E:/产品安装包/05 大客户专版/109 致同/CPAS6.0 IAS版', description: '发布目录：E:/产品安装包/05 大客户专版/109 致同/CPAS6.0 IAS版')
     }
 

build.js

@@ -132,9 +132,10 @@ async function main() {
         // Copy files from source to destination (recursive)
         console.log("Starting file copy...");
         await copyFiles(src, dest, subFolders);
-       
+        
+        const iss= '/CPAS6Setup_IASWithBom.iss'
           // If it's a file, copy directly
-        fs.copyFile("./CPAS6Setup_IAS.iss", dest, fs.constants.COPYFILE_FICLONE, (err) => {
+        fs.copyFile("."+iss, dest, fs.constants.COPYFILE_FICLONE, (err) => {
             if (err) {
                  new Error(`Error copying file: ${err}`);
             }
@@ -147,7 +148,7 @@ async function main() {
 
         // Run ISCC to compile the installer
         console.log("Running ISCC.exe...");
-        await execCommand(`D:/InnoSetup6/ISCC.exe "${dest}/CPAS6Setup_IAS.iss"`);
+        await execCommand(`D:/InnoSetup6/ISCC.exe "${dest}${iss}"`);
         console.log("ISCC.exe completed.");
 
         console.log("Script execution completed successfully.");