Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

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

通知 1
Star 0
Fork 0
o2oa
o2oa

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

提交 6a1423b3 编写于 作者: Z zhourui
浏览文件
操作

修改启动脚本

上级 8fd564e7
隐藏空白更改
内联 并排
Showing with 47 addition and 51 deletion
o2server/start_aix.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/aix/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/aix/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_aix_debug.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/aix/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
setsid ${current_dir}/jvm/aix/bin/java -javaagent:${current_dir}/console.jar -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_arm_debug.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
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
setsid ${current_dir}/jvm/arm/bin/java -javaagent:${current_dir}/console.jar -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_debug.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/linux/bin/java -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -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
setsid ${current_dir}/jvm/linux/bin/java -javaagent:${current_dir}/console.jar -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -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_macos.sh
浏览文件 @ 6a1423b3
......@@ -149,4 +149,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
sudo ${current_dir}/jvm/macos/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
sudo ${current_dir}/jvm/macos/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_macos_debug.sh
浏览文件 @ 6a1423b3
......@@ -149,4 +149,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
sudo ${current_dir}/jvm/macos/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
sudo ${current_dir}/jvm/macos/bin/java -javaagent:${current_dir}/console.jar -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
o2server/start_raspberrypi.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
sudo rm -Rf ${current_dir}/local/update
fi
fi
sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -server -Xms1g -Xmx1g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -javaagent:${current_dir}/console.jar -server -Xms1g -Xmx1g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_raspberrypi_debug.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
sudo rm -Rf ${current_dir}/local/update
fi
fi
sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms1g -Xmx1g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
sudo setsid ${current_dir}/jvm/raspberrypi/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms1g -Xmx1g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_risc.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/risc/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
setsid ${current_dir}/jvm/risc/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
o2server/start_risc_debug.sh
浏览文件 @ 6a1423b3
......@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
rm -Rf ${current_dir}/local/update
fi
fi
setsid ${current_dir}/jvm/risc/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
setsid ${current_dir}/jvm/risc/bin/java -javaagent:${current_dir}/console.jar -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_windows.bat
浏览文件 @ 6a1423b3
......@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
)
)
@echo on
"%~dp0jvm\windows\bin\java" -server -Xms2g -Xmx5g -Duser.timezone=GMT+08 -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
"%~dp0jvm\windows\bin\java" -javaagent:"%~dp0console.jar" -server -Xms2g -Xmx5g -Duser.timezone=GMT+08 -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
pause
\ No newline at end of file
o2server/start_windows_debug.bat
浏览文件 @ 6a1423b3
......@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
)
)
@echo on
"%~dp0jvm\windows\bin\java" -server -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
"%~dp0jvm\windows\bin\java" -javaagent:"%~dp0console.jar" -server -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
pause
\ No newline at end of file
o2server/stop_aix.sh
浏览文件 @ 6a1423b3
$(cd "$(dirname "$0")"; pwd)/jvm/aix/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
$(cd "$(dirname "$0")"; pwd)/jvm/aix/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_arm.sh
浏览文件 @ 6a1423b3
$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_linux.sh
浏览文件 @ 6a1423b3
$(cd "$(dirname "$0")"; pwd)/jvm/linux/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
$(cd "$(dirname "$0")"; pwd)/jvm/linux/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_macos.sh
浏览文件 @ 6a1423b3
sudo $(cd "$(dirname "$0")"; pwd)/jvm/macos/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
sudo $(cd "$(dirname "$0")"; pwd)/jvm/macos/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_raspberrypi.sh
浏览文件 @ 6a1423b3
sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspberrypi/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
sudo $(cd "$(dirname "$0")"; pwd)/jvm/raspberrypi/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_risc.sh
浏览文件 @ 6a1423b3
$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/stop_windows.bat
浏览文件 @ 6a1423b3
"%~dp0jvm\windows\bin\java" -cp "%~dp0console.jar" com.x.server.console.swapcommand.Exit
\ No newline at end of file
"%~dp0jvm\windows\bin\java" -javaagent:"%~dp0console.jar" -cp "%~dp0console.jar" com.x.server.console.swapcommand.Exit
\ No newline at end of file
o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
浏览文件 @ 6a1423b3
......@@ -83,8 +83,8 @@ public class ApplicationServerTools extends JettySeverTools {
private static Logger logger = LoggerFactory.getLogger(ApplicationServerTools.class);
private static int APPLICATIONSERVER_THREAD_POOL_SIZE_MIN = 50;
private static int APPLICATIONSERVER_THREAD_POOL_SIZE_MAX = 500;
private static final int APPLICATIONSERVER_THREAD_POOL_SIZE_MIN = 50;
private static final int APPLICATIONSERVER_THREAD_POOL_SIZE_MAX = 500;
private static final List<String> OFFICIAL_MODULE_SORTED_TEMPLATE = ListTools.toList(
x_general_assemble_control.class.getName(), x_organization_assemble_authentication.class.getName(),
......
o2server/x_query_service_processing/src/main/webapp/describe/sources/com/x/query/service/processing/factory/QueryFactory.java
浏览文件 @ 6a1423b3
......@@ -7,35 +7,34 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.cache.ApplicationCache;
import com.x.base.core.project.tools.StringTools;
import com.x.query.core.entity.Query;
import com.x.query.service.processing.AbstractFactory;
import com.x.query.service.processing.Business;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import com.x.base.core.project.cache.Cache.CacheCategory;
import com.x.base.core.project.cache.Cache.CacheKey;
import com.x.base.core.project.cache.CacheManager;
import java.util.Optional;
public class QueryFactory extends AbstractFactory {
private Ehcache cache;
private CacheCategory cache;
public QueryFactory(Business business) throws Exception {
super(business);
this.cache = ApplicationCache.instance().getCache(Query.class);
this.cache = new CacheCategory(Query.class);
}
public List<Query> pick(List<String> flags) throws Exception {
List<Query> list = new ArrayList<>();
for (String str : flags) {
Element element = cache.get(str);
if (null != element) {
if (null != element.getObjectValue()) {
list.add((Query) element.getObjectValue());
}
CacheKey cacheKey = new CacheKey(str);
Optional<?> optional = CacheManager.get(cache, cacheKey);
if (optional.isPresent()) {
list.add((Query) optional.get());
} else {
Query o = this.pickObject(str);
cache.put(new Element(str, o));
CacheManager.put(cache, cacheKey, o);
if (null != o) {
list.add(o);
}
......@@ -49,14 +48,13 @@ public class QueryFactory extends AbstractFactory {
return null;
}
Query o = null;
Element element = cache.get(flag);
if (null != element) {
if (null != element.getObjectValue()) {
o = (Query) element.getObjectValue();
}
CacheKey cacheKey = new CacheKey(flag);
Optional<?> optional = CacheManager.get(cache, cacheKey);
if (optional.isPresent()) {
o = (Query) optional.get();
} else {
o = this.pickObject(flag);
cache.put(new Element(flag, o));
CacheManager.put(cache, cacheKey, o);
}
return o;
}
......
o2server/x_query_service_processing/src/main/webapp/describe/sources/com/x/query/service/processing/jaxrs/neural/ActionListCalculateWithWork.java
浏览文件 @ 6a1423b3
......@@ -20,7 +20,6 @@ import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.dataitem.DataItemConverter;
import com.x.base.core.entity.dataitem.ItemCategory;
import com.x.base.core.project.cache.ApplicationCache;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.config.StorageMapping;
import com.x.base.core.project.exception.ExceptionEntityNotExist;
......@@ -43,8 +42,9 @@ import com.x.query.service.processing.Business;
import com.x.query.service.processing.ThisApplication;
import com.x.query.service.processing.helper.ExtractTextHelper;
import com.x.query.service.processing.helper.LanguageProcessingHelper;
import net.sf.ehcache.Element;
import com.x.base.core.project.cache.Cache.CacheKey;
import com.x.base.core.project.cache.CacheManager;
import java.util.Optional;
class ActionListCalculateWithWork extends BaseAction {
......@@ -63,10 +63,10 @@ class ActionListCalculateWithWork extends BaseAction {
throw new ExceptionModelNotReady(model.getName());
}
NeuralNetwork<MomentumBackpropagation> neuralNetwork = null;
String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), model.getId());
Element element = cache.get(cacheKey);
if (null != element && (null != element.getObjectValue())) {
neuralNetwork = ((NeuralNetwork<MomentumBackpropagation>) element.getObjectValue());
CacheKey cacheKey = new CacheKey(this.getClass(), model.getId());
Optional<?> optional = CacheManager.get(cache, cacheKey);
if (optional.isPresent()) {
neuralNetwork = ((NeuralNetwork<MomentumBackpropagation>) optional.get());
} else {
if (StringUtils.isEmpty(model.getNnet())) {
throw new ExceptionModelNotReady(model.getName());
......@@ -75,7 +75,7 @@ class ActionListCalculateWithWork extends BaseAction {
NeuralNetworkCODEC.array2network(
DoubleTools.byteToDoubleArray(ByteTools.decompressBase64String(model.getNnet())),
neuralNetwork);
cache.put(new Element(cacheKey, neuralNetwork));
CacheManager.put(cache, cacheKey, neuralNetwork);
}
Wo wo = new Wo();
Work work = emc.flag(workId, Work.class);
......
o2server/x_query_service_processing/src/main/webapp/describe/sources/com/x/query/service/processing/jaxrs/neural/BaseAction.java
浏览文件 @ 6a1423b3
package com.x.query.service.processing.jaxrs.neural;
import com.x.base.core.project.cache.ApplicationCache;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.query.core.entity.neural.Model;
import net.sf.ehcache.Ehcache;
import com.x.base.core.project.cache.Cache.CacheCategory;
abstract class BaseAction extends StandardJaxrsAction {
protected Ehcache cache = ApplicationCache.instance().getCache(Model.class);
protected CacheCategory cache = new CacheCategory(Model.class);
private static Logger logger = LoggerFactory.getLogger(BaseAction.class);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或