Browse Source

更新脚本

roo00 6 years ago
parent
commit
7e710f9db1

+ 1 - 1
o2server/.gitignore

@@ -22,5 +22,5 @@ console.jar
 /jvm/
 *.zip
 *.swap
-/version.o2
+version.o2
 

+ 0 - 132
o2server/build.xml

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="default">
-	<basename property="project" file="${basedir}" />
-	<mkdir dir="${basedir}/commons/ext" />
-	<mkdir dir="${basedir}/store/jars" />
-	<path id="project.classpath">
-		<fileset dir="${basedir}/commons/ext">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${basedir}/store/jars">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	<tstamp>
-		<format property="VERSION" pattern="yyyyMMddHHmmss" locale="zh-cn" />
-	</tstamp>
-
-	<target name="createConfigSample">
-		<delete dir="${basedir}/configSample" />
-		<mkdir dir="${basedir}/configSample" />
-		<java classname="com.x.base.core.project.build.CreateConfigSample" fork="true">
-			<sysproperty key="file.encoding" value="utf-8" />
-			<classpath refid="project.classpath" />
-			<arg value="${basedir}" />
-		</java>
-	</target>
-
-	<target name="createLocalSample">
-		<delete dir="${basedir}/localSample" />
-		<mkdir dir="${basedir}/localSample" />
-		<java classname="com.x.base.core.project.build.CreateLocalSample" fork="true">
-			<sysproperty key="file.encoding" value="utf-8" />
-			<classpath refid="project.classpath" />
-			<arg value="${basedir}" />
-		</java>
-	</target>
-
-	<target name="createManifestCfg">
-		<java classname="com.x.base.core.project.build.CreateManifestCfg" fork="true">
-			<sysproperty key="file.encoding" value="utf-8" />
-			<classpath refid="project.classpath" />
-			<arg value="${basedir}" />
-		</java>
-	</target>
-
-	<target name="default" depends="createConfigSample,createLocalSample,createManifestCfg">
-		<delete dir="target" />
-		<mkdir dir="target/o2server" />
-		<mkdir dir="target/o2server/commons" />
-		<mkdir dir="target/o2server/store" />
-		<mkdir dir="target/o2server/logs" />
-		<mkdir dir="target/o2server/config" />
-		<mkdir dir="target/o2server/local" />
-		<mkdir dir="target/o2server/configSample" />
-		<mkdir dir="target/o2server/localSample" />
-		<mkdir dir="target/o2server/servers/webServer" />
-		<mkdir dir="target/o2server/servers/centerServer/webapps" />
-		<mkdir dir="target/o2server/servers/centerServer/work" />
-		<mkdir dir="target/o2server/servers/applicationServer/webapps" />
-		<mkdir dir="target/o2server/servers/applicationServer/work" />
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install" />
-		</exec>
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install -g gulp-cli" />
-		</exec>
-		<exec vmlauncher="false" executable="gulp" />
-		<copy todir="target/o2server/commons/">
-			<fileset dir="./commons/" />
-		</copy>
-		<copy todir="target/o2server/configSample">
-			<fileset dir="./configSample">
-				<exclude name="**/.gitignore" />
-				<exclude name="**/.classpath" />
-				<exclude name="**/.project" />
-				<exclude name="**/.settings/" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server/localSample">
-			<fileset dir="./localSample">
-				<exclude name="**/.gitignore" />
-				<exclude name="**/.classpath" />
-				<exclude name="**/.project" />
-				<exclude name="**/.settings/" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server/store/">
-			<fileset dir="./store/">
-				<exclude name="**/.settings/" />
-				<exclude name="**/.gitignore" />
-				<exclude name="**/.classpath" />
-				<exclude name="**/.project" />
-				<exclude name="x_report_assemble_control.war" />
-				<exclude name="jars/x_report_core_entity.jar" />
-				<exclude name="x_strategydeploy_assemble_control.war" />
-				<exclude name="jars/x_strategydeploy_core_entity.jar" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server/jvm/">
-			<fileset dir="./jvm/">
-				<exclude name="**/.gitignore" />
-				<exclude name="**/.settings/" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server">
-			<fileset dir="./">
-				<include name="start_windows.bat" />
-				<include name="start_linux.sh" />
-				<include name="start_aix.sh" />
-				<include name="start_macos.sh" />
-				<include name="stop_windows.bat" />
-				<include name="stop_linux.sh" />
-				<include name="stop_aix.sh" />
-				<include name="stop_macos.sh" />
-				<include name="console_windows.bat" />
-				<include name="console_linux.sh" />
-				<include name="console_aix.sh" />
-				<include name="console_macos.sh" />
-				<include name="console.jar" />
-				<include name="index.html" />
-				<exclude name="**/.gitignore" />
-				<exclude name="**/.classpath" />
-				<exclude name="**/.project" />
-				<exclude name="**/.settings/" />
-			</fileset>
-		</copy>
-		<echo message="${VERSION}" file="target/o2server/version.o2" append="false" />
-		<zip encoding="utf-8" destfile="target/o2server_${VERSION}.zip" update="false">
-			<zipfileset dir="target/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-	</target>
-</project>

+ 0 - 98
o2server/build_common.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<basename property="project" file="${basedir}" />
-	<dirname property="o2oa.dir" file="../" />
-	<mkdir dir="${o2oa.dir}/o2server/commons/ext" />
-	<mkdir dir="${o2oa.dir}/o2server/store/jars" />
-	
-	<echo message="project = ${basedir}"/>
-	<echo message="o2oa.dir = ${o2oa.dir}"/>
-	<echo message="classpath1 = ${o2oa.dir}/o2server/commons/ext"/>
-	<echo message="classpath2 = ${o2oa.dir}/o2server/store/jars"/>
-	<echo message="classpath2 = ${o2oa.dir}/o2server/custom/jars"/>
-	
-	<path id="project.classpath">
-		<fileset dir="${o2oa.dir}/o2server/commons/ext">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${o2oa.dir}/o2server/store/jars">
-			<include name="*.jar" />
-		</fileset>
-		<pathelement location="${basedir}/target/classes" />
-	</path>
-
-	<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-		<classpath refid="project.classpath" />
-	</taskdef>
-	<target name="metamodel">
-		<delete>
-			<fileset dir="${basedir}/src/main/java" includes="**/entity/**/*_.java" />
-		</delete>
-		<javac srcdir="${basedir}/src/main/java" destdir="${basedir}/src/main/java" includes="**/entity/**,**/entity" debug="true" debuglevel="source,lines,vars" includeantruntime="true" encoding="utf-8" target="1.8" source="1.8" fork="true">
-			<classpath refid="project.classpath">
-			</classpath>
-			<compilerarg value="-Aopenjpa.metamodel=true" />
-			<compilerarg value="-Aopenjpa.log=TRACE" />
-		</javac>
-		<delete>
-			<fileset dir="${basedir}/src/main/java" includes="**/*.class" />
-		</delete>
-		<echo message="metamodel complete." />
-	</target>
-	
-	<target name="describe">
-		<echo>describe project:${project}</echo>
-		<echo>fileset=${o2oa.dir}/o2server/commons/ext</echo>
-		<echo>fileset=${o2oa.dir}/o2server/store/jars</echo>
-		<mkdir dir="${basedir}/src/main/webapp/describe" />
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}/src/main/webapp/describe" includes="**/*" />
-		</delete>
-		<java classname="com.x.base.core.project.annotation.Describe" fork="true">
-			<sysproperty key="file.encoding" value="utf-8" />
-			<arg value="${basedir}/src/main/webapp/describe" />
-			<arg value="${project}" />
-			<classpath>
-				<pathelement location="${basedir}/target/classes" />
-				<pathelement location="${basedir}/src/main/resources" />				
-				<fileset dir="${o2oa.dir}/o2server/commons/ext">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${o2oa.dir}/o2server/store/jars">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${o2oa.dir}/o2server/custom/jars">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-		<copy todir="${basedir}/src/main/webapp/describe/sources">
-			<fileset dir="${basedir}/src/main/java">
-				<include name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="createEnhancePersistenceXml">
-		<mkdir dir="${basedir}/src/main/resources/META-INF" />
-		<java classname="com.x.base.core.entity.tools.EnhancePersistenceXmlWriter" fork="true">
-			<sysproperty key="file.encoding" value="utf-8" />
-			<classpath>
-				<pathelement path="${basedir}/target/classes" />
-				<pathelement path="${basedir}/src/main/java" />
-				<fileset dir="${o2oa.dir}/o2server/commons/ext">
-					<include name="*.jar" />
-				</fileset>
-				<fileset dir="${o2oa.dir}/o2server/store/jars">
-					<include name="x_base_core_project.jar" />
-					<exclude name="${project}.jar" />
-				</fileset>
-			</classpath>
-			<arg value="{
-					path:'${basedir}'
-				}" />
-		</java>
-		<echo>${project} create persistence xml: ${basedir}/src/main/resources/META-INF/persistence.xml</echo>
-	</target>
-
-</project>

BIN
o2server/command.swap


+ 1 - 0
o2server/console_kylinos_phytium.sh

@@ -0,0 +1 @@
+$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow

BIN
o2server/custom/jars/x_jpush_core_entity.jar


BIN
o2server/custom/x_jpush_assemble_control.war


+ 0 - 45
o2server/package-lock.json

@@ -1,45 +0,0 @@
-{
-  "name": "o2oa_web",
-  "version": "1.1.7",
-  "description": "a javascript library",
-  "main": "o2.js",
-  "scripts": {
-    "test": "gulp",
-    "report-coverage": "codecov"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/huqi1980/o2oa_client_web.git"
-  },
-  "keywords": [
-    "oa",
-    "office",
-    "workflow",
-    "process",
-    "cms",
-    "bpm",
-    "portal"
-  ],
-  "author": "Tommy-O2OA",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/huqi1980/o2oa_client_web/issues"
-  },
-  "homepage": "https://github.com/huqi1980/o2oa_client_web#readme",
-  "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-tm-asset-rev": "0.0.16",
-    "gulp-changed": "^3.2.0",
-    "gulp-deleted": "0.0.2",
-    "gulp-ftp": "^1.1.0",
-    "gulp-if": "^2.0.2",
-    "gulp-rename": "^1.4.0",
-    "gulp-sftp": "^0.1.5",
-    "gulp-tm-uglify": "^3.0.1",
-    "karma": "^3.1.4",
-    "karma-jasmine": "^2.0.1",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "merge-stream": "^1.0.1",
-    "minimist": "^1.2.0"
-  }
-}

+ 0 - 45
o2server/package.json

@@ -1,45 +0,0 @@
-{
-  "name": "o2oa_web",
-  "version": "1.1.7",
-  "description": "a javascript library",
-  "main": "o2.js",
-  "scripts": {
-    "test": "gulp",
-    "report-coverage": "codecov"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/huqi1980/o2oa_client_web.git"
-  },
-  "keywords": [
-    "oa",
-    "office",
-    "workflow",
-    "process",
-    "cms",
-    "bpm",
-    "portal"
-  ],
-  "author": "Tommy-O2OA",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/huqi1980/o2oa_client_web/issues"
-  },
-  "homepage": "https://github.com/huqi1980/o2oa_client_web#readme",
-  "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-tm-asset-rev": "0.0.16",
-    "gulp-changed": "^3.2.0",
-    "gulp-deleted": "0.0.2",
-    "gulp-ftp": "^1.1.0",
-    "gulp-if": "^2.0.2",
-    "gulp-rename": "^1.4.0",
-    "gulp-sftp": "^0.1.5",
-    "gulp-tm-uglify": "^3.0.1",
-    "karma": "^3.1.4",
-    "karma-jasmine": "^2.0.1",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "merge-stream": "^1.0.1",
-    "minimist": "^1.2.0"
-  }
-}

+ 4 - 1
o2server/pom.xml

@@ -357,7 +357,6 @@
 					<version>3.8.1</version>
 				</plugin>
 			</plugins>
-
 		</pluginManagement>
 		<plugins>
 			<plugin>
@@ -851,6 +850,10 @@
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
+		<repository>
+			<id>nexus-aliyun</id>
+			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
+		</repository>
 		<repository>
 			<id>mvnrepository.com</id>
 			<url>https://mvnrepository.com/repos</url>

+ 20 - 8
o2server/start_aix.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_aix_debug.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 149 - 0
o2server/start_kylinos_phytium.sh

@@ -0,0 +1,149 @@
+current_dir=$(cd "$(dirname "$0")"; pwd);
+if [ -d ${current_dir}/local/update ]; then
+	if [ ! -d ${current_dir}/commons ]; then
+	mkdir ${current_dir}/commons
+	fi
+	if [ ! -d ${current_dir}/config ]; then
+		mkdir ${current_dir}/config
+	fi
+	if [ ! -d ${current_dir}/config/sample ]; then
+		mkdir ${current_dir}/config/sample
+	fi
+	if [ ! -d ${current_dir}/local ]; then
+		mkdir ${current_dir}/local
+	fi
+	if [ ! -d ${current_dir}/local ]; then
+		mkdir ${current_dir}/local
+	fi
+	if [ ! -d ${current_dir}/local/sample ]; then
+		mkdir ${current_dir}/local/sample
+	fi
+	if [ ! -d ${current_dir}/jvm ]; then
+		mkdir ${current_dir}/jvm
+	fi
+	if [ ! -d ${current_dir}/servers ]; then
+		mkdir ${current_dir}/servers
+	fi
+	if [ ! -d ${current_dir}/store ]; then
+		mkdir ${current_dir}/store
+	fi
+	if [ -f ${current_dir}/local/update/o2server/version.o2 ]; then
+		if [ -d ${current_dir}/local/update/o2server/configSample ]; then
+			cp -Rf ${current_dir}/local/update/o2server/configSample ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/localSample ]; then
+			cp -Rf ${current_dir}/local/update/o2server/localSample ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/commons ]; then
+			cp -Rf ${current_dir}/local/update/o2server/commons ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/jvm ]; then
+			cp -Rf ${current_dir}/local/update/o2server/jvm ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/servers ]; then
+			cp -Rf ${current_dir}/local/update/o2server/servers ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/store ]; then
+			cp -Rf ${current_dir}/local/update/o2server/store ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/console.jar ]; then
+			cp -f ${current_dir}/local/update/o2server/console.jar ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/index.html ]; then
+			cp -f ${current_dir}/local/update/o2server/index.html ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/src.zip ]; then
+			cp -f ${current_dir}/local/update/o2server/src.zip ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/start_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_windows_debug.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/start_windows_debug.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/console_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/service_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/service_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_linux_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_linux_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_macos_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_macos_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_aix_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_aix_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.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
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.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

+ 149 - 0
o2server/start_kylinos_phytium_debug.sh

@@ -0,0 +1,149 @@
+current_dir=$(cd "$(dirname "$0")"; pwd);
+if [ -d ${current_dir}/local/update ]; then
+	if [ ! -d ${current_dir}/commons ]; then
+	mkdir ${current_dir}/commons
+	fi
+	if [ ! -d ${current_dir}/config ]; then
+		mkdir ${current_dir}/config
+	fi
+	if [ ! -d ${current_dir}/config/sample ]; then
+		mkdir ${current_dir}/config/sample
+	fi
+	if [ ! -d ${current_dir}/local ]; then
+		mkdir ${current_dir}/local
+	fi
+	if [ ! -d ${current_dir}/local ]; then
+		mkdir ${current_dir}/local
+	fi
+	if [ ! -d ${current_dir}/local/sample ]; then
+		mkdir ${current_dir}/local/sample
+	fi
+	if [ ! -d ${current_dir}/jvm ]; then
+		mkdir ${current_dir}/jvm
+	fi
+	if [ ! -d ${current_dir}/servers ]; then
+		mkdir ${current_dir}/servers
+	fi
+	if [ ! -d ${current_dir}/store ]; then
+		mkdir ${current_dir}/store
+	fi
+	if [ -f ${current_dir}/local/update/o2server/version.o2 ]; then
+		if [ -d ${current_dir}/local/update/o2server/configSample ]; then
+			cp -Rf ${current_dir}/local/update/o2server/configSample ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/localSample ]; then
+			cp -Rf ${current_dir}/local/update/o2server/localSample ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/commons ]; then
+			cp -Rf ${current_dir}/local/update/o2server/commons ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/jvm ]; then
+			cp -Rf ${current_dir}/local/update/o2server/jvm ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/servers ]; then
+			cp -Rf ${current_dir}/local/update/o2server/servers ${current_dir}/
+		fi
+		if [ -d ${current_dir}/local/update/o2server/store ]; then
+			cp -Rf ${current_dir}/local/update/o2server/store ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/console.jar ]; then
+			cp -f ${current_dir}/local/update/o2server/console.jar ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/index.html ]; then
+			cp -f ${current_dir}/local/update/o2server/index.html ${current_dir}/
+		fi
+		if [ -f ${current_dir}/local/update/o2server/src.zip ]; then
+			cp -f ${current_dir}/local/update/o2server/src.zip ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/start_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_windows_debug.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/start_windows_debug.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/console_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/service_windows.bat ]; then
+			cp -f ${current_dir}/local/update/o2server/service_windows.bat ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_linux_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_linux_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_linux.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_linux.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_macos_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_macos_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_macos.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_macos.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_aix_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_aix_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_aix.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.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
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.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

+ 20 - 8
o2server/start_linux.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_linux_debug.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_macos.sh

@@ -107,6 +107,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -119,17 +131,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_macos_debug.sh

@@ -107,6 +107,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -119,17 +131,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_neokylin_loongson.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_neokylin_loongson_debug.sh

@@ -106,6 +106,18 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
 			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
@@ -118,17 +130,17 @@ if [ -d ${current_dir}/local/update ]; then
 		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_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

+ 24 - 12
o2server/start_raspberrypi.sh

@@ -106,29 +106,41 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			sudo cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
-			sudo cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		sudo rm -Rf ${current_dir}/local/update

+ 24 - 12
o2server/start_raspberrypi_debug.sh

@@ -106,29 +106,41 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			sudo cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
+		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		fi
+		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		fi
+		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
-			sudo cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
+			cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			sudo cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
 		fi
 		sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		sudo rm -Rf ${current_dir}/local/update

+ 20 - 8
o2server/start_windows_debug.bat

@@ -103,6 +103,18 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_aix.sh" (
 			copy "%~dp0local\update\o2server\console_aix.sh" "%~dp0"
 		)
+		if exist "%~dp0start_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\start_raspberrypi.sh" "%~dp0"
+		)
+		if exist "%~dp0start_raspberrypi_debug.sh" (
+			copy "%~dp0local\update\o2server\start_raspberrypi_debug.sh" "%~dp0"
+		)
+		if exist "%~dp0stop_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\stop_raspberrypi.sh" "%~dp0"
+		)
+		if exist "%~dp0console_raspberrypi.sh" (
+			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
+		)
 		if exist "%~dp0start_neokylin_loongson.sh" (
 			copy "%~dp0local\update\o2server\start_neokylin_loongson.sh" "%~dp0"
 		)
@@ -115,17 +127,17 @@ if exist "%~dp0local\update" (
 		if exist "%~dp0console_neokylin_loongson.sh" (
 			copy "%~dp0local\update\o2server\console_neokylin_loongson.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0start_kylinos_phytium.sh" (
+			copy "%~dp0local\update\o2server\start_kylinos_phytium.sh" "%~dp0"
 		)
-		if exist "%~dp0start_raspberrypi_debug.sh" (
-			copy "%~dp0local\update\o2server\start_raspberrypi_debug.sh" "%~dp0"
+		if exist "%~dp0start_kylinos_phytium_debug.sh" (
+			copy "%~dp0local\update\o2server\start_kylinos_phytium_debug.sh" "%~dp0"
 		)
-		if exist "%~dp0stop_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\stop_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0stop_kylinos_phytium.sh" (
+			copy "%~dp0local\update\o2server\stop_kylinos_phytium.sh" "%~dp0"
 		)
-		if exist "%~dp0console_raspberrypi.sh" (
-			copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0"
+		if exist "%~dp0console_kylinos_phytium.sh" (
+			copy "%~dp0local\update\o2server\console_kylinos_phytium.sh" "%~dp0"
 		)
 		copy "%~dp0local\update\o2server\version.o2" "%~dp0"
 		rmdir /S/Q "%~dp0local\update"

+ 1 - 0
o2server/stop_kylinos_phytium.sh

@@ -0,0 +1 @@
+$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit

+ 1 - 1
o2server/version.o2

@@ -1 +1 @@
-20181113210103
+2020-01-07 17:38:31

+ 23 - 0
o2server/x_console/pom.xml

@@ -75,6 +75,29 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>packageO2server</id>
+						<phase>install</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+						<configuration>
+							<addOutputToClasspath>true</addOutputToClasspath>
+							<includePluginDependencies>true</includePluginDependencies>
+							<includeProjectDependencies>true</includeProjectDependencies>
+							<mainClass>com.x.base.core.project.build.PackageO2server
+							</mainClass>
+							<arguments>
+								<argument>${basedir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

+ 4 - 0
o2server/x_jpush_core_entity/.gitignore

@@ -0,0 +1,4 @@
+.classpath
+.project
+/.settings/
+/target/