Merge branch 'fix/jenkinsBuild' into 'develop'

Fix/jenkins build See merge request o2oa/o2oa!239

Merge branch 'fix/jenkinsBuild' into 'develop'
Fix/jenkins build See merge request o2oa/o2oa!239
7168b795 · o2null · 1f22999f · 3b93eb86 · 7168b795 · 7168b795
26 changed file
--- a/build.xml
+++ b/build.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." name="main" default="default">
 	<property name="VERSION" value="4.3.6" />
+	<property name="preName" value="o2server"/>
 	<property name="targetdir" value="target"/>
 	<target name="default" depends="md5code" />
 	<target name="md5code" depends="default_zip">
-		<checksum file="o2server-windows-${VERSION}.zip" property="build_win.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-windows-${VERSION}.zip" property="build_win.sha" algorithm="SHA-256" />
-		<length file="o2server-windows-${VERSION}.zip" property="length_win"/>
+		<length file="${preName}-windows-${VERSION}.zip" property="length_win"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
 			var length_win_bytes = project.getProperty("length_win");
 			var length_win_kbytes = Math.round((length_win_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			var length_win_mbytes = Math.round((length_win_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			project.setNewProperty("length_win_mb", length_win_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-linux-${VERSION}.zip" property="build_linux.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-linux-${VERSION}.zip" property="build_linux.sha" algorithm="SHA-256" />
-		<length file="o2server-linux-${VERSION}.zip" property="length_linux"/>
+		<length file="${preName}-linux-${VERSION}.zip" property="length_linux"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
 			var length_linux_bytes = project.getProperty("length_linux");
 			var length_linux_kbytes = Math.round((length_linux_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			var length_linux_mbytes = Math.round((length_linux_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			project.setNewProperty("length_linux_mb", length_linux_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-macos-${VERSION}.zip" property="build_macos.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-macos-${VERSION}.zip" property="build_macos.sha" algorithm="SHA-256" />
-		<length file="o2server-macos-${VERSION}.zip" property="length_macos"/>
+		<length file="${preName}-macos-${VERSION}.zip" property="length_macos"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
 			var length_macos_bytes = project.getProperty("length_macos");
 			var length_macos_kbytes = Math.round((length_macos_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			var length_macos_mbytes = Math.round((length_macos_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			project.setNewProperty("length_macos_mb", length_macos_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-aix-${VERSION}.zip" property="build_aix.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-aix-${VERSION}.zip" property="build_aix.sha" algorithm="SHA-256" />
-		<length file="o2server-aix-${VERSION}.zip" property="length_aix"/>
+		<length file="${preName}-aix-${VERSION}.zip" property="length_aix"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
 			var length_aix_bytes = project.getProperty("length_aix");
 			var length_aix_kbytes = Math.round((length_aix_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			var length_aix_mbytes = Math.round((length_aix_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			project.setNewProperty("length_aix_mb", length_aix_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-raspberrypi-${VERSION}.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-raspberrypi-${VERSION}.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
-		<length file="o2server-raspberrypi-${VERSION}.zip" property="length_raspberrypi"/>
+		<length file="${preName}-raspberrypi-${VERSION}.zip" property="length_raspberrypi"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
 			var length_raspberrypi_bytes = project.getProperty("length_raspberrypi");
 			var length_raspberrypi_kbytes = Math.round((length_raspberrypi_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			var length_raspberrypi_mbytes = Math.round((length_raspberrypi_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
 			project.setNewProperty("length_raspberrypi_mb", length_raspberrypi_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-neokylin-loongson-${VERSION}.zip" property="build_neokylin-loongson.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-risc-${VERSION}.zip" property="build_risc.sha" algorithm="SHA-256" />
-		<length file="o2server-neokylin-loongson-${VERSION}.zip" property="length_neokylin-loongson"/>
+		<length file="${preName}-risc-${VERSION}.zip" property="length_risc"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
-			var length_neokylin_loongson_bytes = project.getProperty("length_neokylin-loongson");
+			var length_risc_bytes = project.getProperty("length_risc");
-			var length_neokylin_loongson_kbytes = Math.round((length_neokylin_loongson_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_risc_kbytes = Math.round((length_risc_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			var length_neokylin_loongson_mbytes = Math.round((length_neokylin_loongson_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_risc_mbytes = Math.round((length_risc_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			project.setNewProperty("length_neokylin-loongson_mb", length_neokylin_loongson_mbytes);
+			project.setNewProperty("length_risc_mb", length_risc_mbytes);
 		]]>
 		</script>
-		<checksum file="o2server-kylinos-phytium-${VERSION}.zip" property="build_kylinos_phytium.sha" algorithm="SHA-256" />
+		<checksum file="${preName}-arm-${VERSION}.zip" property="build_arm.sha" algorithm="SHA-256" />
-		<length file="o2server-kylinos-phytium-${VERSION}.zip" property="length_kylinos_phytium"/>
+		<length file="${preName}-arm-${VERSION}.zip" property="length_arm"/>
 		<script language="javascript">
-		<![CDATA[
+			<![CDATA[
-			var length_kylinos_phytium_bytes = project.getProperty("length_kylinos_phytium");
+			var length_arm_bytes = project.getProperty("length_arm");
-			var length_kylinos_phytium_kbytes = Math.round((length_kylinos_phytium_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_arm_kbytes = Math.round((length_arm_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			var length_kylinos_phytium_mbytes = Math.round((length_kylinos_phytium_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_arm_mbytes = Math.round((length_arm_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			project.setNewProperty("length_kylinos_phytium_mb", length_kylinos_phytium_mbytes);
+			project.setNewProperty("length_arm_mb", length_arm_mbytes);
 		]]>
 		</script>
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
 		</tstamp>
 		<echo file="download_preview.jsonp">callback(
-		{
+			{
-		  "windows": {
+			"windows": {
 			"system": "windows",
 			"name": "o2server-windows-${VERSION}",
 			"fileName": "o2server-windows-${VERSION}.zip",
@@ -87,8 +88,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-windows-${VERSION}.zip",
 			"sha256": "${build_win.sha}"
-		  },
+			},
-		  "linux": {
+			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
 			"fileName": "o2server-linux-${VERSION}.zip",
@@ -96,8 +97,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-linux-${VERSION}.zip",
 			"sha256": "${build_linux.sha}"
-		  },
+			},
-		  "macos": {
+			"macos": {
 			"system": "macos",
 			"name": "o2server-macos-${VERSION}",
 			"fileName": "o2server-macos-${VERSION}.zip",
@@ -105,8 +106,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-macos-${VERSION}.zip",
 			"sha256": "${build_macos.sha}"
-		  },
+			},
-		  "aix": {
+			"aix": {
 			"system": "aix",
 			"name": "o2server-aix-${VERSION}",
 			"fileName": "o2server-aix-${VERSION}.zip",
@@ -114,8 +115,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-aix-${VERSION}.zip",
 			"sha256": "${build_aix.sha}"
-		  },
+			},
-		  "raspberrypi": {
+			"raspberrypi": {
 			"system": "raspberrypi",
 			"name": "o2server-raspberrypi-${VERSION}",
 			"fileName": "o2server-raspberrypi-${VERSION}.zip",
@@ -123,32 +124,32 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-raspberrypi-${VERSION}.zip",
 			"sha256": "${build_raspberrypi.sha}"
-		  },
+			},
-		  "neokylin_loongson": {
+			"risc": {
-			"system": "neokylin_loongson",
+			"system": "risc",
-			"name": "o2server-neokylin-loongson-${VERSION}",
+			"name": "o2server-risc-${VERSION}",
-			"fileName": "o2server-neokylin-loongson-${VERSION}.zip",
+			"fileName": "o2server-risc-${VERSION}.zip",
-			"fileSize": "${length_neokylin-loongson_mb}MB",
+			"fileSize": "${length_risc_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-neokylin-loongson-${VERSION}.zip",
+			"url": "/download/o2server-risc-${VERSION}.zip",
-			"sha256": "${build_neokylin-loongson.sha}"
+			"sha256": "${build_risc.sha}"
-		  },
+			},
-		  "kylinos_phytium": {
+			"arm": {
-			"system": "kylinos_phytium",
+			"system": "arm",
-			"name": "o2server-kylinos-phytium-${VERSION}",
+			"name": "o2server-arm-${VERSION}",
-			"fileName": "o2server-kylinos-phytium-${VERSION}.zip",
+			"fileName": "o2server-arm-${VERSION}.zip",
-			"fileSize": "${length_kylinos_phytium_mb}MB",
+			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-kylinos-phytium-${VERSION}.zip",
+			"url": "/download/o2server-arm-${VERSION}.zip",
-			"sha256": "${build_kylinos_phytium.sha}"
+			"sha256": "${build_arm.sha}"
-		  },
+			},
-		  "jvm_windows": {}
+			"jvm_windows": {}
-		}
+			}
-		)</echo>
+			)</echo>
 		<echo file="download-pro.json">{
-		  "title": "O2OA V${VERSION}",
+			"title": "O2OA V${VERSION}",
-		  "publishTime": "${TODAY}",
+			"publishTime": "${TODAY}",
-		  "windows": {
+			"windows": {
 			"system": "windows",
 			"name": "o2server-windows-${VERSION}",
 			"fileName": "o2server-windows-${VERSION}.zip",
@@ -156,8 +157,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-windows-${VERSION}.zip",
 			"sha256": "${build_win.sha}"
-		  },
+			},
-		  "linux": {
+			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
 			"fileName": "o2server-linux-${VERSION}.zip",
@@ -165,8 +166,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-linux-${VERSION}.zip",
 			"sha256": "${build_linux.sha}"
-		  },
+			},
-		  "macos": {
+			"macos": {
 			"system": "macos",
 			"name": "o2server-macos-${VERSION}",
 			"fileName": "o2server-macos-${VERSION}.zip",
@@ -174,8 +175,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-macos-${VERSION}.zip",
 			"sha256": "${build_macos.sha}"
-		  },
+			},
-		  "aix": {
+			"aix": {
 			"system": "aix",
 			"name": "o2server-aix-${VERSION}",
 			"fileName": "o2server-aix-${VERSION}.zip",
@@ -183,8 +184,8 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-aix-${VERSION}.zip",
 			"sha256": "${build_aix.sha}"
-		  },
+			},
-		  "raspberrypi": {
+			"raspberrypi": {
 			"system": "raspberrypi",
 			"name": "o2server-raspberrypi-${VERSION}",
 			"fileName": "o2server-raspberrypi-${VERSION}.zip",
@@ -192,34 +193,34 @@
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-raspberrypi-${VERSION}.zip",
 			"sha256": "${build_raspberrypi.sha}"
-		  },
+			},
-		  "neokylin_loongson": {
+			"risc": {
-			"system": "neokylin_loongson",
+			"system": "risc",
-			"name": "o2server-neokylin-loongson-${VERSION}",
+			"name": "o2server-risc-${VERSION}",
-			"fileName": "o2server-neokylin-loongson-${VERSION}.zip",
+			"fileName": "o2server-risc-${VERSION}.zip",
-			"fileSize": "${length_neokylin-loongson_mb}MB",
+			"fileSize": "${length_risc_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-neokylin-loongson-${VERSION}.zip",
+			"url": "/download/o2server-risc-${VERSION}.zip",
-			"sha256": "${build_neokylin-loongson.sha}"
+			"sha256": "${build_risc.sha}"
-		  },
+			},
-		  "kylinos_phytium": {
+			"arm": {
-			"system": "kylinos_phytium",
+			"system": "arm",
-			"name": "o2server-kylinos-phytium-${VERSION}",
+			"name": "o2server-arm-${VERSION}",
-			"fileName": "o2server-kylinos-phytium-${VERSION}.zip",
+			"fileName": "o2server-arm-${VERSION}.zip",
-			"fileSize": "${length_kylinos_phytium_mb}MB",
+			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-kylinos-phytium-${VERSION}.zip",
+			"url": "/download/o2server-arm-${VERSION}.zip",
-			"sha256": "${build_kylinos_phytium.sha}"
+			"sha256": "${build_arm.sha}"
-		  },
+			},
-		  "source":{
+			"source":{
 			"name":"o2oa-master",
 			"updateTime":"${TODAY}",
 			"fileSize":"990MB",
 			"url":"https://github.com/o2oa/o2oa"
-		  }
+			}
-		}</echo>
+			}</echo>
 	</target>
-	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspberrypi,zip_neokylin_loongson,zip_kylinos_phytium" />
+	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspberrypi,zip_risc,zip_arm" />
 	<target name="version_o2">
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
@@ -227,7 +228,7 @@
 		<echo file="${targetdir}/version.o2">{"version":"${VERSION}","date":"${TODAY}"}</echo>
 	</target>
 	<target name="zip_windows">
-		<zip encoding="utf-8" destfile="o2server-windows-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-windows-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -248,7 +249,7 @@
 		</zip>
 	</target>
 	<target name="zip_linux">
-		<zip encoding="utf-8" destfile="o2server-linux-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-linux-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -268,7 +269,7 @@
 		</zip>
 	</target>
 	<target name="zip_macos">
-		<zip encoding="utf-8" destfile="o2server-macos-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-macos-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -288,7 +289,7 @@
 		</zip>
 	</target>
 	<target name="zip_aix">
-		<zip encoding="utf-8" destfile="o2server-aix-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-aix-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -308,7 +309,7 @@
 		</zip>
 	</target>
 	<target name="zip_raspberrypi">
-		<zip encoding="utf-8" destfile="o2server-raspberrypi-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-raspberrypi-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -327,8 +328,8 @@
 			</zipfileset>
 		</zip>
 	</target>
-	<target name="zip_neokylin_loongson">
+	<target name="zip_risc">
-		<zip encoding="utf-8" destfile="o2server-neokylin-loongson-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-risc-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -339,16 +340,16 @@
 				<include name="index.html"/>
 				<include name="version.o2"/>
 				<include name="console.jar"/>
-				<include name="jvm/neokylin_loongson/"/>
+				<include name="jvm/risc/"/>
-				<include name="start_neokylin_loongson.sh"/>
+				<include name="start_risc.sh"/>
-				<include name="start_neokylin_loongson_debug.sh"/>
+				<include name="start_risc_debug.sh"/>
-				<include name="console_neokylin_loongson.sh"/>
+				<include name="console_risc.sh"/>
-				<include name="stop_neokylin_loongson.sh"/>
+				<include name="stop_risc.sh"/>
 			</zipfileset>
 		</zip>
 	</target>
-	<target name="zip_kylinos_phytium">
+	<target name="zip_arm">
-		<zip encoding="utf-8" destfile="o2server-kylinos-phytium-${VERSION}.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-arm-${VERSION}.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -359,11 +360,11 @@
 				<include name="index.html"/>
 				<include name="version.o2"/>
 				<include name="console.jar"/>
-				<include name="jvm/kylinos_phytium/"/>
+				<include name="jvm/arm/"/>
-				<include name="start_kylinos_phytium.sh"/>
+				<include name="start_arm.sh"/>
-				<include name="start_kylinos_phytium_debug.sh"/>
+				<include name="start_arm_debug.sh"/>
-				<include name="console_kylinos_phytium.sh"/>
+				<include name="console_arm.sh"/>
-				<include name="stop_kylinos_phytium.sh"/>
+				<include name="stop_arm.sh"/>
 			</zipfileset>
 		</zip>
 	</target>

--- a/gulpfile.js
+++ b/gulpfile.js
@@ -25,9 +25,9 @@ var jvmUrls = {
    "all": "/build/jvm.tar.gz",
    "linux": "/build/linux.tar.gz",
    "aix": "/build/aix.tar.gz",
-    "kylinos": "/build/kylinos_phytium.tar",
+    "arm": "/build/arm.tar.gz",
    "macos": "/build/macos.tar.gz",
-    "neokylin": "/build/neokylin_loongson.tar.gz",
+    "risc": "/build/risc.tar.gz",
    "raspberrypi": "/build/raspberrypi.tar.gz",
    "windows": "/build/windows.tar.gz"
 };
@@ -35,9 +35,9 @@ var scripts = {
    "all": ["o2server/*.sh", "o2server/*.jar", "o2server/*.html", "o2server/*.bat", "o2server/version.o2"],
    "linux": ["o2server/*linux*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
    "aix": ["o2server/*aix*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
-    "kylinos": ["o2server/*kylinos_phytium*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
+    "arm": ["o2server/*arm*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
    "macos": ["o2server/*macos*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
-    "neokylin": ["o2server/*neokylin_loongson*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
+    "risc": ["o2server/*risc*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
    "raspberrypi": ["o2server/*raspberrypi*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
    "windows": ["o2server/*windows*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"]
 };

--- a/jenkinsBuildfile
+++ b/jenkinsBuildfile
 pipeline {
    agent {label 'master' }
    stages {
+		stage('getParameter') {
+            steps {
+                echo 'env.sshServer='+env.sshServer
+				echo 'env.preName='+env.preName
+				echo 'env.isallTag='+env.isallTag
+            }
+        }
        stage('envtag') {
            steps {
                bat  "cd.> \"gitTag.txt\""
@@ -8,7 +15,8 @@ pipeline {
                script {
            	    json_file = "gitTag.txt"
 	                file_contents = readFile json_file
-	                if(file_contents.trim().indexOf("-")!=-1){
+	                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();
@@ -29,15 +37,14 @@ pipeline {
        }
 		stage('antzip') {
            steps {
-               bat 'ant -DVERSION='+env.tag
+               bat 'ant -DVERSION='+env.tag+'   -DpreName='+env.preName
            }
        }
        stage('sshZipSend') {
 			steps {
-				sshPublisher(publishers: [sshPublisherDesc(configName: '172.16.95.60', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'o2server-*'+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: '*'+env.tag+'.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
-				sshPublisher(publishers: [sshPublisherDesc(configName: '172.16.95.60', 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)])
+				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)])
 			}
 		}
-      }
+	}
 }
--- a/o2server/console_arm.sh
+++ b/o2server/console_arm.sh
+$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
--- a/o2server/console_kylinos_phytium.sh
+++ b/o2server/console_kylinos_phytium.sh
-$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
--- a/o2server/console_neokylin_loongson.sh
+++ b/o2server/console_neokylin_loongson.sh
-$(cd "$(dirname "$0")"; pwd)/jvm/neokylin_loongson/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
--- a/o2server/console_risc.sh
+++ b/o2server/console_risc.sh
+$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
--- a/o2server/start_aix.sh
+++ b/o2server/start_aix.sh
@@ -118,17 +118,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/

--- a/o2server/start_aix_debug.sh
+++ b/o2server/start_aix_debug.sh
@@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

--- a/o2server/start_kylinos_phytium.sh
+++ b/o2server/start_kylinos_phytium.sh
@@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/kylinos_phytium/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/arm/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_neokylin_loongson.sh
+++ b/o2server/start_neokylin_loongson.sh
@@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/neokylin_loongson/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/arm/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_linux.sh
+++ b/o2server/start_linux.sh
@@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

--- a/o2server/start_linux_debug.sh
+++ b/o2server/start_linux_debug.sh
@@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

--- a/o2server/start_macos.sh
+++ b/o2server/start_macos.sh
@@ -122,26 +122,26 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

--- a/o2server/start_macos_debug.sh
+++ b/o2server/start_macos_debug.sh
@@ -119,29 +119,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

--- a/o2server/start_raspberrypi.sh
+++ b/o2server/start_raspberrypi.sh
@@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		sudo rm -Rf ${current_dir}/local/update

--- a/o2server/start_raspberrypi_debug.sh
+++ b/o2server/start_raspberrypi_debug.sh
@@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		sudo rm -Rf ${current_dir}/local/update

--- a/o2server/start_kylinos_phytium_debug.sh
+++ b/o2server/start_kylinos_phytium_debug.sh
@@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/kylinos_phytium/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/risc/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_neokylin_loongson_debug.sh
+++ b/o2server/start_neokylin_loongson_debug.sh
@@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/start_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
+		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/start_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/stop_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+		if [ -f ${current_dir}/console_arm.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/neokylin_loongson/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/risc/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_windows.bat
+++ b/o2server/start_windows.bat
@@ -115,29 +115,29 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_raspberrypi.sh" (
 			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_neokylin_loongson.sh" (
+		if exist "%~dp0start_risc.sh" (
-			copy "%~dp0local\update\o2server\start_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0start_neokylin_loongson_debug.sh" (
+		if exist "%~dp0start_risc_debug.sh" (
-			copy "%~dp0local\update\o2server\start_neokylin_loongson_debug.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_neokylin_loongson.sh" (
+		if exist "%~dp0stop_risc.sh" (
-			copy "%~dp0local\update\o2server\stop_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0console_neokylin_loongson.sh" (
+		if exist "%~dp0console_risc.sh" (
-			copy "%~dp0local\update\o2server\console_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0start_kylinos_phytium.sh" (
+		if exist "%~dp0start_arm.sh" (
-			copy "%~dp0local\update\o2server\start_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0"
 		)
-		if exist "%~dp0start_kylinos_phytium_debug.sh" (
+		if exist "%~dp0start_arm_debug.sh" (
-			copy "%~dp0local\update\o2server\start_kylinos_phytium_debug.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_arm_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_kylinos_phytium.sh" (
+		if exist "%~dp0stop_arm.sh" (
-			copy "%~dp0local\update\o2server\stop_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\stop_arm.sh" "%~dp0"
 		)
-		if exist "%~dp0console_kylinos_phytium.sh" (
+		if exist "%~dp0console_arm.sh" (
-			copy "%~dp0local\update\o2server\console_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\console_arm.sh" "%~dp0"
 		)
 		copy "%~dp0local\update\o2server\version.o2" "%~dp0"
 		rmdir /S/Q "%~dp0local\update"

--- a/o2server/start_windows_debug.bat
+++ b/o2server/start_windows_debug.bat
@@ -115,29 +115,29 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_raspberrypi.sh" (
 			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
 		)
-		if exist "%~dp0start_neokylin_loongson.sh" (
+		if exist "%~dp0start_risc.sh" (
-			copy "%~dp0local\update\o2server\start_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0start_neokylin_loongson_debug.sh" (
+		if exist "%~dp0start_risc_debug.sh" (
-			copy "%~dp0local\update\o2server\start_neokylin_loongson_debug.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_neokylin_loongson.sh" (
+		if exist "%~dp0stop_risc.sh" (
-			copy "%~dp0local\update\o2server\stop_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0console_neokylin_loongson.sh" (
+		if exist "%~dp0console_risc.sh" (
-			copy "%~dp0local\update\o2server\console_neokylin_loongson.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0"
 		)
-		if exist "%~dp0start_kylinos_phytium.sh" (
+		if exist "%~dp0start_arm.sh" (
-			copy "%~dp0local\update\o2server\start_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0"
 		)
-		if exist "%~dp0start_kylinos_phytium_debug.sh" (
+		if exist "%~dp0start_arm_debug.sh" (
-			copy "%~dp0local\update\o2server\start_kylinos_phytium_debug.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\start_arm_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_kylinos_phytium.sh" (
+		if exist "%~dp0stop_arm.sh" (
-			copy "%~dp0local\update\o2server\stop_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\stop_arm.sh" "%~dp0"
 		)
-		if exist "%~dp0console_kylinos_phytium.sh" (
+		if exist "%~dp0console_arm.sh" (
-			copy "%~dp0local\update\o2server\console_kylinos_phytium.sh" "%~dp0"
+			copy "%~dp0local\update\o2server\console_arm.sh" "%~dp0"
 		)
 		copy "%~dp0local\update\o2server\version.o2" "%~dp0"
 		rmdir /S/Q "%~dp0local\update"

--- a/o2server/stop_arm.sh
+++ b/o2server/stop_arm.sh
+$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
--- a/o2server/stop_kylinos_phytium.sh
+++ b/o2server/stop_kylinos_phytium.sh
-$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
--- a/o2server/stop_neokylin_loongson.sh
+++ b/o2server/stop_neokylin_loongson.sh
-$(cd "$(dirname "$0")"; pwd)/jvm/neokylin_loongson/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
--- a/o2server/stop_risc.sh
+++ b/o2server/stop_risc.sh
+$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
--- a/package.json
+++ b/package.json
@@ -8,9 +8,9 @@
                "preperation:win": "gulp preperation --e windows",
                "preperation:linux": "gulp preperation --e linux",
                "preperation:aix": "gulp preperation --e aix",
-                "preperation:kylinos": "gulp preperation --e kylinos",
+                "preperation:arm": "gulp preperation --e arm",
                "preperation:macos": "gulp preperation --e macos",
-                "preperation:neokylin": "gulp preperation --e neokylin",
+                "preperation:risc": "gulp preperation --e risc",
                "preperation:rpi": "gulp preperation --e raspberrypi",
                "build_server": "gulp build_server",
                "build_server_script": "cd o2server && mvn clean && mvn install",
@@ -20,9 +20,9 @@
                "deploy:win": "gulp deploy --e windows",
                "deploy:linux": "gulp deploy --e linux",
                "deploy:aix": "gulp deploy --e aix",
-                "deploy:kylinos": "gulp deploy --e kylinos",
+                "deploy:arm": "gulp deploy --e arm",
                "deploy:macos": "gulp deploy --e macos",
-                "deploy:neokylin": "gulp deploy --e neokylin",
+                "deploy:risc": "gulp deploy --e risc",
                "deploy:rpi": "gulp deploy --e raspberrypi",
                "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
                "clear": "gulp clear_build",
@@ -30,17 +30,17 @@
                "build:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor",
                "build:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor",
                "build:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix && npm run typeInfor",
-                "build:kylinos": "npm run clear && npm run preperation:kylinos && npm run build_parallel && npm run deploy:kylinos && npm run typeInfor",
+                "build:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm && npm run typeInfor",
                "build:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos && npm run typeInfor",
-                "build:neokylin": "npm run clear && npm run preperation:neokylin && npm run build_parallel && npm run deploy:neokylin && npm run typeInfor",
+                "build:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc && npm run typeInfor",
                "build:rpi": "npm run clear && npm run preperation:rpi && 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:kylinos": "npm run clear && npm run preperation:kylinos && npm run build_parallel && npm run deploy:kylinos && 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:neokylin": "npm run clear && npm run preperation:neokylin && npm run build_parallel && npm run deploy:neokylin && 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",
               "test": "type welcome"
        },