处理打包和jdk冲突

yiming
1 parent ba9b2765
Showing 7 changed files with 87 additions and 73 deletions
pom.xml
src/main/java/com/bsth/data/commonData/SyncData.java
src/main/java/com/bsth/data/jddzx/JDInterface.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/minifier.js
src/main/resources/fatso/package.json
src/main/resources/fatso/start.js
@@ -190,6 +190,10 @@
                     <groupId>org.apache.xmlgraphics</groupId>
                     <artifactId>batik-js</artifactId>
                 </exclusion>
+				<exclusion>
+					<groupId>javassist</groupId>
+					<artifactId>javassist</artifactId>
+				</exclusion>
             </exclusions>
 		</dependency>
 		<dependency>
@@ -91,7 +91,7 @@ public class SyncData  extends Thread{
     @Autowired
     BasicData.BasicDataLoader basicDataLoader;
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 1 * * * ?")
     @Transactional()
     public void SyncData(){
         syncBusiness();
@@ -103,7 +103,6 @@ public class JDInterface {
             //人员投入
             int jhrytl=culateService.culateJhry(schList,"");
             int sjrytl=culateService.culateSjry(schList,"");
-<<<<<<< HEAD
             BigDecimal rytlbfb=BigDecimal.valueOf(100);
             if(jhrytl>0){
                 rytlbfb=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
@@ -113,13 +112,6 @@ public class JDInterface {
             rytl.put("sjrytl",sjrytl);
             rytl.put("rytl",rytlbfb.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("rytl",rytl);
-=======
-            BigDecimal rytl=BigDecimal.valueOf(100);
-            if(jhrytl>0){
-                rytl=BigDecimal.valueOf((double)sjrytl/jhrytl*100);
-            }
-            data.put("rytl",rytl.setScale(2,BigDecimal.ROUND_HALF_UP));
->>>>>>> origin/jdsfx
             //车辆投入
             Map<String,Object> cltl=new HashMap<>();
@@ -129,11 +121,8 @@ public class JDInterface {
             if(jh_z>0){
                 cltl_z=BigDecimal.valueOf((double)sj_z/jh_z*100);
             }
-<<<<<<< HEAD
             cltl.put("jh_z",jh_z);
             cltl.put("sj_z",sj_z);
-=======
->>>>>>> origin/jdsfx
             cltl.put("cltl_z",cltl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jh_w=culateService.culateJhcl(schList,"wgf");
@@ -142,11 +131,8 @@ public class JDInterface {
             if(jh_w>0){
                 cltl_w=BigDecimal.valueOf((double)sj_w/jh_w*100);
             }
-<<<<<<< HEAD
             cltl.put("jh_w",jh_w);
             cltl.put("sj_w",sj_w);
-=======
->>>>>>> origin/jdsfx
             cltl.put("cltl_w",cltl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jh_q=culateService.culateJhcl(schList,"");
@@ -155,11 +141,8 @@ public class JDInterface {
             if(jh_q>0){
                 cltl_q=BigDecimal.valueOf((double)sj_q/jh_q*100);
             }
-<<<<<<< HEAD
             cltl.put("jh_q",jh_q);
             cltl.put("sj_q",sj_q);
-=======
->>>>>>> origin/jdsfx
             cltl.put("cltl_q",cltl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("cltl",cltl);
@@ -172,11 +155,8 @@ public class JDInterface {
             if(jhbctl_z>0){
                 bctl_z=BigDecimal.valueOf((double)sjbctl_z/jhbctl_z*100);
             }
-<<<<<<< HEAD
             bctl.put("jhbctl_z",jhbctl_z);
             bctl.put("sjbctl_z",sjbctl_z);
-=======
->>>>>>> origin/jdsfx
             bctl.put("bctl_z",bctl_z.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jhbctl_w=culateService.culateJhbc(schList,"wgf");
@@ -185,11 +165,8 @@ public class JDInterface {
             if(jhbctl_w>0){
                 bctl_w=BigDecimal.valueOf((double)sjbctl_w/jhbctl_w*100);
             }
-<<<<<<< HEAD
             bctl.put("jhbctl_w",jhbctl_w);
             bctl.put("sjbctl_w",sjbctl_w);
-=======
->>>>>>> origin/jdsfx
             bctl.put("bctl_w",bctl_w.setScale(2,BigDecimal.ROUND_HALF_UP));
             int jhbctl_q=culateService.culateJhbc(schList,"");
@@ -198,11 +175,8 @@ public class JDInterface {
             if(jhbctl_q>0){
                 bctl_q=BigDecimal.valueOf((double)sjbctl_q/jhbctl_q*100);
             }
-<<<<<<< HEAD
             bctl.put("jhbctl_q",jhbctl_q);
             bctl.put("sjbctl_q",sjbctl_q);
-=======
->>>>>>> origin/jdsfx
             bctl.put("bctl_q",bctl_q.setScale(2,BigDecimal.ROUND_HALF_UP));
             data.put("bctl",bctl);
@@ -5,8 +5,7 @@ var fs = require(&#39;fs&#39;)
     , cheerio = require('cheerio')
     , minifier = require('./minifier')
     , crypto = require("crypto")
-    , CleanCSS = require('clean-css')
-    , UglifyJS = require("uglify-js");
+    , CleanCSS = require('clean-css');
 ;
 var platform = process.platform;
@@ -152,7 +151,7 @@ var handleJs = function ($, file, cb) {
     (function () {
         if (index >= ks.length) {
             write(file, $.html());
-            console.log(file + ' 结束'.green);
+            console.log(file + ' 结束'); // 移除.green调用
             cb && cb();
             return;
         }
@@ -160,25 +159,38 @@ var handleJs = function ($, file, cb) {
         index++;
         var f = arguments.callee;
         //合并压缩js
-        var result = UglifyJS.minify(jsMap[k]);
-        var data = result.code;
-        var fName = (k + '_' + md5(data)) + '.js';
-        //写入 assets js 目录下
-        var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
-        fs.open(descFile, 'a', function (err, fd) {
-
-            fs.write(fd, data, function () {
-                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
-                if ($('body').length > 0)
-                    $('body').append(tag);
-                else {
-                    //没有body 就写在尾部
-                    $('*').last().after(tag);
-                }
-                console.log(k + ' js', '结束，下一个');
-                f();
+        try {
+            // 先合并文件内容
+            let code = '';
+            for(let j = 0; j < jsMap[k].length; j++) {
+                code += fs.readFileSync(jsMap[k][j], 'utf8') + '\n';
+            }
+            // 使用Terser压缩
+            var data = minifier.mini(code);
+            if (code !== '' && data === '') {
+                console.error('压缩出错')
+                process.exit();
+            }
+            var fName = (k + '_' + md5(data)) + '.js';
+            //写入 assets js 目录下
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+                fs.write(fd, data, function () {
+                    var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                    if ($('body').length > 0)
+                        $('body').append(tag);
+                    else {
+                        //没有body 就写在尾部
+                        $('*').last().after(tag);
+                    }
+                    console.log(k + ' js', '结束，下一个');
+                    f();
+                });
             });
-        });
+        } catch (e) {
+            console.error('合并压缩错误:', e);
+            process.exit();
+        }
     })();
 };
@@ -197,10 +209,10 @@ function md5(text) {
 function write(file, text) {
     fs.writeFile(file, text, function (err) {
         if (err) {
-            console.log(err.toString().red);
+            console.log(err.toString()); // 移除.red调用
             process.exit();
         }
-        console.log(file.green);
+        console.log(file); // 移除.green调用
     });
 }
-/**
- * @author PanZhao 
- * @date 2016年3月17日 下午12:44:06 
- */
 var fs = require('fs');
-var UglifyJS = require("uglify-js");
+var Terser = require('terser');
 var platform = process.platform;
 var iswin = platform=='win32';
 var separator = platform=='win32'?'\\':'/';
 var minifier = {
-	
-	mergeAndMini: function(fileArray,scriptString, root, file){
+
+	mergeAndMini: function(fileArray, scriptString, root, file) {
 		var len = fileArray.length;
 		for(var i = 0; i < len; i ++){
-			fileArray[i] = root  + fileArray[i].split('/').join(separator);
+			fileArray[i] = root + fileArray[i].split('/').join(separator);
 		}
-		
+
 		var result, indoorRs;
-		
+
 		try {
-			if(fileArray && len > 0)
-				result = UglifyJS.minify(fileArray);
-			
-			if(scriptString)
-				indoorRs = UglifyJS.minify(scriptString, {fromString: true});
+			if(fileArray && len > 0) {
+				// Terser可以直接接受文件路径数组
+				result = Terser.minify_sync(fs.readFileSync(fileArray[0], 'utf8'));
+				// 如果有多个文件，需要先合并内容
+				if(len > 1) {
+					let code = '';
+					for(let j = 0; j < len; j++) {
+						code += fs.readFileSync(fileArray[j], 'utf8') + '\n';
+					}
+					result = Terser.minify_sync(code);
+				}
+			}
+
+			if(scriptString) {
+				// Terser不需要fromString选项，直接传递代码字符串
+				indoorRs = Terser.minify_sync(scriptString);
+			}
 		} catch (e) {
 			console.log(e);
-			console.log(file.red);
+			console.log(file); // 移除.red调用，除非有chalk等库
 			process.exit();
 		}
-		
-		return {outside: result?result.code:'', inside: indoorRs?indoorRs.code:''};
+
+		return {outside: result && !result.error ? result.code : '', inside: indoorRs && !indoorRs.error ? indoorRs.code : ''};
 	},
-	mini: function(file){
-		return UglifyJS.minify(file).code;
+
+	mini: function(file) {
+		try {
+			// 检查file是文件路径还是代码字符串
+			if(typeof file === 'string' && fs.existsSync(file)) {
+				const code = fs.readFileSync(file, 'utf8');
+				const result = Terser.minify_sync(code);
+				return result && !result.error ? result.code : '';
+			} else {
+				// 假设是代码字符串
+				const result = Terser.minify_sync(file);
+				return result && !result.error ? result.code : '';
+			}
+		} catch (e) {
+			console.log(e);
+			return '';
+		}
 	}
-}
+};
 module.exports = minifier;
 \ No newline at end of file
@@ -12,7 +12,8 @@
     "cheerio": "^0.20.0",
     "clean-css": "^4.0.12",
     "colors": "^1.3.3",
-    "eventproxy": "^0.3.5",
+    "eventproxy": "^0.3.4",
+    "terser": "^5.44.0",
     "uglify-js": "^2.6.2"
   }
 }
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','call','base' + sp + 'region',]
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()