Merge branch 'fix/linuxPackage' into 'develop'

Fix/linux package

See merge request o2oa/o2oa!422

jenkinsLinuxBuildfile

@@ -0,0 +1,57 @@
+pipeline {
+    agent {label '132'}
+    stages {
+		stage('getEnv') {
+            steps {
+                echo 'env.sshServer='+env.sshServer
+				echo 'env.preName='+env.preName
+				echo 'env.isallTag='+env.isallTag
+				echo 'env.qqGroupid='+env.qqGroupid
+				echo 'env.qqUrl='+env.qqUrl
+				sh  "cat /dev/null > gitTag.txt "
+                sh  "git describe --tags  >> gitTag.txt"
+                script {
+            	    json_file = "gitTag.txt"
+	                file_contents = readFile json_file
+
+	                if(file_contents.trim().indexOf("-")!=-1&&env.isallTag.trim().indexOf("true")==-1){
+						env.tag =file_contents.trim().substring(0,file_contents.trim().indexOf("-"))
+					}else{
+						env.tag =file_contents.trim();
+					}
+                }
+                echo 'env.tag='+env.tag
+            }
+        }
+
+        stage('initAndBuildAndSendzip') {
+            steps {
+				script {
+					env.buildResult='FAILURE'
+				}
+				catchError(buildResult: 'SUCCESS'){
+					sh 'npm install'
+					sh 'npm run build_ci'
+					sh 'ant -DVERSION='+env.tag+'   -DpreName='+env.preName
+					sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: ''+env.preName+'-'+env.tag+'*.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+					sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'download-pro.json,download_preview.jsonp')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+					script {
+						env.buildResult='SUCCESS'
+					}
+				}
+			}
+            
+        }
+		
+		stage('messageNotice') {
+		    steps{
+		        script {
+		            env.messageNotice="%e5%ae%8c%e6%88%90ssh%e6%9c%8d%e5%8a%a1%e5%99%a8%3d"+env.sshServer+",%e5%89%8d%e7%bc%80%3d"+env.preName+",tag%e7%89%88%e6%9c%ac%3d"+env.tag+"%e7%9a%84%e7%89%88%e6%9c%ac%e6%89%93%e5%8c%85%ef%bc%8c%e8%af%b7%e6%a0%b8%e5%ae%9e"+env.buildResult
+		        }
+		         echo 'env.messageNotice='+env.messageNotice
+		         httpRequest responseHandle: 'NONE', url: env.qqUrl+'/send_group_msg?group_id='+env.qqGroupid+'&message='+env.messageNotice, wrapAsMultipart: false
+            }
+		}
+
+	}
+}

package.json

@@ -27,22 +27,22 @@
                 "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
                 "clear": "gulp clear_build",
                 "clear_deploy": "gulp clear_deploy",
-                "build": "npm run clear && npm run build_parallel && npm run deploy && npm run typeInfor",
-                "build:win": "npm run clear && npm run build_parallel && npm run deploy:win && npm run typeInfor",
-                "build:linux": "npm run clear  && npm run build_parallel && npm run deploy:linux && npm run typeInfor",
-                "build:aix": "npm run clear &&  npm run build_parallel && npm run deploy:aix && npm run typeInfor",
-                "build:arm": "npm run clear &&  npm run build_parallel && npm run deploy:arm && npm run typeInfor",
-                "build:macos": "npm run clear  && npm run build_parallel && npm run deploy:macos && npm run typeInfor",
-                "build:risc": "npm run clear &&  npm run build_parallel && npm run deploy:risc && npm run typeInfor",
-                "build:rpi": "npm run clear &&  npm run build_parallel && npm run deploy:rpi && npm run typeInfor",
-                "build_ci": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor",
-                "build_ci:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor",
-                "build_ci:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor",
-                "build_ci:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix && npm run typeInfor",
-                "build_ci:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm && npm run typeInfor",
-                "build_ci:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos && npm run typeInfor",
-                "build_ci:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc && npm run typeInfor",
-                "build_ci:rpi": "npm run clear && npm run preperation:rpi && npm run build_parallel && npm run deploy:rpi && npm run typeInfor",
+                "build": "npm run clear && npm run build_parallel && npm run deploy ",
+                "build:win": "npm run clear && npm run build_parallel && npm run deploy:win ",
+                "build:linux": "npm run clear  && npm run build_parallel && npm run deploy:linux ",
+                "build:aix": "npm run clear &&  npm run build_parallel && npm run deploy:aix ",
+                "build:arm": "npm run clear &&  npm run build_parallel && npm run deploy:arm ",
+                "build:macos": "npm run clear  && npm run build_parallel && npm run deploy:macos ",
+                "build:risc": "npm run clear &&  npm run build_parallel && npm run deploy:risc ",
+                "build:rpi": "npm run clear &&  npm run build_parallel && npm run deploy:rpi",
+                "build_ci": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy",
+                "build_ci:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win ",
+                "build_ci:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux ",
+                "build_ci:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix",
+                "build_ci:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm",
+                "build_ci:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos",
+                "build_ci:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc ",
+                "build_ci:rpi": "npm run clear && npm run preperation:rpi && npm run build_parallel && npm run deploy:rpi",
                 "test": "type welcome"
         },
         "repository": {