jh5_app_build 1.0.20 → 1.0.21

package/lib/build_std.js

@@ -9,77 +9,156 @@ let AdmZip = require('adm-zip');
 let child_process = require('child_process');
 
 
+/**
+ * 创建目录并获取尾部带斜线的路径
+ * @param {string} dirPath 路径
+ * @returns {string} 路径(尾部带斜线)
+ */
+function makeAndGetDir(dirPath) {
+    try {
+        fs.mkdirSync(dirPath);
+    } catch (error) {
+    }
+    return path.resolve(dirPath) + "\\";
+}
+
+/**
+ * 创建目录并复制文件
+ * @param {string} srcFile 源文件
+ * @param {string} dstFile 目标文件
+ * @returns {void}
+ */
+async function makeDirAndCopy(srcFile, dstFile) {
+    await jutils.jfile_utils.createDirs(dstFile, true);
+    fs.copyFileSync(srcFile, dstFile);
+}
+
 module.exports = async (cmd, buildCfg) => {
-    // 生成无签名的apk
-    await new Promise((resolve, reject) => {
-        (async () => {
-            // 建立压缩文件
-            console.log(`build file to ${buildCfg.outpath}`);
-            let output = fs.createWriteStream(buildCfg.outpath);
-            let archive = archiver('zip', {
-                zlib: { level: 9 }
-            });
-            output.on('close', function () {
-                console.log(archive.pointer() + ' total bytes');
-                resolve();
-            });
-            output.on('end', function () {
-            });
-            archive.on('warning', function (err) {
-                if (err.code === 'ENOENT') {
-                } else {
-                    reject(err);
-                }
-            });
-            archive.on('error', function (err) {
-                reject(err);
-            });
-            archive.pipe(output);
+    console.log(`build file to ${buildCfg.outpath}`);
+
+    try {
+        // 模板目录
+        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
+
+        // jre目录
+        let jreCwd = "C:\\jdev_develop\\jre\\bin";
+
+        // apk配置
+        let apkConfig = makeAndGetDir(`${buildCfg.rootPath}/apk_cfg`);
+
+        // 清理数据
+        console.log(`delete temp file ...`);
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/device_webapi");
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/h5app");
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/jext");
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/screen");
 
-            // 修改版本号
-            let platformVer = jutils.getUUID();
+        // 修改版本号
+        let platformVer = jutils.getUUID();
+        try {
+            console.log(`change dist ver ...`);
+            let repFile = `${buildCfg.rootPath}\\dist\\index.html`;
+            let indexStr = fs.readFileSync(repFile, "utf8");
+            indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
+            indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);
+
+            // 读取H5版本
             try {
-                console.log(`change dist ver ...`);
-                let repFile = `${buildCfg.rootPath}\\dist\\index.html`;
-                let indexStr = fs.readFileSync(repFile, "utf8");
-                indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
-                indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);
-
-                // 读取H5版本
-                try {
-                    let bInfoStr = fs.readFileSync(`${buildCfg.rootPath}/jbuild_data/info.txt`, "utf8");
-                    let bInfoObj = JSON.parse(bInfoStr);
-                    if (bInfoObj.version) {
-                        platformVer = bInfoObj.version;
-                        indexStr = indexStr.replace(/#J_H5_VER#/g, bInfoObj.version);
-                    }
-                } catch (error) {
-                    console.log(`no h5Ver!`);
+                let bInfoStr = fs.readFileSync(`${buildCfg.rootPath}/jbuild_data/info.txt`, "utf8");
+                let bInfoObj = JSON.parse(bInfoStr);
+                if (bInfoObj.version) {
+                    platformVer = bInfoObj.version;
+                    indexStr = indexStr.replace(/#J_H5_VER#/g, bInfoObj.version);
                 }
-
-                // 保存
-                fs.writeFileSync(repFile, indexStr);
             } catch (error) {
+                console.log(`no h5Ver!`);
             }
 
-            // 载入apk
-            {
-                console.log(`load files ...`);
-                let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/std_bins/app-release.apk`);
+            // 保存
+            fs.writeFileSync(repFile, indexStr);
+        } catch (error) {
+        }
 
-                // 循环添加
-                let zipEntries = myZip.getEntries();
-                zipEntries.forEach(function (zipEntry) {
-                    // 过滤签名
-                    if (!["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"].includes(zipEntry.entryName.toUpperCase())) {
-                        archive.append(zipEntry.getData(), { name: zipEntry.entryName });
-                    }
-                });
+        // 添加用户文件
+        {
+            let pathSub = "dist";
+            console.log(`scaning ${pathSub} ...`);
+            let fileList = glob(`${pathSub}/**/*`, {
+                dot: true,
+                sync: true,
+                nodir: true,
+                cwd: buildCfg.rootPath,
+                ignore: []
+            });
+            if (fileList.length === 0) {
+                console.error("no dist files!");
+                return;
+            }
+            console.log(`add [${fileList.length}] files ...`);
+            let baseDir = makeAndGetDir(stdBinDir + "/assets/h5app");
+            for (let index = 0; index < fileList.length; index++) {
+                let element = fileList[index].substr(pathSub.length + 1);
+
+                // 添加文件
+                await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
+            }
+        }
+
+        // 添加启动屏文件
+        {
+            let pathSub = "static/screen";
+            console.log(`scaning ${pathSub} ...`);
+            let fileList = glob(`${pathSub}/**/*`, {
+                dot: true,
+                sync: true,
+                nodir: true,
+                cwd: buildCfg.rootPath,
+                ignore: []
+            });
+            if (fileList.length === 0) {
+                console.error("no dist files!");
+                return;
+            }
+            console.log(`add [${fileList.length}] files ...`);
+            let baseDir = makeAndGetDir(stdBinDir + "/assets/screen");
+            for (let index = 0; index < fileList.length; index++) {
+                let element = fileList[index].substr(pathSub.length + 1);
+
+                // 添加文件
+                await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
+            }
+        }
+
+        // 添加so文件
+        {
+            let pathSub = "static/ndkutils";
+            console.log(`scaning ${pathSub} ...`);
+            let fileList = glob(`${pathSub}/**/*`, {
+                dot: true,
+                sync: true,
+                nodir: true,
+                cwd: buildCfg.rootPath,
+                ignore: []
+            });
+            if (fileList.length === 0) {
+                console.error("no dist files!");
+                return;
             }
+            console.log(`add [${fileList.length}] files ...`);
+            let baseDir = makeAndGetDir(stdBinDir + "/lib");
+            for (let index = 0; index < fileList.length; index++) {
+                let element = fileList[index].substr(pathSub.length + 1);
 
-            // 添加用户文件
+                // 添加文件
+                await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
+            }
+        }
+
+        // 需要web
+        if (!buildCfg.platform.includes("noweb")) {
+            // 添加框架二进制
             {
-                let pathSub = "dist";
+                let pathSub = "jbuild_data/jext";
                 console.log(`scaning ${pathSub} ...`);
                 let fileList = glob(`${pathSub}/**/*`, {
                     dot: true,
@@ -88,129 +167,112 @@ module.exports = async (cmd, buildCfg) => {
                     cwd: buildCfg.rootPath,
                     ignore: []
                 });
-                if (fileList.length === 0) {
-                    console.error("no dist files!");
-                    return;
-                }
                 console.log(`add [${fileList.length}] files ...`);
+                let baseDir = makeAndGetDir(stdBinDir + "/assets/jext");
                 for (let index = 0; index < fileList.length; index++) {
                     let element = fileList[index].substr(pathSub.length + 1);
 
                     // 添加文件
-                    archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/h5app/" + element });
+                    await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
                 }
             }
 
-            // 需要web
-            if (!buildCfg.platform.includes("noweb")) {
-                // 添加框架二进制
-                {
-                    let pathSub = "jbuild_data/jext";
-                    console.log(`scaning ${pathSub} ...`);
-                    let fileList = glob(`${pathSub}/**/*`, {
-                        dot: true,
-                        sync: true,
-                        nodir: true,
-                        cwd: buildCfg.rootPath,
-                        ignore: []
-                    });
-                    console.log(`add [${fileList.length}] files ...`);
-                    for (let index = 0; index < fileList.length; index++) {
-                        let element = fileList[index].substr(pathSub.length + 1);
-
-                        // 添加文件
-                        archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/jext/" + element });
-                    }
-                }
-
-                // 添加后台服务
-                {
-                    console.log(`add device_webapi files ...`);
-                    // 载入zip
-                    let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/device_webapi.zip`);
-
-                    // 循环添加
-                    let zipEntries = myZip.getEntries();
-                    zipEntries.forEach(function (zipEntry) {
-                        archive.append(zipEntry.getData(), { name: "assets/device_webapi/" + zipEntry.entryName });
-                    });
+            // 添加后台服务
+            {
+                console.log(`add device_webapi files ...`);
+                let baseDir = makeAndGetDir(stdBinDir + "/assets/device_webapi");
+                // 载入zip
+                let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/device_webapi.zip`);
 
-                    // 版本号
-                    archive.append(Buffer.from(platformVer), { name: "assets/device_webapi/info.txt" });
-                }
+                // 循环添加
+                let zipEntries = myZip.getEntries();
+                zipEntries.forEach(function (zipEntry) {
+                    fs.writeFileSync(baseDir + zipEntry.entryName, zipEntry.getData());
+                });
 
-            }
-            // 添加设备信息
-            try {
-                let pkgInfo = os.networkInterfaces();
-                pkgInfo.buildTime = jutils.getNowDate();
-                archive.append(JSON.stringify(pkgInfo, null, 4), { name: "assets/build_info.txt" });
-            } catch (error) {
+                // 版本号
+                fs.writeFileSync(baseDir + "info.txt", Buffer.from(platformVer));
             }
 
-            // 开始压缩
-            archive.finalize();
-        })().catch((err) => {
-            console.error("build error,please run [jh5 update] first.");
-            try {
-                jutils.jfile_utils.deleteFile(buildCfg.outpath);
-            } catch (error) {
-            }
+        }
+        // 添加设备信息
+        try {
+            let pkgInfo = os.networkInterfaces();
+            pkgInfo.buildTime = jutils.getNowDate();
+            fs.writeFileSync(stdBinDir + "/assets/info.txt", JSON.stringify(pkgInfo, null, 4));
+        } catch (error) {
+        }
+
+        // 打包
+        console.log(`making apk...`);
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\java.exe", [
+            "-jar", "C:\\jdev_develop\\h5_bin\\apktool.jar",
+            "b", stdBinDir,
+            "-o", buildCfg.outpath
+        ], {
+            cwd: jreCwd
         });
-    });
 
-    // 生成apk签名
-    console.log(`not find keystore,making ...`);
-    let jreCwd = "C:\\jdev_develop\\jre\\bin";
-    let keyStoreFile = `${buildCfg.rootPath}/sigin/apk_cert.keystore`;
-    try {
-        fs.mkdirSync(path.dirname(keyStoreFile));
-    } catch (error) {
-    }
-    if (!fs.existsSync(keyStoreFile)) {
-        // 生成签名
-        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
-            "-genkey",
+        // 生成apk签名
+        let keyStoreFile = `${apkConfig}/apk_cert.keystore`;
+        if (!fs.existsSync(keyStoreFile)) {
+            console.log(`not find keystore,making ...`);
+            // 生成签名
+            child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
+                "-genkey",
+                "-storepass", "123456",
+                "-keypass", "123456",
+                "-alias", "cert",
+                "-keyalg", "RSA",
+                "-validity", "20000",
+                "-keystore", keyStoreFile,
+                "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
+            ], {
+                cwd: jreCwd
+            });
+        }
+
+        // 签名
+        console.log(`sign apk ...`);
+        var singApkTmp = buildCfg.outpath + "_sign.apk";
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
+            "-verbose",
             "-storepass", "123456",
             "-keypass", "123456",
-            "-alias", "apk_cert",
-            "-keyalg", "RSA",
-            "-validity", "20000",
             "-keystore", keyStoreFile,
-            "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
+            "-signedjar", singApkTmp,
+            buildCfg.outpath,
+            "cert"
         ], {
             cwd: jreCwd
         });
-    }
+        fs.unlinkSync(buildCfg.outpath); // 删除未签名的
+
+        // 对齐apk
+        console.log(`zip align ...`);
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
+            "-v", "4",
+            singApkTmp,
+            buildCfg.outpath
+        ], {
+            cwd: jreCwd
+        });
+        fs.unlinkSync(singApkTmp); // 删除未对齐的
 
-    // 签名
-    console.log(`sign apk ...`);
-    var singApkTmp = buildCfg.outpath + "_sign.apk";
-    child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
-        "-verbose",
-        "-storepass", "123456",
-        "-keypass", "123456",
-        "-keystore", keyStoreFile,
-        "-signedjar", singApkTmp,
-        buildCfg.outpath,
-        "apk_cert"
-    ], {
-        cwd: jreCwd
-    });
-    fs.unlinkSync(buildCfg.outpath); // 删除未签名的
-
-    // 对齐apk
-    console.log(`zip align ...`);
-    child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
-        "-v", "4",
-        singApkTmp,
-        buildCfg.outpath
-    ], {
-        cwd: jreCwd
-    });
-    fs.unlinkSync(singApkTmp); // 删除未对齐的
-
-    // 完成
-    console.log(`build success:${buildCfg.outpath}`);
+        // 完成
+        console.log(`build success:${buildCfg.outpath}`);
+    } catch (error) {
+        // 清理文件
+        try {
+            jutils.jfile_utils.deleteFile(buildCfg.outpath);
+        } catch (error2) {
+        }
+        // 延迟报错
+        setTimeout(() => {
+            console.error("build error,please run [jh5 update] first.");
+        }, 500);
+        // 向上抛出
+        throw error;
+    }
 }
 

package/lib/build_std_apk_tool.js

@@ -0,0 +1,230 @@
+let glob = require("glob")
+let archiver = require('archiver');
+let jutils = require('base_parts');
+
+let fs = require('fs');
+let path = require('path');
+let os = require('os');
+let AdmZip = require('adm-zip');
+let child_process = require('child_process');
+
+
+/**
+ * 创建目录并获取尾部带斜线的路径
+ * @param {string} dirPath 路径
+ * @returns {string} 路径(尾部带斜线)
+ */
+function makeAndGetDir(dirPath) {
+    try {
+        fs.mkdirSync(dirPath);
+    } catch (error) {
+    }
+    return path.resolve(dirPath) + "\\";
+}
+
+/**
+ * 创建目录并复制文件
+ * @param {string} srcFile 源文件
+ * @param {string} dstFile 目标文件
+ * @returns {void}
+ */
+async function makeDirAndCopy(srcFile, dstFile) {
+    await jutils.jfile_utils.createDirs(dstFile, true);
+    fs.copyFileSync(srcFile, dstFile);
+}
+
+module.exports = async (cmd, buildCfg) => {
+    console.log(`build file to ${buildCfg.outpath}`);
+
+    try {
+        // 模板目录
+        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
+
+        // jre目录
+        let jreCwd = "C:\\jdev_develop\\jre\\bin";
+
+        // 清理数据
+        console.log(`delete temp file ...`);
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/device_webapi");
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/h5app");
+        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/jext");
+
+        // 修改版本号
+        let platformVer = jutils.getUUID();
+        try {
+            console.log(`change dist ver ...`);
+            let repFile = `${buildCfg.rootPath}\\dist\\index.html`;
+            let indexStr = fs.readFileSync(repFile, "utf8");
+            indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
+            indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);
+
+            // 读取H5版本
+            try {
+                let bInfoStr = fs.readFileSync(`${buildCfg.rootPath}/jbuild_data/info.txt`, "utf8");
+                let bInfoObj = JSON.parse(bInfoStr);
+                if (bInfoObj.version) {
+                    platformVer = bInfoObj.version;
+                    indexStr = indexStr.replace(/#J_H5_VER#/g, bInfoObj.version);
+                }
+            } catch (error) {
+                console.log(`no h5Ver!`);
+            }
+
+            // 保存
+            fs.writeFileSync(repFile, indexStr);
+        } catch (error) {
+        }
+
+        // 添加用户文件
+        {
+            let pathSub = "dist";
+            console.log(`scaning ${pathSub} ...`);
+            let fileList = glob(`${pathSub}/**/*`, {
+                dot: true,
+                sync: true,
+                nodir: true,
+                cwd: buildCfg.rootPath,
+                ignore: []
+            });
+            if (fileList.length === 0) {
+                console.error("no dist files!");
+                return;
+            }
+            console.log(`add [${fileList.length}] files ...`);
+            let baseDir = makeAndGetDir(stdBinDir + "/assets/h5app");
+            for (let index = 0; index < fileList.length; index++) {
+                let element = fileList[index].substr(pathSub.length + 1);
+
+                // 添加文件
+                await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
+            }
+        }
+
+        // 需要web
+        if (!buildCfg.platform.includes("noweb")) {
+            // 添加框架二进制
+            {
+                let pathSub = "jbuild_data/jext";
+                console.log(`scaning ${pathSub} ...`);
+                let fileList = glob(`${pathSub}/**/*`, {
+                    dot: true,
+                    sync: true,
+                    nodir: true,
+                    cwd: buildCfg.rootPath,
+                    ignore: []
+                });
+                console.log(`add [${fileList.length}] files ...`);
+                let baseDir = makeAndGetDir(stdBinDir + "/assets/jext");
+                for (let index = 0; index < fileList.length; index++) {
+                    let element = fileList[index].substr(pathSub.length + 1);
+
+                    // 添加文件
+                    await makeDirAndCopy(`${buildCfg.rootPath}/${pathSub}/${element}`, baseDir + element);
+                }
+            }
+
+            // 添加后台服务
+            {
+                console.log(`add device_webapi files ...`);
+                let baseDir = makeAndGetDir(stdBinDir + "/assets/device_webapi");
+                // 载入zip
+                let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/device_webapi.zip`);
+
+                // 循环添加
+                let zipEntries = myZip.getEntries();
+                zipEntries.forEach(function (zipEntry) {
+                    fs.writeFileSync(baseDir + zipEntry.entryName, zipEntry.getData());
+                });
+
+                // 版本号
+                fs.writeFileSync(baseDir + "info.txt", Buffer.from(platformVer));
+            }
+
+        }
+        // 添加设备信息
+        try {
+            let pkgInfo = os.networkInterfaces();
+            pkgInfo.buildTime = jutils.getNowDate();
+            fs.writeFileSync(stdBinDir + "/assets/info.txt", JSON.stringify(pkgInfo, null, 4));
+        } catch (error) {
+        }
+
+        // 打包
+        console.log(`making apk...`);
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\java.exe", [
+            "-jar", "C:\\jdev_develop\\h5_bin\\apktool.jar",
+            "b", stdBinDir,
+            "-o", buildCfg.outpath
+        ], {
+            cwd: jreCwd
+        });
+
+        // 生成apk签名
+        console.log(`not find keystore,making ...`);
+        let keyStoreFile = `${buildCfg.rootPath}/sigin/apk_cert.keystore`;
+        try {
+            fs.mkdirSync(path.dirname(keyStoreFile));
+        } catch (error) {
+        }
+        if (!fs.existsSync(keyStoreFile)) {
+            // 生成签名
+            child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
+                "-genkey",
+                "-storepass", "123456",
+                "-keypass", "123456",
+                "-alias", "cert",
+                "-keyalg", "RSA",
+                "-validity", "20000",
+                "-keystore", keyStoreFile,
+                "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
+            ], {
+                cwd: jreCwd
+            });
+        }
+
+        // 签名
+        console.log(`sign apk ...`);
+        var singApkTmp = buildCfg.outpath + "_sign.apk";
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
+            "-verbose",
+            "-storepass", "123456",
+            "-keypass", "123456",
+            "-keystore", keyStoreFile,
+            "-signedjar", singApkTmp,
+            buildCfg.outpath,
+            "cert"
+        ], {
+            cwd: jreCwd
+        });
+        fs.unlinkSync(buildCfg.outpath); // 删除未签名的
+
+        // 对齐apk
+        console.log(`zip align ...`);
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
+            "-v", "4",
+            singApkTmp,
+            buildCfg.outpath
+        ], {
+            cwd: jreCwd
+        });
+        fs.unlinkSync(singApkTmp); // 删除未对齐的
+
+        // 完成
+        console.log(`build success:${buildCfg.outpath}`);
+    } catch (error) {
+        // 延迟报错
+        setTimeout(() => {
+            console.error("build error,please run [jh5 update] first.");
+        }, 500);
+        // 向上抛出
+        throw error;
+    }
+    finally {
+        // 清理文件
+        try {
+            jutils.jfile_utils.deleteFile(buildCfg.outpath);
+        } catch (error) {
+        }
+    }
+}
+

package/lib/build_std_zip.js

@@ -0,0 +1,216 @@
+let glob = require("glob")
+let archiver = require('archiver');
+let jutils = require('base_parts');
+
+let fs = require('fs');
+let path = require('path');
+let os = require('os');
+let AdmZip = require('adm-zip');
+let child_process = require('child_process');
+
+
+module.exports = async (cmd, buildCfg) => {
+    // 生成无签名的apk
+    await new Promise((resolve, reject) => {
+        (async () => {
+            // 建立压缩文件
+            console.log(`build file to ${buildCfg.outpath}`);
+            let output = fs.createWriteStream(buildCfg.outpath);
+            let archive = archiver('zip', {
+                zlib: { level: 9 }
+            });
+            output.on('close', function () {
+                console.log(archive.pointer() + ' total bytes');
+                resolve();
+            });
+            output.on('end', function () {
+            });
+            archive.on('warning', function (err) {
+                if (err.code === 'ENOENT') {
+                } else {
+                    reject(err);
+                }
+            });
+            archive.on('error', function (err) {
+                reject(err);
+            });
+            archive.pipe(output);
+
+            // 修改版本号
+            let platformVer = jutils.getUUID();
+            try {
+                console.log(`change dist ver ...`);
+                let repFile = `${buildCfg.rootPath}\\dist\\index.html`;
+                let indexStr = fs.readFileSync(repFile, "utf8");
+                indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
+                indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);
+
+                // 读取H5版本
+                try {
+                    let bInfoStr = fs.readFileSync(`${buildCfg.rootPath}/jbuild_data/info.txt`, "utf8");
+                    let bInfoObj = JSON.parse(bInfoStr);
+                    if (bInfoObj.version) {
+                        platformVer = bInfoObj.version;
+                        indexStr = indexStr.replace(/#J_H5_VER#/g, bInfoObj.version);
+                    }
+                } catch (error) {
+                    console.log(`no h5Ver!`);
+                }
+
+                // 保存
+                fs.writeFileSync(repFile, indexStr);
+            } catch (error) {
+            }
+
+            // 载入apk
+            {
+                console.log(`load files ...`);
+                let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/std_bins/app-release.apk`);
+
+                // 循环添加
+                let zipEntries = myZip.getEntries();
+                zipEntries.forEach(function (zipEntry) {
+                    // 过滤签名
+                    if (zipEntry.entryName.toUpperCase().indexOf("META-INF/") !== 0) {
+                        archive.append(zipEntry.getData(), { name: zipEntry.entryName });
+                    }
+                });
+            }
+
+            // 添加用户文件
+            {
+                let pathSub = "dist";
+                console.log(`scaning ${pathSub} ...`);
+                let fileList = glob(`${pathSub}/**/*`, {
+                    dot: true,
+                    sync: true,
+                    nodir: true,
+                    cwd: buildCfg.rootPath,
+                    ignore: []
+                });
+                if (fileList.length === 0) {
+                    console.error("no dist files!");
+                    return;
+                }
+                console.log(`add [${fileList.length}] files ...`);
+                for (let index = 0; index < fileList.length; index++) {
+                    let element = fileList[index].substr(pathSub.length + 1);
+
+                    // 添加文件
+                    archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/h5app/" + element });
+                }
+            }
+
+            // 需要web
+            if (!buildCfg.platform.includes("noweb")) {
+                // 添加框架二进制
+                {
+                    let pathSub = "jbuild_data/jext";
+                    console.log(`scaning ${pathSub} ...`);
+                    let fileList = glob(`${pathSub}/**/*`, {
+                        dot: true,
+                        sync: true,
+                        nodir: true,
+                        cwd: buildCfg.rootPath,
+                        ignore: []
+                    });
+                    console.log(`add [${fileList.length}] files ...`);
+                    for (let index = 0; index < fileList.length; index++) {
+                        let element = fileList[index].substr(pathSub.length + 1);
+
+                        // 添加文件
+                        archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/jext/" + element });
+                    }
+                }
+
+                // 添加后台服务
+                {
+                    console.log(`add device_webapi files ...`);
+                    // 载入zip
+                    let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/device_webapi.zip`);
+
+                    // 循环添加
+                    let zipEntries = myZip.getEntries();
+                    zipEntries.forEach(function (zipEntry) {
+                        archive.append(zipEntry.getData(), { name: "assets/device_webapi/" + zipEntry.entryName });
+                    });
+
+                    // 版本号
+                    archive.append(Buffer.from(platformVer), { name: "assets/device_webapi/info.txt" });
+                }
+
+            }
+            // 添加设备信息
+            try {
+                let pkgInfo = os.networkInterfaces();
+                pkgInfo.buildTime = jutils.getNowDate();
+                archive.append(JSON.stringify(pkgInfo, null, 4), { name: "assets/build_info.txt" });
+            } catch (error) {
+            }
+
+            // 开始压缩
+            archive.finalize();
+        })().catch((err) => {
+            console.error("build error,please run [jh5 update] first.");
+            try {
+                jutils.jfile_utils.deleteFile(buildCfg.outpath);
+            } catch (error) {
+            }
+        });
+    });
+
+    // 生成apk签名
+    console.log(`not find keystore,making ...`);
+    let jreCwd = "C:\\jdev_develop\\jre\\bin";
+    let keyStoreFile = `${buildCfg.rootPath}/sigin/apk_cert.keystore`;
+    try {
+        fs.mkdirSync(path.dirname(keyStoreFile));
+    } catch (error) {
+    }
+    if (!fs.existsSync(keyStoreFile)) {
+        // 生成签名
+        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
+            "-genkey",
+            "-storepass", "123456",
+            "-keypass", "123456",
+            "-alias", "cert",
+            "-keyalg", "RSA",
+            "-validity", "20000",
+            "-keystore", keyStoreFile,
+            "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
+        ], {
+            cwd: jreCwd
+        });
+    }
+
+    // 签名
+    console.log(`sign apk ...`);
+    var singApkTmp = buildCfg.outpath + "_sign.apk";
+    child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
+        "-verbose",
+        "-storepass", "123456",
+        "-keypass", "123456",
+        "-keystore", keyStoreFile,
+        "-signedjar", singApkTmp,
+        buildCfg.outpath,
+        "cert"
+    ], {
+        cwd: jreCwd
+    });
+    fs.unlinkSync(buildCfg.outpath); // 删除未签名的
+
+    // 对齐apk
+    console.log(`zip align ...`);
+    child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
+        "-v", "4",
+        singApkTmp,
+        buildCfg.outpath
+    ], {
+        cwd: jreCwd
+    });
+    fs.unlinkSync(singApkTmp); // 删除未对齐的
+
+    // 完成
+    console.log(`build success:${buildCfg.outpath}`);
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jh5_app_build",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "jaskle jh5_app_build",
   "main": "./bin/jh5_app_build.js",
   "registry": true,