Skip to content
GitLab
Commit 27e8d112 authored by huqi's avatar huqi
Browse files

Merge branch 'release' 

Resolve merge conflicts
parents ce30f676 921960b6
Hide whitespace changes
Inline Side-by-side
Showing
with 3691 additions and 192 deletions
+3691 -192
.gitignore
+ 8
- 0
View file @ 27e8d112
......@@ -151,4 +151,12 @@ typings/
#vscode
**/.factorypath
**/.vscode/
**/pmd.xml
**/cpd.xml
**/pmd.html
**/cpd.html
*.swp
#pom.xml.versionsBackup
*.versionsBackup
\ No newline at end of file
Jenkinsfile
+ 3
- 1
View file @ 27e8d112
......@@ -11,7 +11,7 @@ pipeline {
stage('init') {
steps {
sh 'npm install'
sh 'npm run clear'
sh 'npm run clear_deploy'
}
}
stage('dependency') {
......@@ -37,6 +37,8 @@ pipeline {
stage('deploy') {
steps {
sh 'npm run deploy:linux'
sh 'chmod 777 -R target/o2server/jvm'
sh 'chmod 777 -R target/o2server/commons'
sh 'chmod 777 target/o2server/*.sh'
}
}
......
Jenkinsfile_release 0 → 100644
+ 42
- 0
View file @ 27e8d112
pipeline {
agent {label 'release'}
stages {
stage('Stop Server') {
steps {
catchError(buildResult: 'SUCCESS') {
bat 'target/o2server/stop_windows.sh'
}
}
}
stage('init') {
steps {
bat 'npm install'
bat 'npm run clear_deploy'
}
}
stage('dependency') {
steps {
bat 'npm run preperation:win'
}
}
stage('build') {
parallel {
stage('build server') {
steps {
bat 'npm run build_server'
}
}
stage('build web') {
steps {
bat 'npm run build_web'
}
}
}
}
stage('deploy') {
steps {
bat 'npm run deploy:win'
}
}
}
}
build.xml 0 → 100644
+ 371
- 0
View file @ 27e8d112
<?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="${preName}-${VERSION}-windows.zip" property="build_win.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-windows.zip" property="length_win"/>
<script language="javascript">
<![CDATA[
var length_win_bytes = project.getProperty("length_win");
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="${preName}-${VERSION}-linux.zip" property="build_linux.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-linux.zip" property="length_linux"/>
<script language="javascript">
<![CDATA[
var length_linux_bytes = project.getProperty("length_linux");
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="${preName}-${VERSION}-macos.zip" property="build_macos.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-macos.zip" property="length_macos"/>
<script language="javascript">
<![CDATA[
var length_macos_bytes = project.getProperty("length_macos");
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="${preName}-${VERSION}-aix.zip" property="build_aix.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-aix.zip" property="length_aix"/>
<script language="javascript">
<![CDATA[
var length_aix_bytes = project.getProperty("length_aix");
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="${preName}-${VERSION}-raspberrypi.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-raspberrypi.zip" property="length_raspberrypi"/>
<script language="javascript">
<![CDATA[
var length_raspberrypi_bytes = project.getProperty("length_raspberrypi");
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="${preName}-${VERSION}-risc.zip" property="build_risc.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-risc.zip" property="length_risc"/>
<script language="javascript">
<![CDATA[
var length_risc_bytes = project.getProperty("length_risc");
var length_risc_kbytes = Math.round((length_risc_bytes / 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_risc_mb", length_risc_mbytes);
]]>
</script>
<checksum file="${preName}-${VERSION}-arm.zip" property="build_arm.sha" algorithm="SHA-256" />
<length file="${preName}-${VERSION}-arm.zip" property="length_arm"/>
<script language="javascript">
<![CDATA[
var length_arm_bytes = project.getProperty("length_arm");
var length_arm_kbytes = Math.round((length_arm_bytes / 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_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": {
"system": "windows",
"name": "o2server-windows-${VERSION}",
"fileName": "o2server-${VERSION}-windows.zip",
"fileSize": "${length_win_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-windows.zip",
"sha256": "${build_win.sha}"
},
"linux": {
"system": "linux",
"name": "o2server-linux-${VERSION}",
"fileName": "o2server-${VERSION}-linux.zip",
"fileSize": "${length_linux_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-linux.zip",
"sha256": "${build_linux.sha}"
},
"macos": {
"system": "macos",
"name": "o2server-macos-${VERSION}",
"fileName": "o2server-${VERSION}-macos.zip",
"fileSize": "${length_macos_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-macos.zip",
"sha256": "${build_macos.sha}"
},
"aix": {
"system": "aix",
"name": "o2server-aix-${VERSION}",
"fileName": "o2server-${VERSION}-aix.zip",
"fileSize": "${length_aix_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-aix.zip",
"sha256": "${build_aix.sha}"
},
"raspberrypi": {
"system": "raspberrypi",
"name": "o2server-${VERSION}-raspberrypi.zip",
"fileName": "o2server-${VERSION}-raspberrypi.zip",
"fileSize": "${length_raspberrypi_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-raspberrypi.zip",
"sha256": "${build_raspberrypi.sha}"
},
"risc": {
"system": "risc",
"name": "o2server-${VERSION}-risc",
"fileName": "o2server-${VERSION}-risc.zip",
"fileSize": "${length_risc_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-risc.zip",
"sha256": "${build_risc.sha}"
},
"arm": {
"system": "arm",
"name": "o2server-${VERSION}-arm",
"fileName": "o2server-${VERSION}-arm.zip",
"fileSize": "${length_arm_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-arm.zip",
"sha256": "${build_arm.sha}"
},
"jvm_windows": {}
}
)</echo>
<echo file="download-pro.json">{
"title": "O2OA V${VERSION}",
"publishTime": "${TODAY}",
"windows": {
"system": "windows",
"name": "o2server-windows-${VERSION}",
"fileName": "o2server-${VERSION}-windows.zip",
"fileSize": "${length_win_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-windows.zip",
"sha256": "${build_win.sha}"
},
"linux": {
"system": "linux",
"name": "o2server-linux-${VERSION}",
"fileName": "o2server-${VERSION}-linux.zip",
"fileSize": "${length_linux_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-linux.zip",
"sha256": "${build_linux.sha}"
},
"macos": {
"system": "macos",
"name": "o2server-macos-${VERSION}",
"fileName": "o2server-${VERSION}-macos.zip",
"fileSize": "${length_macos_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-macos.zip",
"sha256": "${build_macos.sha}"
},
"aix": {
"system": "aix",
"name": "o2server-aix-${VERSION}",
"fileName": "o2server-${VERSION}-aix.zip",
"fileSize": "${length_aix_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-aix.zip",
"sha256": "${build_aix.sha}"
},
"raspberrypi": {
"system": "raspberrypi",
"name": "o2server-${VERSION}-raspberrypi.zip",
"fileName": "o2server-${VERSION}-raspberrypi.zip",
"fileSize": "${length_raspberrypi_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-raspberrypi.zip",
"sha256": "${build_raspberrypi.sha}"
},
"risc": {
"system": "risc",
"name": "o2server-${VERSION}-risc",
"fileName": "o2server-${VERSION}-risc.zip",
"fileSize": "${length_risc_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-risc.zip",
"sha256": "${build_risc.sha}"
},
"arm": {
"system": "arm",
"name": "o2server-${VERSION}-arm",
"fileName": "o2server-${VERSION}-arm.zip",
"fileSize": "${length_arm_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-arm.zip",
"sha256": "${build_arm.sha}"
},
"source":{
"name":"o2oa-master",
"updateTime":"${TODAY}",
"fileSize":"990MB",
"url":"https://github.com/o2oa/o2oa"
}
}</echo>
</target>
<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"/>
</tstamp>
<echo file="${targetdir}/o2server/version.o2">{"version":"${VERSION}","date":"${TODAY}"}</echo>
</target>
<target name="zip_windows">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-windows.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/windows/"/>
<include name="service_windows.bat"/>
<include name="start_windows.bat"/>
<include name="start_windows_debug.bat"/>
<include name="console_windows.bat"/>
<include name="stop_windows.bat"/>
</zipfileset>
</zip>
</target>
<target name="zip_linux">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/linux/"/>
<include name="start_linux.sh"/>
<include name="start_linux_debug.sh"/>
<include name="console_linux.sh"/>
<include name="stop_linux.sh"/>
</zipfileset>
</zip>
</target>
<target name="zip_macos">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-macos.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/macos/"/>
<include name="start_macos.sh"/>
<include name="start_macos_debug.sh"/>
<include name="console_macos.sh"/>
<include name="stop_macos.sh"/>
</zipfileset>
</zip>
</target>
<target name="zip_aix">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-aix.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/aix/"/>
<include name="start_aix.sh"/>
<include name="start_aix_debug.sh"/>
<include name="console_aix.sh"/>
<include name="stop_aix.sh"/>
</zipfileset>
</zip>
</target>
<target name="zip_raspberrypi">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-raspberrypi.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/raspberrypi/"/>
<include name="start_raspberrypi.sh"/>
<include name="start_raspberrypi_debug.sh"/>
<include name="console_raspberrypi.sh"/>
<include name="stop_raspberrypi.sh"/>
</zipfileset>
</zip>
</target>
<target name="zip_risc">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-risc.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/risc/"/>
<include name="start_risc.sh"/>
<include name="start_risc_debug.sh"/>
<include name="console_risc.sh"/>
<include name="stop_risc.sh"/>
</zipfileset>
</zip>
</target>
<target name="zip_arm">
<zip encoding="utf-8" destfile="${preName}-${VERSION}-arm.zip" update="false">
<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
<include name="commons/"/>
<include name="configSample/"/>
<include name="localSample/"/>
<include name="servers/"/>
<include name="store/"/>
<include name="console.jar"/>
<include name="index.html"/>
<include name="version.o2"/>
<include name="console.jar"/>
<include name="jvm/arm/"/>
<include name="start_arm.sh"/>
<include name="start_arm_debug.sh"/>
<include name="console_arm.sh"/>
<include name="stop_arm.sh"/>
</zipfileset>
</zip>
</target>
</project>
\ No newline at end of file
gulpfile.js
+ 176
- 23
View file @ 27e8d112
......@@ -15,29 +15,46 @@ var gulp = require('gulp'),
http = require('http');
var fg = require('fast-glob');
var logger = require('gulp-logger');
var assetRev = require('gulp-tm-asset-rev');
const os = require('os');
//var downloadHost = "download.o2oa.net";
var downloadHost = "release.o2oa.net";
var protocol = "http";
var commonUrl = "/build/commons.tar.gz";
// var downloadHost = "release.o2oa.net";
// var protocol = "http";
// var commonUrl = "/build/commons.tar.gz";
// var jvmUrls = {
// "all": "/build/jvm.tar.gz",
// "linux": "/build/linux.tar.gz",
// "aix": "/build/aix.tar.gz",
// "arm": "/build/arm.tar.gz",
// "macos": "/build/macos.tar.gz",
// "risc": "/build/risc.tar.gz",
// "raspberrypi": "/build/raspberrypi.tar.gz",
// "windows": "/build/windows.tar.gz"
// };
var downloadHost = "git.o2oa.net";
var protocol = "https";
var commonUrl = "/o2oa/evn-o2server-commons/-/archive/master/evn-o2server-commons-master.tar.gz?path=commons";
var jvmUrls = {
"all": "/build/jvm.tar.gz",
"linux": "/build/linux.tar.gz",
"aix": "/build/aix.tar.gz",
"kylinos": "/build/kylinos_phytium.tar",
"macos": "/build/macos.tar.gz",
"neokylin": "/build/neokylin_loongson.tar.gz",
"raspberrypi": "/build/raspberrypi.tar.gz",
"windows": "/build/windows.tar.gz"
"all": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm",
"linux": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/linux",
"aix": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/aix",
"arm": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/arm",
"macos": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/macos",
"risc": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/risc",
"raspberrypi": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/raspberrypi",
"windows": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/windows"
};
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"]
};
......@@ -83,7 +100,7 @@ function ProgressBar(description, bar_length){
};
}
function downloadFile(path, filename, headcb, progresscb, cb){
function downloadFile_progress(path, filename, headcb, progresscb, cb){
var dest = `o2server/${filename}`;
// fs.exists(dest, function(exists) {
......@@ -128,7 +145,7 @@ function downloadFile(path, filename, headcb, progresscb, cb){
});
request.get(options).pipe(str).pipe(stream);
} else {
gutil.log(gutil.colors.red("download error"), ":", gutil.colors.red(filename), "statusCode:"+response.statusCode);
gutil.log(gutil.colors.red("download error"), ":", gutil.colors.red(filename), "statusCode:"+res.statusCode);
}
})
req.on('error', (e) => {
......@@ -138,6 +155,61 @@ function downloadFile(path, filename, headcb, progresscb, cb){
// }
//});
}
function downloadFile(path, filename, headcb, progresscb, cb){
var dest = `o2server/${filename}`;
// fs.exists(dest, function(exists) {
// if (exists){
// headcb(1);
// progresscb({transferred:1});
// cb();
// }else{
let stream = fs.createWriteStream(dest);
var options = { url:protocol+"://"+downloadHost+path };
var fileHost = downloadHost;
var filePath = path;
stream.on('finish', () => {
//gutil.log("download", ":", gutil.colors.green(filename), " completed!");
cb();
});
stream.on('error', (err) => {
gutil.log(gutil.colors.red("download error"), ":", gutil.colors.red(filename), err);
});
// var req = http.request({
// host:fileHost,
// path:filePath,
// method:'HEAD'
// },function (res){
// if (res.statusCode == 200) {
// res.setEncoding(null);
// var time = 0;
// var l = res.headers['content-length'];
// var str = progress({
// length: l,
// time: 100 /* ms */
// });
// headcb(l);
//
// str.on('progress', function(progress) {
// if (pb){
// progresscb(progress);
// pb.render({ completed: currentLength, total: totalLength, time: time+=100 });
// }
//
// });
request.get(options).pipe(stream);
// } else {
// gutil.log(gutil.colors.red("download error"), ":", gutil.colors.red(filename), "statusCode:"+res.statusCode);
// }
// })
// req.on('error', (e) => {
// gutil.log(gutil.colors.red("download error"), ":", gutil.colors.red(filename), e);
// });
// req.end();
// }
//});
}
var commonsLength = 0;
var jvmLenght = 0;
......@@ -164,7 +236,7 @@ function download_commons_and_jvm(cb){
var downloader = new Promise((resolve, reject) => {
var commonLoaded = false;
var jvmLoaded = false;
downloadFile(commonUrl, "commons.tar.gz", (length)=>{
downloadFile(commonUrl, "commons_git.tar.gz", (length)=>{
commonsLength = +length;
initProgress();
}, (progress)=>{
......@@ -177,7 +249,7 @@ function download_commons_and_jvm(cb){
// var jvmName = jvmUrl.substr(jvmUrl.lastIndexOf("/"+1, jvmUrl.length));
// console.log(jvmName);
// console.log(jvmUrl);
downloadFile(jvmUrl, "jvm.tar.gz", (length)=>{
downloadFile(jvmUrl, "jvm_git.tar.gz", (length)=>{
jvmLenght = +length;
initProgress();
}, (progress)=>{
......@@ -205,7 +277,7 @@ function decompress_commons_and_jvm(cb){
var commonUnziped = false;
var jvmUnziped = false;
targz.decompress({
src: 'o2server/commons.tar.gz',
src: 'o2server/commons_git.tar.gz',
dest: 'o2server',
tar: {map: function(header){
count++;
......@@ -222,7 +294,7 @@ function decompress_commons_and_jvm(cb){
}
});
targz.decompress({
src: 'o2server/jvm.tar.gz',
src: 'o2server/jvm_git.tar.gz',
dest: 'o2server',
tar: {map: function(header){
count++;
......@@ -245,6 +317,41 @@ function decompress_commons_and_jvm(cb){
cb();
});
}
function move_commons(){
console.log(`---------------------------------------------------------------------
. move commons files to o2server/commons ...
---------------------------------------------------------------------`);
return gulp.src("o2server/evn-o2server-commons-master-commons/commons/**/*")
.pipe(gulp.dest("o2server/commons/"));
}
function move_jvm(){
console.log(`---------------------------------------------------------------------
. move jvm files to o2server/jvm ...
---------------------------------------------------------------------`);
var path;
if (options.ev=="all"){
path = "o2server/evn-o2server-jvm-master-jvm/jvm/**/*"
}else{
path = "o2server/evn-o2server-jvm-master-jvm-"+options.ev+"/jvm/**/*"
}
return gulp.src(path)
.pipe(gulp.dest("o2server/jvm/"));
}
function clear_commons_git(cb){
var dest = ['o2server/evn-o2server-commons-master-commons/', 'o2server/commons_git.tar.gz'];
del(dest, { force: true });
cb();
}
function clear_jvm_git(cb){
var path;
if (options.ev=="all"){
path = "o2server/evn-o2server-jvm-master-jvm/"
}else{
path = "o2server/evn-o2server-jvm-master-jvm-"+options.ev+"/"
}
del([path, 'o2server/jvm_git.tar.gz'], { force: true });
cb();
}
function build_web_minimize(cb) {
console.log(`---------------------------------------------------------------------
......@@ -294,6 +401,28 @@ function build_web_move() {
}
exports.build_web_move = build_web_move;
function build_web_v_html() {
var src = 'o2web/source/x_desktop/*.html';
var dest = 'target/o2server/servers/webServer/x_desktop/';
return gulp.src(src)
.pipe(assetRev())
.pipe(gulp.dest(dest))
.pipe(gutil.noop());
}
function build_web_v_o2() {
var src = 'o2web/source/o2_core/o2.js';
var dest = 'target/o2server/servers/webServer/o2_core/';
return gulp.src(src)
.pipe(assetRev())
.pipe(gulp.dest(dest))
.pipe(uglify())
.pipe(rename({ extname: '.min.js' }))
.pipe(gulp.dest(dest))
.pipe(gutil.noop());
}
function clear_build(cb){
console.log(`---------------------------------------------------------------------
. clear old build ...
......@@ -302,7 +431,18 @@ function clear_build(cb){
del(dest, { force: true });
cb();
}
function clear_deploy(cb){
console.log(`---------------------------------------------------------------------
. clear old deploy ...
---------------------------------------------------------------------`);
var dest = ["target/o2server/store/", "target/o2server/commons/", "target/o2server/jvm/", "target/o2server/configSample/", "target/o2server/localSample/", "target/o2server/servers/"];
dest = dest.concat(["target/o2server/*.sh", "target/o2server/*.jar", "target/o2server/*.html", "target/o2server/*.bat", "target/o2server/version.o2"]);
del(dest, { force: true });
cb();
}
exports.clear_build = clear_build;
exports.clear_deploy = clear_deploy;
function deploy_server(){
......@@ -329,7 +469,7 @@ function deploy_server(){
}));
}
exports.preperation = gulp.series(download_commons_and_jvm, decompress_commons_and_jvm);
exports.preperation = gulp.series(download_commons_and_jvm, decompress_commons_and_jvm, move_commons, move_jvm, clear_commons_git, clear_jvm_git);
var shell = require('gulp-shell')
exports.build_server = function(){
......@@ -338,5 +478,18 @@ exports.build_server = function(){
---------------------------------------------------------------------`);
return (shell.task('npm run build_server_script'))();
};
exports.build_web = gulp.series(build_web_minimize, build_web_move);
exports.deploy = deploy_server;
function chmod_jvm(){
return (shell.task('chmod 777 -R target/o2server/jvm'))();
}
function chmod_commons(){
return (shell.task('chmod 777 -R target/o2server/commons'))();
}
function chmod_sh(){
return (shell.task('chmod 777 target/o2server/*.sh'))();
}
exports.build_web = gulp.series(build_web_minimize, build_web_move, build_web_v_html, build_web_v_o2);
if (os.platform().indexOf("win")==-1){
exports.deploy = gulp.series(deploy_server, chmod_jvm, chmod_commons, chmod_sh);
}else{
exports.deploy = gulp.series(deploy_server);
}
\ No newline at end of file
jenkinsBuildfile 0 → 100644
+ 57
- 0
View file @ 27e8d112
pipeline {
agent {label 'master' }
stages {
stage('getEnv') {
steps {
echo 'env.sshServer='+env.sshServer
echo 'env.preName='+env.preName
echo 'env.isallTag='+env.isallTag
echo 'env.qqGroupid='+env.qqGroupid
echo 'env.qqUrl='+env.qqUrl
bat "cd.> \"gitTag.txt\""
bat "git describe --tags >>\"gitTag.txt\""
script {
json_file = "gitTag.txt"
file_contents = readFile json_file
if(file_contents.trim().indexOf("-")!=-1&&env.isallTag.trim().indexOf("true")==-1){
env.tag =file_contents.trim().substring(0,file_contents.trim().indexOf("-"))
}else{
env.tag =file_contents.trim();
}
}
echo 'env.tag='+env.tag
}
}
stage('initAndBuildAndSendzip') {
steps {
script {
env.buildResult='FAILURE'
}
catchError(buildResult: 'SUCCESS'){
bat 'npm install'
bat 'npm run build_ci'
bat 'ant -DVERSION='+env.tag+' -DpreName='+env.preName
sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: ''+env.preName+'-'+env.tag+'*.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'download-pro.json,download_preview.jsonp')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
script {
env.buildResult='SUCCESS'
}
}
}
}
stage('messageNotice') {
steps{
script {
env.messageNotice="%e5%ae%8c%e6%88%90ssh%e6%9c%8d%e5%8a%a1%e5%99%a8%3d"+env.sshServer+",%e5%89%8d%e7%bc%80%3d"+env.preName+",tag%e7%89%88%e6%9c%ac%3d"+env.tag+"%e7%9a%84%e7%89%88%e6%9c%ac%e6%89%93%e5%8c%85%ef%bc%8c%e8%af%b7%e6%a0%b8%e5%ae%9e"+env.buildResult
}
echo 'env.messageNotice='+env.messageNotice
httpRequest responseHandle: 'NONE', url: env.qqUrl+'/send_group_msg?group_id='+env.qqGroupid+'&message='+env.messageNotice, wrapAsMultipart: false
}
}
}
}
jenkinsLinuxBuildfile 0 → 100644
+ 57
- 0
View file @ 27e8d112
pipeline {
agent {label '132'}
stages {
stage('getEnv') {
steps {
echo 'env.sshServer='+env.sshServer
echo 'env.preName='+env.preName
echo 'env.isallTag='+env.isallTag
echo 'env.qqGroupid='+env.qqGroupid
echo 'env.qqUrl='+env.qqUrl
sh "cat /dev/null > gitTag.txt "
sh "git describe --tags >> gitTag.txt"
script {
json_file = "gitTag.txt"
file_contents = readFile json_file
if(file_contents.trim().indexOf("-")!=-1&&env.isallTag.trim().indexOf("true")==-1){
env.tag =file_contents.trim().substring(0,file_contents.trim().indexOf("-"))
}else{
env.tag =file_contents.trim();
}
}
echo 'env.tag='+env.tag
}
}
stage('initAndBuildAndSendzip') {
steps {
script {
env.buildResult='FAILURE'
}
catchError(buildResult: 'SUCCESS'){
sh 'npm install'
sh 'npm run build_ci'
sh 'ant -DVERSION='+env.tag+' -DpreName='+env.preName
sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: ''+env.preName+'-'+env.tag+'*.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'download-pro.json,download_preview.jsonp')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
script {
env.buildResult='SUCCESS'
}
}
}
}
stage('messageNotice') {
steps{
script {
env.messageNotice="%e5%ae%8c%e6%88%90ssh%e6%9c%8d%e5%8a%a1%e5%99%a8%3d"+env.sshServer+",%e5%89%8d%e7%bc%80%3d"+env.preName+",tag%e7%89%88%e6%9c%ac%3d"+env.tag+"%e7%9a%84%e7%89%88%e6%9c%ac%e6%89%93%e5%8c%85%ef%bc%8c%e8%af%b7%e6%a0%b8%e5%ae%9e"+env.buildResult
}
echo 'env.messageNotice='+env.messageNotice
httpRequest responseHandle: 'NONE', url: env.qqUrl+'/send_group_msg?group_id='+env.qqGroupid+'&message='+env.messageNotice, wrapAsMultipart: false
}
}
}
}
o2server/configSample/processPlatform.json
+ 2
- 2
View file @ 27e8d112
......@@ -31,12 +31,12 @@
"thresholdDays": 730.0,
"###enable": "是否启用###",
"###cron": "定时cron表达式###",
"###thresholdDays": "期限,已完成工作结束间隔指定时间进行merge,默认两年后进行merge###"
"###thresholdDays": "期限,已完成工作结束间隔指定时间进行combine,默认两年后进行combine###"
},
"deleteDraft": {
"enable": false,
"cron": "0 0 20 * * ?",
"thresholdMinutes": 14400.0,
"thresholdMinutes": 86400.0,
"###enable": "是否启用###",
"###cron": "定时cron表达式###",
"###thresholdMinutes": "设定阈值,如果超过这个时间认为是可以删除的草稿,默认为10天.###"
......
o2server/configSample/qiyeweixin.json
+ 7
- 1
View file @ 27e8d112
......@@ -13,6 +13,9 @@
"messageRedirectPortal": "",
"messageEnable": false,
"scanLoginEnable": false,
"attendanceSyncEnable": false,
"attendanceSyncAgentId": "",
"attendanceSyncSecret": "",
"###enable": "是否启用.###",
"###syncCron": "拉入同步cron,默认每10分钟同步一次.###",
"###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
......@@ -26,5 +29,8 @@
"###workUrl": "企业微信消息打开工作的url地址，如：http://dev.o2oa.net/x_desktop/###",
"###messageRedirectPortal": "企业微信消息处理完成后跳转到特定的门户页面的Id###",
"###messageEnable": "推送消息到企业微信###",
"###scanLoginEnable": "企业微信扫码登录###"
"###scanLoginEnable": "企业微信扫码登录###",
"###attendanceSyncEnable": "是否启用考勤信息###",
"###attendanceSyncAgentId": "企业微信考勤打卡应用id###",
"###attendanceSyncSecret": "企业微信考勤打卡应用secret###"
}
\ No newline at end of file
o2server/console_arm.sh 0 → 100644
+ 1
- 0
View file @ 27e8d112
$(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
o2server/console_kylinos_phytium.sh deleted 100644 → 0
+ 0
- 1
View file @ ce30f676
$(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
o2server/console_neokylin_loongson.sh deleted 100644 → 0
+ 0
- 1
View file @ ce30f676
$(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
o2server/console_risc.sh 0 → 100644
+ 1
- 0
View file @ 27e8d112
$(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
o2server/create.sql 0 → 100644
+ 2819
- 0
View file @ 27e8d112
This source diff could not be displayed because it is too large. You can view the blob instead.
o2server/pom.xml
+ 72
- 88
View file @ 27e8d112
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>4.0.5</version>
<version>5</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8
</project.reporting.outputEncoding>
</properties>
<modules>
<module>x_base_core_project</module>
<!-- 顺序 -->
......@@ -27,7 +34,6 @@
<module>x_portal_core_entity</module>
<module>x_processplatform_core_entity</module>
<module>x_teamwork_core_entity</module>
<!--module>x_workschedu_core_entity</module -->
<module>x_program_center_core_entity</module>
<module>x_organization_core_express</module>
<module>x_query_core_express</module>
......@@ -59,17 +65,9 @@
<module>x_query_assemble_surface</module>
<module>x_query_service_processing</module>
<module>x_teamwork_assemble_control</module>
<!-- module>x_workschedu_assemble_control</module -->
<module>x_program_center</module>
<module>x_console</module>
</modules>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8
</project.reporting.outputEncoding>
</properties>
<dependencies>
<dependency>
<groupId>javax</groupId>
......@@ -335,38 +333,6 @@
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.6.0,)
</versionRange>
<goals>
<goal>java</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
......@@ -399,16 +365,43 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
<excludes>
<exclude>META-INF</exclude>
<exclude>META-INF/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>1.8</targetJdk>
<failOnViolation>false</failOnViolation>
<outputDirectory>${basedir}</outputDirectory>
</configuration>
<executions>
<execution>
<id>pmd-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</build>
<dependencyManagement>
......@@ -702,20 +695,6 @@
<groupId>org.neuroph</groupId>
<artifactId>neuroph-core</artifactId>
<version>2.96</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
<groupId>javax.visrec</groupId>
<artifactId>visrec-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -755,142 +734,147 @@
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_base_core_project</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_attendance_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_bbs_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_calendar_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_express</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_component_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_file_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_general_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_hotpic_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_meeting_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_message_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_mind_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_okr_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_jpush_core_entity</artifactId>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_express</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_portal_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_express</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_express</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_report_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_assemble_control</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_teamwork_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_workschedu_core_entity</artifactId>
<version>${project.version}</version>
<version>5</version>
</dependency>
</dependencies>
</dependencyManagement>
......
o2server/start_aix.sh
+ 8
- 8
View file @ 27e8d112
......@@ -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
cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
if [ -f ${current_dir}/start_risc.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc.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}/
if [ -f ${current_dir}/start_risc_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc_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}/
if [ -f ${current_dir}/stop_risc.sh ]; then
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}/
if [ -f ${current_dir}/console_risc.sh ]; then
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}/
......
o2server/start_aix_debug.sh
+ 16
- 16
View file @ 27e8d112
......@@ -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
cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
if [ -f ${current_dir}/start_risc.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc.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}/
if [ -f ${current_dir}/start_risc_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc_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}/
if [ -f ${current_dir}/stop_risc.sh ]; then
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}/
if [ -f ${current_dir}/console_risc.sh ]; then
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}/
if [ -f ${current_dir}/start_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm.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}/
if [ -f ${current_dir}/start_arm_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm_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}/
if [ -f ${current_dir}/stop_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_arm.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}/
if [ -f ${current_dir}/console_arm.sh ]; then
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
......
o2server/start_kylinos_phytium.sh → o2server/start_arm.sh
+ 17
- 17
View file @ 27e8d112
......@@ -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
cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
if [ -f ${current_dir}/start_risc.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc.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}/
if [ -f ${current_dir}/start_risc_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc_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}/
if [ -f ${current_dir}/stop_risc.sh ]; then
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}/
if [ -f ${current_dir}/console_risc.sh ]; then
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}/
if [ -f ${current_dir}/start_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm.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}/
if [ -f ${current_dir}/start_arm_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm_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}/
if [ -f ${current_dir}/stop_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_arm.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}/
if [ -f ${current_dir}/console_arm.sh ]; then
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
\ No newline at end of file
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
o2server/start_neokylin_loongson.sh → o2server/start_arm_debug.sh
+ 17
- 17
View file @ 27e8d112
......@@ -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
cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
if [ -f ${current_dir}/start_risc.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc.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}/
if [ -f ${current_dir}/start_risc_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc_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}/
if [ -f ${current_dir}/stop_risc.sh ]; then
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}/
if [ -f ${current_dir}/console_risc.sh ]; then
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}/
if [ -f ${current_dir}/start_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm.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}/
if [ -f ${current_dir}/start_arm_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm_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}/
if [ -f ${current_dir}/stop_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_arm.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}/
if [ -f ${current_dir}/console_arm.sh ]; then
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
\ No newline at end of file
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
o2server/start_linux.sh
+ 17
- 17
View file @ 27e8d112
......@@ -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
cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/
if [ -f ${current_dir}/start_risc.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc.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}/
if [ -f ${current_dir}/start_risc_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_risc_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}/
if [ -f ${current_dir}/stop_risc.sh ]; then
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}/
if [ -f ${current_dir}/console_risc.sh ]; then
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}/
if [ -f ${current_dir}/start_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm.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}/
if [ -f ${current_dir}/start_arm_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm_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}/
if [ -f ${current_dir}/stop_arm.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_arm.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}/
if [ -f ${current_dir}/console_arm.sh ]; then
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/linux/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx5g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
setsid ${current_dir}/jvm/linux/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx5g -Duser.timezone=GMT+08 -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全