Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 3fdb3845 编写于 作者: O o2null
浏览文件
操作

脚本更新

上级 ff25717e
隐藏空白更改
内联 并排
Showing with 430 addition and 118 deletion
o2server/pom.xml
浏览文件 @ 3fdb3845
......@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8
</project.reporting.outputEncoding>
......@@ -251,7 +251,7 @@
<artifactId>jersey-media-multipart</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
<dependency>
......@@ -288,13 +288,13 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm7-shaded</artifactId>
<artifactId>xbean-asm8-shaded</artifactId>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
</dependency>
<!-- dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId>
<!-- dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId>
</dependency -->
<dependency>
<groupId>com.github.neuroph</groupId>
......@@ -316,10 +316,8 @@
<groupId>net.sourceforge.tess4j</groupId>
<artifactId>tess4j</artifactId>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
<!-- dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId>
</dependency -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
......@@ -386,6 +384,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<target>11</target>
<compilerArgs>
<arg>--add-exports</arg>
<arg>jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED</arg>
<arg>--add-exports</arg>
<arg>jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</pluginManagement>
......@@ -678,6 +685,12 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>1.22</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
......@@ -735,9 +748,9 @@
<version>2.27</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
......@@ -781,15 +794,15 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm7-shaded</artifactId>
<version>4.12</version>
<artifactId>xbean-asm8-shaded</artifactId>
<version>4.17</version>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
<version>1.11.1</version>
</dependency>
<!--dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId>
<!--dependency> <groupId>javax.visrec</groupId> <artifactId>visrec-api</artifactId>
<version>20200316</version> </dependency -->
<dependency>
<groupId>com.github.neuroph</groupId>
......@@ -826,11 +839,8 @@
<artifactId>simplecaptcha</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.2.0</version>
</dependency>
<!-- dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId>
<version>3.2.0</version> </dependency -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
......@@ -869,142 +879,142 @@
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_base_core_project</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_attendance_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_bbs_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_calendar_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_cms_core_express</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_component_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_file_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_general_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_hotpic_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_meeting_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_message_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_mind_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_jpush_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_organization_core_express</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_portal_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_processplatform_core_express</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_query_core_express</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_report_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_strategydeploy_assemble_control</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_program_center_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_teamwork_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>o2oa</groupId>
<artifactId>x_workschedu_core_entity</artifactId>
<version>5.4</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>net.lingala.zip4j</groupId>
......
o2server/start_linux_java11.sh 0 → 100755
浏览文件 @ 3fdb3845
#!/bin/bash
# Copyright (c) http://www.o2oa.net/
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}/configSample ]; then
mkdir ${current_dir}/configSample
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}/localSample ]; then
mkdir ${current_dir}/localSample
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
updateDirs = "configSample localSample commons jvm servers store"
for d in $updateDirs; do
if [ -d ${current_dir}/local/update/o2server/$d ]; then
cp -Rf ${current_dir}/local/update/o2server/$d ${current_dir}/
fi
done
updateFiles = "console.jar index.html src.zip"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
if [ -f ${current_dir}/local/update/o2server/start_windows.bat ]; then
updateFiles = "start_windows.bat start_windows_debug.bat stop_windows.bat console_windows.bat service_windows.bat start_windows_java11.bat start_windows_debug_java11.bat stop_windows_java11.bat console_windows.bat service_windows_java11.bat"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_linux.sh ]; then
updateFiles = "start_linux.sh start_linux_debug.sh stop_linux.sh console_linux.sh start_linux_java11.sh start_linux_debug_java11.sh stop_linux_java11.sh console_linux_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_macos.sh ]; then
updateFiles = "start_macos.sh start_macos_debug.sh stop_macos.sh console_macos.sh start_macos_java11.sh start_macos_debug_java11.sh stop_macos_java11.sh console_macos_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_aix.sh ]; then
updateFiles = "start_aix.sh start_aix_debug.sh stop_aix.sh console_aix.sh start_aix_java11.sh start_aix_debug_java11.sh stop_aix_java11.sh console_aix_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_raspi.sh ]; then
updateFiles = "start_raspi.sh start_raspi_debug.sh stop_raspi.sh console_raspi.sh start_raspi_java11.sh start_raspi_debug_java11.sh stop_raspi_java11.sh console_raspi_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_mips.sh ]; then
updateFiles = "start_mips.sh start_mips_debug.sh stop_mips.sh console_mips.sh start_mips_java11.sh start_mips_debug_java11.sh stop_mips_java11.sh console_mips_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
if [ -f ${current_dir}/local/update/o2server/start_arm.sh ]; then
updateFiles = "start_arm.sh start_mips_arm.sh stop_arm.sh console_arm.sh start_arm_java11.sh start_mips_arm_java11.sh stop_arm_java11.sh console_arm_java11.sh"
for f in $updateFiles; do
if [ -f ${current_dir}/local/update/o2server/$f ]; then
cp -f ${current_dir}/local/update/o2server/$f ${current_dir}/
fi
done
fi
cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/linux_java11/bin/java -Dnashorn.args=--no-deprecation-warning --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime=ALL-UNNAMED --add-exports jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays=ALL-UNNAMED -javaagent:${current_dir}/console.jar=java11 -server -Djava.awt.headless=true -Xms2g -Duser.timezone=GMT+08 -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_linux_test.sh 0 → 100755
浏览文件 @ 3fdb3845
#!/bin/bash
# Copyright (c) http://www.o2oa.net/
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}/configSample ]; then
mkdir ${current_dir}/configSample
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}/localSample ]; then
mkdir ${current_dir}/localSample
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_raspi.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
fi
if [ -f ${current_dir}/start_raspi_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
fi
if [ -f ${current_dir}/stop_raspi.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
fi
if [ -f ${current_dir}/console_raspi.sh ]; then
cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
fi
if [ -f ${current_dir}/start_mips.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
fi
if [ -f ${current_dir}/start_mips_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
fi
if [ -f ${current_dir}/stop_mips.sh ]; then
cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
fi
if [ -f ${current_dir}/console_mips.sh ]; then
cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
fi
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_arm_debug.sh ]; then
cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
fi
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_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 java --illegal-access=permit -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx4g -Duser.timezone=GMT+08 -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
o2server/start_windows_java11.bat 0 → 100644
浏览文件 @ 3fdb3845
@echo off
if exist "%~dp0local\update" (
for %%D in (commons,config,configSample,local,localSample,jvm,servers,store) do (
if not exist "%~dp0%%D" (
mkdir "%~dp0%%D"
)
)
if exist "%~dp0local\update\o2server\version.o2" (
for %%D in (commons,config,configSample,local,localSample,jvm,servers,store) do (
if exist "%~dp0local\update\o2server\%%D" (
xcopy "%~dp0local\update\o2server\%%D" "%~dp0%%D" /S /Y /Q
)
)
for %%F in (console.jar,index.html,src.zip) do (
if exist "%~dp0local\update\o2server\%%F" (
copy "%~dp0local\update\o2server\%%F" "%~dp0"
)
)
for %%A in (start,stop,console,service) do (
for %%B in (windows,linux,macos,raspi,arm,mips) do (
for %%C in (.bat,_java11.bat,.sh,_java.sh) do (
if exist "%~dp0local\update\o2server\%%A_%%B%%C" (
copy "%~dp0local\update\o2server\%%A_%%B%%C" "%~dp0"
)
)
)
)
copy "%~dp0local\update\o2server\version.o2" "%~dp0"
rmdir /S/Q "%~dp0local\update"
)
)
@echo on
"%~dp0jvm\windows_java11\bin\java" -javaagent:"%~dp0console.jar=java11" -server -Xms2g -Duser.timezone=GMT+08 -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
pause
o2server/x_attendance_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_attendance_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_attendance_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_attendance_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_base_core_project/pom.xml
浏览文件 @ 3fdb3845
......@@ -6,7 +6,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_base_core_project</artifactId>
<packaging>jar</packaging>
......
o2server/x_bbs_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_bbs_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_bbs_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_bbs_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_calendar_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_calendar_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_calendar_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_calendar_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_cms_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_cms_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_cms_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_cms_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_cms_core_express/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_cms_core_express</artifactId>
<packaging>jar</packaging>
......
o2server/x_component_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_component_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_component_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_component_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_console/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_console</artifactId>
<packaging>jar</packaging>
......
o2server/x_console/src/main/java/com/x/server/console/InstrumentationAgent.java
浏览文件 @ 3fdb3845
......@@ -25,7 +25,15 @@ public class InstrumentationAgent {
private static final String STORE_JARS = "store/jars";
private static final String COMMONS_EXT = "commons/ext";
public static String JAVAVERSION = "java8";
public static final String JAVAVERSION_JAVA8 = "java8";
public static final String JAVAVERSION_JAVA11 = "java11";
public static void premain(String args, Instrumentation inst) {
if ((null != args) && (args.length() > 0)) {
JAVAVERSION = args;
}
INST = inst;
try {
Path base = getBasePath();
......@@ -36,12 +44,16 @@ public class InstrumentationAgent {
load(base, DYNAMIC_JARS);
}
loadWithCfg(base, STORE_JARS);
loadWithCfg(base, COMMONS_EXT);
loadWithCfg(base, ext());
} catch (Exception e) {
e.printStackTrace();
}
}
public static String ext() {
return JAVAVERSION.equals(JAVAVERSION_JAVA8) ? COMMONS_EXT : COMMONS_EXT + "_" + JAVAVERSION;
}
private static void loadWithCfg(Path base, String sub) throws IOException {
Path dir = base.resolve(sub);
Path cfg = dir.resolve(CFG);
......
o2server/x_console/src/main/java/com/x/server/console/Main.java
浏览文件 @ 3fdb3845
......@@ -430,35 +430,35 @@ public class Main {
stopAll();
stopAllThreads();
String osName = System.getProperty("os.name");
//System.out.println("当前操作系统是："+osName);
// System.out.println("当前操作系统是："+osName);
File file = new File(Config.base(), "start_linux.sh");
if (osName.toLowerCase().startsWith("mac")){
if (osName.toLowerCase().startsWith("mac")) {
file = new File(Config.base(), "start_macos.sh");
}else if (osName.toLowerCase().startsWith("windows")) {
} else if (osName.toLowerCase().startsWith("windows")) {
file = new File(Config.base(), "start_windows.bat");
}else if(!file.exists()) {
file = new File("start_aix.sh");
if(!file.exists()) {
file = new File("start_arm.sh");
if(!file.exists()) {
file = new File("start_mips.sh");
if(!file.exists()) {
file = new File("start_raspi.sh");
} else if (!file.exists()) {
file = new File("start_aix.sh");
if (!file.exists()) {
file = new File("start_arm.sh");
if (!file.exists()) {
file = new File("start_mips.sh");
if (!file.exists()) {
file = new File("start_raspi.sh");
}
}
}
}
if(file.exists()) {
System.out.println("server will start in new process!");
if (file.exists()) {
System.out.println("server will start in new process!");
Process ps = Runtime.getRuntime().exec(file.getAbsolutePath());
Thread.sleep(2000);
if(!Config.currentNode().autoStart()) {
if (!Config.currentNode().autoStart()) {
for (int i = 0; i < 5; i++) {
try (Socket socket = new Socket(Config.node(), Config.currentNode().nodeAgentPort())) {
socket.setKeepAlive(true);
socket.setSoTimeout(2000);
try (DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
DataInputStream dis = new DataInputStream(socket.getInputStream())) {
DataInputStream dis = new DataInputStream(socket.getInputStream())) {
Map<String, Object> commandObject = new HashMap<>();
commandObject.put("command", "command:start");
commandObject.put("credential", Crypto.rsaEncrypt("o2@", Config.publicKey()));
......@@ -474,7 +474,7 @@ public class Main {
}
}
}
}else{
} else {
System.out.println("not support restart in current operating system!start server failure!");
}
} catch (Exception e) {
......@@ -484,20 +484,20 @@ public class Main {
}
}
private static void stopAllThreads(){
if(swapCommandThread!=null){
private static void stopAllThreads() {
if (swapCommandThread != null) {
try {
swapCommandThread.interrupt();
} catch (Exception e) {
}
}
if(consoleCommandThread!=null){
if (consoleCommandThread != null) {
try {
consoleCommandThread.interrupt();
} catch (Exception e) {
}
}
if(nodeAgent!=null){
if (nodeAgent != null) {
try {
nodeAgent.stopAgent();
try {
......
o2server/x_file_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_file_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_file_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_file_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_general_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_general_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_general_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_general_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_hotpic_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_hotpic_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_hotpic_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_hotpic_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_jpush_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_jpush_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_jpush_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_jpush_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_meeting_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_meeting_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_meeting_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_meeting_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_message_assemble_communicate/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_message_assemble_communicate</artifactId>
<packaging>war</packaging>
......
o2server/x_message_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_message_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_mind_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_mind_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_mind_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_mind_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_organization_assemble_authentication/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_assemble_authentication</artifactId>
<packaging>war</packaging>
......
o2server/x_organization_assemble_control/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_assemble_control</artifactId>
<packaging>war</packaging>
......
o2server/x_organization_assemble_express/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_assemble_express</artifactId>
<packaging>war</packaging>
......
o2server/x_organization_assemble_personal/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_assemble_personal</artifactId>
<packaging>war</packaging>
......
o2server/x_organization_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_organization_core_express/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_organization_core_express</artifactId>
<packaging>jar</packaging>
......
o2server/x_portal_assemble_designer/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_portal_assemble_designer</artifactId>
<packaging>war</packaging>
......
o2server/x_portal_assemble_surface/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_portal_assemble_surface</artifactId>
<packaging>war</packaging>
......
o2server/x_portal_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_portal_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_processplatform_assemble_bam/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_assemble_bam</artifactId>
<packaging>war</packaging>
......
o2server/x_processplatform_assemble_designer/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_assemble_designer</artifactId>
<packaging>war</packaging>
......
o2server/x_processplatform_assemble_surface/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_assemble_surface</artifactId>
<packaging>war</packaging>
......
o2server/x_processplatform_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_processplatform_core_express/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_core_express</artifactId>
<packaging>jar</packaging>
......
o2server/x_processplatform_service_processing/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_processplatform_service_processing</artifactId>
<packaging>war</packaging>
......
o2server/x_program_center/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_program_center</artifactId>
<packaging>war</packaging>
......
o2server/x_program_center_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_program_center_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_query_assemble_designer/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_query_assemble_designer</artifactId>
<packaging>war</packaging>
......
o2server/x_query_assemble_surface/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_query_assemble_surface</artifactId>
<packaging>war</packaging>
......
o2server/x_query_core_entity/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_query_core_entity</artifactId>
<packaging>jar</packaging>
......
o2server/x_query_core_express/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_query_core_express</artifactId>
<packaging>jar</packaging>
......
o2server/x_query_service_processing/pom.xml
浏览文件 @ 3fdb3845
......@@ -7,7 +7,7 @@
<parent>
<groupId>o2oa</groupId>
<artifactId>o2server</artifactId>
<version>5.4</version>
<version>6.1</version>
</parent>
<artifactId>x_query_service_processing</artifactId>
<packaging>war</packaging>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或