打包命名顺序，增加打包结束QQ群提醒

build.xml

@@ -5,8 +5,8 @@
 	<property name="targetdir" value="target"/>
 	<target name="default" depends="md5code" />
 	<target name="md5code" depends="default_zip">
-		<checksum file="${preName}-windows-${VERSION}.zip" property="build_win.sha" algorithm="SHA-256" />
-		<length file="${preName}-windows-${VERSION}.zip" property="length_win"/>
+		<checksum file="${preName}-${VERSION}-windows.zip" property="build_win.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-windows.zip" property="length_win"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_win_bytes = project.getProperty("length_win");
@@ -15,8 +15,8 @@
 			project.setNewProperty("length_win_mb", length_win_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-linux-${VERSION}.zip" property="build_linux.sha" algorithm="SHA-256" />
-		<length file="${preName}-linux-${VERSION}.zip" property="length_linux"/>
+		<checksum file="${preName}-${VERSION}-linux.zip" property="build_linux.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-linux.zip" property="length_linux"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_linux_bytes = project.getProperty("length_linux");
@@ -25,8 +25,8 @@
 			project.setNewProperty("length_linux_mb", length_linux_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-macos-${VERSION}.zip" property="build_macos.sha" algorithm="SHA-256" />
-		<length file="${preName}-macos-${VERSION}.zip" property="length_macos"/>
+		<checksum file="${preName}-${VERSION}-macos.zip" property="build_macos.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-macos.zip" property="length_macos"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_macos_bytes = project.getProperty("length_macos");
@@ -35,8 +35,8 @@
 			project.setNewProperty("length_macos_mb", length_macos_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-aix-${VERSION}.zip" property="build_aix.sha" algorithm="SHA-256" />
-		<length file="${preName}-aix-${VERSION}.zip" property="length_aix"/>
+		<checksum file="${preName}-${VERSION}-aix.zip" property="build_aix.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-aix.zip" property="length_aix"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_aix_bytes = project.getProperty("length_aix");
@@ -45,8 +45,8 @@
 			project.setNewProperty("length_aix_mb", length_aix_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-raspberrypi-${VERSION}.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
-		<length file="${preName}-raspberrypi-${VERSION}.zip" property="length_raspberrypi"/>
+		<checksum file="${preName}-${VERSION}-raspberrypi.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-raspberrypi.zip" property="length_raspberrypi"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_raspberrypi_bytes = project.getProperty("length_raspberrypi");
@@ -55,8 +55,8 @@
 			project.setNewProperty("length_raspberrypi_mb", length_raspberrypi_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-risc-${VERSION}.zip" property="build_risc.sha" algorithm="SHA-256" />
-		<length file="${preName}-risc-${VERSION}.zip" property="length_risc"/>
+		<checksum file="${preName}-${VERSION}-risc.zip" property="build_risc.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-risc.zip" property="length_risc"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_risc_bytes = project.getProperty("length_risc");
@@ -65,8 +65,8 @@
 			project.setNewProperty("length_risc_mb", length_risc_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-arm-${VERSION}.zip" property="build_arm.sha" algorithm="SHA-256" />
-		<length file="${preName}-arm-${VERSION}.zip" property="length_arm"/>
+		<checksum file="${preName}-${VERSION}-arm.zip" property="build_arm.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-arm.zip" property="length_arm"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_arm_bytes = project.getProperty("length_arm");
@@ -83,64 +83,64 @@
 			"windows": {
 			"system": "windows",
 			"name": "o2server-windows-${VERSION}",
-			"fileName": "o2server-windows-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-windows.zip",
 			"fileSize": "${length_win_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-windows-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-windows.zip",
 			"sha256": "${build_win.sha}"
 			},
 			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
-			"fileName": "o2server-linux-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-linux.zip",
 			"fileSize": "${length_linux_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-linux-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-linux.zip",
 			"sha256": "${build_linux.sha}"
 			},
 			"macos": {
 			"system": "macos",
 			"name": "o2server-macos-${VERSION}",
-			"fileName": "o2server-macos-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-macos.zip",
 			"fileSize": "${length_macos_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-macos-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-macos.zip",
 			"sha256": "${build_macos.sha}"
 			},
 			"aix": {
 			"system": "aix",
 			"name": "o2server-aix-${VERSION}",
-			"fileName": "o2server-aix-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-aix.zip",
 			"fileSize": "${length_aix_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-aix-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-aix.zip",
 			"sha256": "${build_aix.sha}"
 			},
 			"raspberrypi": {
 			"system": "raspberrypi",
-			"name": "o2server-raspberrypi-${VERSION}",
-			"fileName": "o2server-raspberrypi-${VERSION}.zip",
+			"name": "o2server-${VERSION}-raspberrypi.zip",
+			"fileName": "o2server-${VERSION}-raspberrypi.zip",
 			"fileSize": "${length_raspberrypi_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-raspberrypi-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-raspberrypi.zip",
 			"sha256": "${build_raspberrypi.sha}"
 			},
 			"risc": {
 			"system": "risc",
-			"name": "o2server-risc-${VERSION}",
-			"fileName": "o2server-risc-${VERSION}.zip",
+			"name": "o2server-${VERSION}-risc",
+			"fileName": "o2server-${VERSION}-risc.zip",
 			"fileSize": "${length_risc_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-risc-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-risc.zip",
 			"sha256": "${build_risc.sha}"
 			},
 			"arm": {
 			"system": "arm",
-			"name": "o2server-arm-${VERSION}",
-			"fileName": "o2server-arm-${VERSION}.zip",
+			"name": "o2server-${VERSION}-arm",
+			"fileName": "o2server-${VERSION}-arm.zip",
 			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-arm-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-arm.zip",
 			"sha256": "${build_arm.sha}"
 			},
 			"jvm_windows": {}
@@ -152,64 +152,64 @@
 			"windows": {
 			"system": "windows",
 			"name": "o2server-windows-${VERSION}",
-			"fileName": "o2server-windows-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-windows.zip",
 			"fileSize": "${length_win_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-windows-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-windows.zip",
 			"sha256": "${build_win.sha}"
 			},
 			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
-			"fileName": "o2server-linux-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-linux.zip",
 			"fileSize": "${length_linux_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-linux-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-linux.zip",
 			"sha256": "${build_linux.sha}"
 			},
 			"macos": {
 			"system": "macos",
 			"name": "o2server-macos-${VERSION}",
-			"fileName": "o2server-macos-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-macos.zip",
 			"fileSize": "${length_macos_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-macos-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-macos.zip",
 			"sha256": "${build_macos.sha}"
 			},
 			"aix": {
 			"system": "aix",
 			"name": "o2server-aix-${VERSION}",
-			"fileName": "o2server-aix-${VERSION}.zip",
+			"fileName": "o2server-${VERSION}-aix.zip",
 			"fileSize": "${length_aix_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-aix-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-aix.zip",
 			"sha256": "${build_aix.sha}"
 			},
 			"raspberrypi": {
 			"system": "raspberrypi",
-			"name": "o2server-raspberrypi-${VERSION}",
-			"fileName": "o2server-raspberrypi-${VERSION}.zip",
+			"name": "o2server-${VERSION}-raspberrypi.zip",
+			"fileName": "o2server-${VERSION}-raspberrypi.zip",
 			"fileSize": "${length_raspberrypi_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-raspberrypi-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-raspberrypi.zip",
 			"sha256": "${build_raspberrypi.sha}"
 			},
 			"risc": {
 			"system": "risc",
-			"name": "o2server-risc-${VERSION}",
-			"fileName": "o2server-risc-${VERSION}.zip",
+			"name": "o2server-${VERSION}-risc",
+			"fileName": "o2server-${VERSION}-risc.zip",
 			"fileSize": "${length_risc_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-risc-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-risc.zip",
 			"sha256": "${build_risc.sha}"
 			},
 			"arm": {
 			"system": "arm",
-			"name": "o2server-arm-${VERSION}",
-			"fileName": "o2server-arm-${VERSION}.zip",
+			"name": "o2server-${VERSION}-arm",
+			"fileName": "o2server-${VERSION}-arm.zip",
 			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-arm-${VERSION}.zip",
+			"url": "/download/o2server-${VERSION}-arm.zip",
 			"sha256": "${build_arm.sha}"
 			},
 			"source":{
@@ -228,7 +228,7 @@
 		<echo file="${targetdir}/version.o2">{"version":"${VERSION}","date":"${TODAY}"}</echo>
 	</target>
 	<target name="zip_windows">
-		<zip encoding="utf-8" destfile="${preName}-windows-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-windows.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -249,7 +249,7 @@
 		</zip>
 	</target>
 	<target name="zip_linux">
-		<zip encoding="utf-8" destfile="${preName}-linux-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -269,7 +269,7 @@
 		</zip>
 	</target>
 	<target name="zip_macos">
-		<zip encoding="utf-8" destfile="${preName}-macos-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-macos.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -289,7 +289,7 @@
 		</zip>
 	</target>
 	<target name="zip_aix">
-		<zip encoding="utf-8" destfile="${preName}-aix-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-aix.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -309,7 +309,7 @@
 		</zip>
 	</target>
 	<target name="zip_raspberrypi">
-		<zip encoding="utf-8" destfile="${preName}-raspberrypi-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-raspberrypi.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -329,7 +329,7 @@
 		</zip>
 	</target>
 	<target name="zip_risc">
-		<zip encoding="utf-8" destfile="${preName}-risc-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-risc.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -345,11 +345,11 @@
 				<include name="start_risc_debug.sh"/>
 				<include name="console_risc.sh"/>
 				<include name="stop_risc.sh"/>
-			</zipfileset>
+			</zipfileset>build.xml
 		</zip>
 	</target>
 	<target name="zip_arm">
-		<zip encoding="utf-8" destfile="${preName}-arm-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-arm.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>

jenkinsBuildfile

@@ -6,6 +6,8 @@ pipeline {
                 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
             }
         }
         stage('envtag') {
@@ -35,16 +37,22 @@ pipeline {
                 bat 'npm run build_ci'
             }
         }
-		stage('antzip') {
+		stage('antAndSendzip') {
             steps {
                bat '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.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)])
             }
         }
-        stage('sshZipSend') {
-			steps {
-				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.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)])
-			}
+		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"
+		        }
+		         echo 'env.messageNotice='+env.messageNotice
+		         httpRequest responseHandle: 'NONE', url: env.qqUrl+'/send_group_msg?group_id='+env.qqGroupid+'&message='+env.messageNotice, wrapAsMultipart: false
+            }
 		}
+
 	}
 }