MaiXinRong 4 gadi atpakaļ
vecāks
revīzija
a9335f24b0
2 mainītis faili ar 11 papildinājumiem un 3 dzēšanām
  1. 2 0
      build_min.js
  2. 9 3
      config/config.default.js

+ 2 - 0
build_min.js

@@ -13,6 +13,7 @@ const Uglyfy = require('uglify-es');
 const fs = require('fs');
 const JsFiles = require('./config/web');
 const version = require('./config/config.default')({ baseDir: __dirname + '/app', root: __dirname, name: 'calc' }).version;
+console.log(version);
 const savePath = __dirname + '/app' + JsFiles.webPath;
 
 if (!fs.existsSync(savePath)) fs.mkdirSync(savePath);
@@ -23,6 +24,7 @@ for (const c in JsFiles.controller) {
         const action = controller[a];
         if (action.mergeFiles && action.mergeFile.length > 0) {
             const minFileName = savePath + action.mergeFile + '.' + version + '.min.js';
+            console.log(minFileName);
             let code = '';
             for (const f of action.mergeFiles) {
                 code = code + fs.readFileSync(__dirname + '/app' + f, 'utf8');

+ 9 - 3
config/config.default.js

@@ -127,9 +127,15 @@ module.exports = appInfo => {
     // 是否压缩替换前端js
     config.min = true;
 
-    const file = appInfo.root + '/config/version';
-
-    config.version = fs.existsSync(file) ? fs.readFileSync(file, 'utf8') : '1.0.5';
+    const file = path.join(__dirname, 'version');
+    console.log(file);
+
+    if (fs.existsSync(file)) {
+        const versionStr = fs.readFileSync(file, 'utf8');
+        config.version = versionStr.split('\n')[0];
+    } else {
+        config.version = '1.0.5';
+    }
 
     // 压缩设置
     config.gzip = {