Skip to content

o2oa
o2oa

fuyue82 / o2oa
与 Fork 源项目一致

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

通知 1
Star 0
Fork 0
o2oa
o2oa

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

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

日志迁移到log4j2

上级 16e0468a
展开全部 隐藏空白更改
内联 并排
Showing with 537 addition and 851 deletion
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -18,7 +18,7 @@ import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
private ThisApplication() {
//nothing
// nothing
}
protected static Context context;
......@@ -41,7 +41,6 @@ public class ThisApplication {
public static void init() throws Exception {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_attendance_assemble_control());
new AttendanceSettingService().initAllSystemConfig();
context.startQueue(detailAnalyseQueue);
context.startQueue(detailStatisticQueue);
......@@ -59,7 +58,7 @@ public class ThisApplication {
context.schedule(QywxAttendanceSyncScheduleTask.class, "0 0 1 * * ?");
}
context.schedule(AttendanceStatisticTask.class, "0 0 0/4 * * ?");
//context.schedule(MobileRecordAnalyseTask.class, "0 0 * * * ?");
// context.schedule(MobileRecordAnalyseTask.class, "0 0 * * * ?");
// 每天凌晨1点，计算前一天所有的未签退和未分析的打卡数据
context.schedule(DetailLastDayRecordAnalyseTask.class, "0 0 1 * * ?");
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Organization.java
浏览文件 @ e02c184e
......@@ -17,7 +17,8 @@ public class Organization extends ConfigObject {
public static final Integer DEFAULT_UNITLEVELORDERNUMBERDIGITS = 10;
public static final Boolean DEFAULT_PICKPERSONWITHNAME = true;
public static final Boolean DEFAULT_PICKIDENTITYWITHNAME = true;
/* 默认改为false,避免自动补发待办 */
public static final Boolean DEFAULT_PICKIDENTITYWITHNAME = false;
public static Organization defaultInstance() {
return new Organization();
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/LanguagePromptException.java
浏览文件 @ e02c184e
package com.x.base.core.project.exception;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.logger.MessageFormatter;
import com.x.base.core.project.tools.LanguageTools;
import org.apache.commons.lang3.StringUtils;
public abstract class LanguagePromptException extends PromptException {
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/PromptException.java
浏览文件 @ e02c184e
package com.x.base.core.project.exception;
import com.x.base.core.project.logger.MessageFormatter;
import org.slf4j.helpers.MessageFormatter;
public abstract class PromptException extends Exception {
......@@ -10,27 +10,27 @@ public abstract class PromptException extends Exception {
private static final long serialVersionUID = -6306372564902986731L;
public PromptException() {
protected PromptException() {
super();
}
public PromptException(String message) {
protected PromptException(String message) {
super(message);
}
public PromptException(String message, Object... os) {
protected PromptException(String message, Object... os) {
super(format(message, os));
}
public PromptException(Throwable cause) {
protected PromptException(Throwable cause) {
super(cause);
}
public PromptException(Throwable cause, String message) {
protected PromptException(Throwable cause, String message) {
super(message, cause);
}
public PromptException(Throwable cause, String message, Object... os) {
protected PromptException(Throwable cause, String message, Object... os) {
super(format(message, os), cause);
}
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Audit.java 已删除 100644 → 0
浏览文件 @ 16e0468a
package com.x.base.core.project.logger;
import java.io.PrintStream;
import java.net.InetAddress;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import com.x.base.core.project.message.MessageConnector;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.helpers.MessageFormatter;
import com.x.base.core.project.config.Config;
public class Audit {
private Date start;
private String className = "";
private String person = "";
private String remoteAddress = "";
private String uri = "";
private String userAgent = "";
private String userId = "";
private String userName = "";
protected Audit(String person, String remoteAddress, String uri, String userAgent, String className) {
this.start = new Date();
this.person = Objects.toString(person, "");
if(person==null || person.indexOf("@") == -1){
userId = Objects.toString(person, "");
userName = Objects.toString(person, "");
}else{
String persons[] = person.split("@");
userId = persons[1];
userName = persons[0];
}
this.remoteAddress = Objects.toString(remoteAddress, "");
this.uri = Objects.toString(uri, "");
this.userAgent = Objects.toString(userAgent, "");
this.className = Objects.toString(className, "");
}
public void log1() throws Exception {
this.log1("");
}
/**
* 审计日志
* @param message
* @param os
* @throws Exception
*/
public void log1(String message, Object... os){
try {
if (Config.logLevel().audit().enable()) {
Date end = new Date();
long elapsed = end.getTime() - start.getTime();
PrintStream stream = (PrintStream) Config.resource(Config.RESOURCE_AUDITLOGPRINTSTREAM);
stream.printf("%tF %tT,,,%d,,,%s,,,%s,,,%s,,,%s,,,%s,,,%s%n", end, end, elapsed, this.person,
this.remoteAddress, this.uri, this.userAgent, this.className,
MessageFormatter.arrayFormat(Objects.toString(message, ""), os).getMessage());
}
} catch (Exception e) {
System.out.println("审计日志打印异常"+e.getMessage());
}
}
/**
* 审计日志格式：
* 默认时间戳之类的信息|日志版本号|请求ID|请求深度|请求链|登录账号|员工工号
* |系统归属|系统名称|模块名称|表单类型|操作名称|是否统计上报|扩展信息|时间戳|耗时|请求结果|主机IP
* |主机名|终端类型|终端IP |终端型号|终端IMEI|错误堆栈
* @throws Exception
*/
public void log(String person, String op){
try {
if (Config.logLevel().audit().enable()) {
if(person!=null) {
this.person = person;
if(person.indexOf("@") == -1){
userId = person;
userName = person;
}else{
String persons[] = person.split("@");
userId = persons[1];
userName = persons[0];
}
}
Date end = new Date();
long elapsed = end.getTime() - start.getTime();
InetAddress addr = InetAddress.getLocalHost();
String hostAddress = addr.getHostAddress();
String hostName = addr.getHostName();
String system = Objects.toString(Config.logLevel().audit().getSystem(), "OA");
String systemName = Objects.toString(Config.logLevel().audit().getSystemName(), "OA系统");
String extend1 = Objects.toString(Config.logLevel().audit().getExtend1(), "");
/*String mode = this.uri;
if(this.uri!=null) {
String[] uris = this.uri.split("/");
if (uris.length > 1) {
mode = uris[1];
}
}*/
PrintStream stream = (PrintStream) Config.resource(Config.RESOURCE_AUDITLOGPRINTSTREAM);
String auditLog = String.format("%tF %tT|2.0||1||%s|%s|%s|%s|%s||%s|true|%s|%d|%d|true|%s|%s|%s|%s|%s||", end, end, this.userId,
this.userId, systemName, system, this.uri, op, this.getParameter(op, system, extend1), end.getTime(), elapsed, hostAddress, hostName,
getTerminal(), this.remoteAddress, this.userAgent);
stream.println(auditLog);
HashMap<String, String> map = new HashMap<>();
map.put("auditLog", auditLog);
MessageConnector.send(MessageConnector.TYPE_AUDIT_LOG, op, this.person, map);
}
} catch (Exception e) {
System.out.println("审计日志打印异常"+e.getMessage());
}
}
public String getTerminal(){
if(StringUtils.isNotBlank(this.userAgent)) {
String userAgent = this.userAgent.toLowerCase();
if (userAgent.indexOf("micromessenger") != -1) {
//微信
return "MOA";
} else if (userAgent.indexOf("android") != -1) {
//安卓
return "MOA";
} else if (userAgent.indexOf("iphone") != -1 || userAgent.indexOf("ipad") != -1 || userAgent.indexOf("ipod") != -1) {
//苹果
return "MOA";
} else {
//电脑
return "PC";
}
}
return "PC";
}
public String getParameter(String op,String system,String extend1){
StringBuffer parameter =new StringBuffer();
if("登录".equals(op)){
parameter.append("LOG_RESULT=0&interfacename=").append(system).append("_")
.append(getTerminal()).append("_LOGIN&errorCode=ok&extend1=").append(extend1).append("&LOGIN_ENTRY=0");
}else if("注销".equals(op)){
parameter.append("LOG_RESULT=0&interfacename=").append(system).append("_")
.append(getTerminal()).append("_LOGOUT&errorCode=ok&extend1=").append(extend1).append("&LOGOUT_ENTRY=0");
}else{
parameter.append("LOG_RESULT=0&interfacename=").append(system).append("_")
.append(getTerminal()).append("_OPERATION&errorCode=ok&extend1=").append(extend1);
}
return parameter.toString();
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/FormattingTuple.java
浏览文件 @ e02c184e
package com.x.base.core.project.logger;
/**
* Holds the results of formatting done by {@link MessageFormatter}.
*
......@@ -8,32 +7,32 @@ package com.x.base.core.project.logger;
*/
public class FormattingTuple {
static public FormattingTuple NULL = new FormattingTuple(null);
public static FormattingTuple NULL = new FormattingTuple(null);
private String message;
private Throwable throwable;
private Object[] argArray;
private String message;
private Throwable throwable;
private Object[] argArray;
public FormattingTuple(String message) {
this(message, null, null);
}
public FormattingTuple(String message) {
this(message, null, null);
}
public FormattingTuple(String message, Object[] argArray, Throwable throwable) {
this.message = message;
this.throwable = throwable;
this.argArray = argArray;
}
public FormattingTuple(String message, Object[] argArray, Throwable throwable) {
this.message = message;
this.throwable = throwable;
this.argArray = argArray;
}
public String getMessage() {
return message;
}
public String getMessage() {
return message;
}
public Object[] getArgArray() {
return argArray;
}
public Object[] getArgArray() {
return argArray;
}
public Throwable getThrowable() {
return throwable;
}
public Throwable getThrowable() {
return throwable;
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java
浏览文件 @ e02c184e
......@@ -18,6 +18,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.tools.DateTools;
import com.x.base.core.project.tools.StringTools;
import jdk.jfr.Description;
public class Logger {
private final org.slf4j.Logger internalLogger;
......@@ -62,10 +64,12 @@ public class Logger {
}
}
@Deprecated
public void debug(EffectivePerson noUse, String message, Object... os) {
debug(message, os);
}
@Deprecated
public void debug(boolean noUse, String message, Object... os) {
debug(message, os);
}
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/LoggerFactory.java
浏览文件 @ e02c184e
package com.x.base.core.project.logger;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.tools.DateTools;
public class LoggerFactory {
private LoggerFactory() {
......@@ -13,48 +9,4 @@ public class LoggerFactory {
return new Logger(clz.getName());
}
public static void setLevel(String str) {
// if (StringUtils.equalsIgnoreCase(Logger.ERROR, str)) {
// Logger.level = Logger.ERROR_INT;
// }
// if (StringUtils.equalsIgnoreCase(Logger.WARN, str)) {
// Logger.level = Logger.WARN_INT;
// }
// if (StringUtils.equalsIgnoreCase(Logger.INFO, str)) {
// Logger.level = Logger.INFO_INT;
// }
// if (StringUtils.equalsIgnoreCase(Logger.DEBUG, str)) {
// Logger.level = Logger.DEBUG_INT;
// }
// if (StringUtils.equalsIgnoreCase(Logger.TRACE, str)) {
// Logger.level = Logger.TRACE_INT;
// }
}
//
// public static String getLevel() {
// switch (Logger.level) {
// case Logger.TRACE_INT:
// return Logger.TRACE;
// case Logger.DEBUG_INT:
// return Logger.DEBUG;
// case Logger.WARN_INT:
// return Logger.WARN;
// default:
// return Logger.INFO;
// }
// }
public static void print(Class<?> cls, String message, Object... os) {
StringBuilder o = new StringBuilder();
o.append(DateTools.now()).append(" ").append(LoggerFactory.class.getSimpleName());
o.append(" [").append(Thread.currentThread().getName()).append("] ");
o.append(cls.getName()).append(" - ");
o.append(MessageFormatter.arrayFormat(message, os).getMessage());
System.out.println(o.toString());
}
public static void print(String message, Object... os) {
print(LoggerFactory.class, message, os);
}
}
\ No newline at end of file
o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/StringTools.java
浏览文件 @ e02c184e
package com.x.base.core.project.tools;
import static java.util.Locale.ENGLISH;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
......@@ -30,9 +28,8 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.slf4j.helpers.MessageFormatter;
import com.alibaba.druid.sql.visitor.functions.Char;
import com.x.base.core.project.logger.MessageFormatter;
public class StringTools {
......
o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,18 +2,21 @@ package com.x.bbs.assemble.control;
import java.util.List;
import com.x.bbs.assemble.control.schedule.*;
import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.base.core.project.tools.ListTools;
import com.x.bbs.assemble.control.queue.QueueNewReplyNotify;
import com.x.bbs.assemble.control.queue.QueueNewSubjectNotify;
import com.x.bbs.assemble.control.schedule.MarketSubjectTypeTask;
import com.x.bbs.assemble.control.schedule.SubjectReplyTotalStatisticTask;
import com.x.bbs.assemble.control.schedule.SubjectTotalStatisticTask;
import com.x.bbs.assemble.control.schedule.UserCountTodaySetZeroTask;
import com.x.bbs.assemble.control.schedule.UserSubjectReplyPermissionStatisticTask;
import com.x.bbs.assemble.control.service.BBSConfigSettingService;
import com.x.bbs.assemble.control.service.BBSForumInfoServiceAdv;
import com.x.bbs.assemble.control.service.BBSPermissionInfoService;
......@@ -42,7 +45,6 @@ public class ThisApplication {
public static void init() throws Exception {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_bbs_assemble_control());
CONFIG_BBS_ANONYMOUS_PERMISSION = (new BBSConfigSettingService())
.getValueWithConfigCode("BBS_ANONYMOUS_PERMISSION");
initAllSystemConfig();
......@@ -52,7 +54,7 @@ public class ThisApplication {
context.schedule(SubjectTotalStatisticTask.class, "0 0 1 * * ?"); // 每天凌晨一点执行
context.schedule(UserCountTodaySetZeroTask.class, "0 1 0 * * ?"); // 每天凌晨执行
context.schedule(MarketSubjectTypeTask.class, "0 0 1 * * ?"); // 每天凌晨一点执行
//context.schedule(MarketSubjectTypeTask.class, "* 0/05 * * * ? "); // 每天凌晨一点执行
// context.schedule(MarketSubjectTypeTask.class, "* 0/05 * * * ? "); // 每天凌晨一点执行
context.schedule(SubjectReplyTotalStatisticTask.class, "0 40 * * * ?");
context.schedule(UserSubjectReplyPermissionStatisticTask.class, "0 0/30 * * * ?");
} catch (Exception e) {
......
o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -6,9 +6,7 @@ import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.base.core.project.tools.ListTools;
import com.x.calendar.assemble.control.schedule.AlarmTrigger;
......@@ -33,7 +31,6 @@ public class ThisApplication {
public static void init() throws Exception {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_calendar_assemble_control());
MessageConnector.start(context());
// 每30秒检查一次需要推送的消息
context.schedule(AlarmTrigger.class, "0/30 * * * * ?");
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -5,8 +5,6 @@ import java.util.concurrent.ConcurrentMap;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.cms.assemble.control.queue.DataImportStatus;
import com.x.cms.assemble.control.queue.QueueBatchOperation;
......@@ -16,7 +14,6 @@ import com.x.cms.assemble.control.queue.QueueDocumentUpdate;
import com.x.cms.assemble.control.queue.QueueDocumentViewCountUpdate;
import com.x.cms.assemble.control.queue.QueueSendDocumentNotify;
import com.x.cms.assemble.control.timertask.Timertask_BatchOperationTask;
import com.x.cms.assemble.control.timertask.Timertask_CheckDocumentReviewStatus;
import com.x.cms.assemble.control.timertask.Timertask_InitOperationRunning;
import com.x.cms.assemble.control.timertask.Timertask_LogRecordCheckTask;
import com.x.cms.assemble.control.timertask.Timertask_RefreshAllDocumentReviews;
......@@ -51,14 +48,12 @@ public class ThisApplication {
public static void init() throws Exception {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_cms_assemble_control());
MessageConnector.start(context());
context().startQueue(queueBatchOperation);
context().startQueue(queueDocumentDelete);
context().startQueue(queueDataRowImport);
context().startQueue(queueDocumentUpdate);
context().startQueue(queueDocumentViewCountUpdate);
//queueSendDocumentNotify.initFixedThreadPool(3);
context().startQueue(queueSendDocumentNotify);
// 每天凌晨2点执行一次
......@@ -67,8 +62,7 @@ public class ThisApplication {
// 每天凌晨1点，计算所有的文档的权限信息
context.schedule(Timertask_RefreshAllDocumentReviews.class, "0 0 1 * * ?");
//集群下多台会一起运行，Timertask_BatchOperationTask运行即可
//context.scheduleLocal(Timertask_CheckDocumentReviewStatus.class, 1200);
// 集群下多台会一起运行，Timertask_BatchOperationTask运行即可
context.scheduleLocal(Timertask_InitOperationRunning.class, 150);
}
......
o2server/x_component_assemble_control/src/main/java/com/x/component/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,7 +2,6 @@ package com.x.component.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.component.assemble.control.schedule.InitComponents;
......@@ -24,7 +23,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_component_assemble_control());
context.scheduleLocal(InitComponents.class, 1);
} catch (Exception e) {
logger.error(e);
......
o2server/x_console/src/main/java/com/x/server/console/log/Log4j2Configuration.java
浏览文件 @ e02c184e
......@@ -15,6 +15,8 @@ public class Log4j2Configuration {
}
private static final String CONVERSION_PATTERN = "%d{yyyy-MM-dd HH:mm:ss.SSS}";
public static void reconfigure() {
final PrintStream stderr = System.err;
......@@ -33,7 +35,7 @@ public class Log4j2Configuration {
private static void addStandardOutAppender(final Configuration config, final PrintStream stdout) {
final PatternLayout layout = PatternLayout.newBuilder().withConfiguration(config)
.withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build();
.withPattern(CONVERSION_PATTERN).build();
final Appender appender = OutputStreamAppender.createAppender(layout, null, stdout, "stdout", true, true);
appender.start();
config.addAppender(appender);
......
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
浏览文件 @ e02c184e
......@@ -50,10 +50,8 @@ public abstract class JettySeverTools {
server.addConnector(https);
}
protected static void addHttpConnector(Server server, Integer port, boolean persistentConnectionsEnable)
throws Exception {
protected static void addHttpConnector(Server server, Integer port, boolean persistentConnectionsEnable) {
HttpConfiguration config = new HttpConfiguration();
// config.setOutputBufferSize(1024 * 2048);
config.setPersistentConnectionsEnabled(persistentConnectionsEnable);
config.setRequestHeaderSize(8192 * 2);
config.setResponseHeaderSize(8192 * 2);
......
o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
浏览文件 @ e02c184e
......@@ -170,12 +170,12 @@ public class ApplicationServerTools extends JettySeverTools {
private static RequestLog requestLog(ApplicationServer applicationServer) throws Exception {
AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
asyncRequestLogWriter.setAppend(true);
asyncRequestLogWriter.setRetainDays(applicationServer.getRequestLogRetainDays());
asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node()
+ ".application.request.log");
asyncRequestLogWriter.setFilename(Config.dir_logs().toString() + File.separator
+ "application.request.yyyyMMdd." + Config.node() + ".log");
String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
+ "}t \"%r\" %s %O %{ms}T";
if (BooleanUtils.isTrue(applicationServer.getRequestLogBodyEnable())) {
......@@ -224,7 +224,8 @@ public class ApplicationServerTools extends JettySeverTools {
if (BooleanUtils.isFalse(applicationServer.getExposeJest())) {
FilterHolder denialOfServiceFilterHolder = new FilterHolder(new DenialOfServiceFilter());
webApp.addFilter(denialOfServiceFilterHolder, "/jest/*", EnumSet.of(DispatcherType.REQUEST));
webApp.addFilter(denialOfServiceFilterHolder, "/describe/sources/*", EnumSet.of(DispatcherType.REQUEST));
webApp.addFilter(denialOfServiceFilterHolder, "/describe/sources/*",
EnumSet.of(DispatcherType.REQUEST));
}
handlers.addHandler(webApp);
} else if (Files.exists(dir)) {
......@@ -267,7 +268,8 @@ public class ApplicationServerTools extends JettySeverTools {
if (BooleanUtils.isFalse(applicationServer.getExposeJest())) {
FilterHolder denialOfServiceFilterHolder = new FilterHolder(new DenialOfServiceFilter());
webApp.addFilter(denialOfServiceFilterHolder, "/jest/*", EnumSet.of(DispatcherType.REQUEST));
webApp.addFilter(denialOfServiceFilterHolder, "/describe/sources/*", EnumSet.of(DispatcherType.REQUEST));
webApp.addFilter(denialOfServiceFilterHolder, "/describe/sources/*",
EnumSet.of(DispatcherType.REQUEST));
}
handlers.addHandler(webApp);
} else if (Files.exists(dir)) {
......
o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
浏览文件 @ e02c184e
......@@ -127,12 +127,12 @@ public class CenterServerTools extends JettySeverTools {
private static RequestLog requestLog(CenterServer centerServer) throws Exception {
AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
asyncRequestLogWriter.setAppend(true);
asyncRequestLogWriter.setRetainDays(centerServer.getRequestLogRetainDays());
asyncRequestLogWriter.setFilename(
Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".center.request.log");
Config.dir_logs().toString() + File.separator + "center.request.yyyyMMdd." + Config.node() + ".log");
String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
+ "}t \"%r\" %s %O %{ms}T";
if (BooleanUtils.isTrue(centerServer.getRequestLogBodyEnable())) {
......
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
浏览文件 @ e02c184e
......@@ -130,12 +130,12 @@ public class WebServerTools extends JettySeverTools {
private static RequestLog requestLog(WebServer webServer) throws Exception {
AsyncRequestLogWriter asyncRequestLogWriter = new AsyncRequestLogWriter();
asyncRequestLogWriter.setFilenameDateFormat("yyyy_MM_dd");
asyncRequestLogWriter.setFilenameDateFormat("yyyyMMdd");
asyncRequestLogWriter.setTimeZone(TimeZone.getDefault().getID());
asyncRequestLogWriter.setAppend(true);
asyncRequestLogWriter.setRetainDays(webServer.getRequestLogRetainDays());
asyncRequestLogWriter.setFilename(
Config.dir_logs().toString() + File.separator + "yyyy_MM_dd." + Config.node() + ".web.request.log");
Config.dir_logs().toString() + File.separator + "web.request.yyyyMMdd." + Config.node() + ".log");
String format = "%{client}a - %u %{yyyy-MM-dd HH:mm:ss.SSS ZZZ|" + DateFormatUtils.format(new Date(), "z")
+ "}t \"%r\" %s %O %{ms}T";
return new ServerRequestLog(asyncRequestLogWriter,
......
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.file.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.file.assemble.control.jaxrs.file.FileRemoveQueue;
......@@ -24,7 +22,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_file_assemble_control());
MessageConnector.start(context());
context().startQueue(fileRemoveQueue);
} catch (Exception e) {
......
o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.general.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.general.assemble.control.schedule.Clean;
public class ThisApplication {
......@@ -21,8 +19,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_general_assemble_control());
context().schedule(Clean.class, "0 0 2 * * ?");
} catch (Exception e) {
e.printStackTrace();
......
o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.hotpic.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.hotpic.assemble.control.queueTask.DocumentExistsCheckTask;
import com.x.hotpic.assemble.control.schedule.InfoExistsCheckTask;
......@@ -23,7 +21,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_hotpic_assemble_control());
context.startQueue(queueLoginRecord);
context.schedule(InfoExistsCheckTask.class, "0 0/10 * * * ?");
} catch (Exception e) {
......
o2server/x_jpush_assemble_control/src/main/java/com/x/jpush/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.jpush.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() throws Exception {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_jpush_assemble_control());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.meeting.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
public class ThisApplication {
......@@ -21,7 +19,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_meeting_assemble_control());
MessageConnector.start(context());
} catch (Exception e) {
e.printStackTrace();
......
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionCheckinCode.java
浏览文件 @ e02c184e
package com.x.meeting.assemble.control.jaxrs.meeting;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.Hashtable;
......@@ -22,7 +19,6 @@ import com.x.base.core.project.config.ApplicationServer;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.StringTools;
......
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ThisApplication.java
浏览文件 @ e02c184e
......@@ -5,7 +5,6 @@ import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.message.assemble.communicate.schedule.Clean;
import com.x.message.assemble.communicate.schedule.TriggerMq;
......@@ -45,8 +44,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_message_assemble_communicate());
MessageConnector.start(context());
startQueue();
if (BooleanUtils.isTrue(Config.communicate().clean().getEnable())) {
......@@ -92,7 +89,8 @@ public class ThisApplication {
if (BooleanUtils.isTrue(Config.mq().getEnable())) {
context().startQueue(mqConsumeQueue);
}
if (BooleanUtils.isTrue(Config.mPweixin().getEnable()) && BooleanUtils.isTrue(Config.mPweixin().getMessageEnable())) {
if (BooleanUtils.isTrue(Config.mPweixin().getEnable())
&& BooleanUtils.isTrue(Config.mPweixin().getMessageEnable())) {
context().startQueue(mpWeixinConsumeQueue);
}
}
......
o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.mind.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.mind.assemble.control.queue.QueueShareNotify;
......@@ -23,7 +21,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_mind_assemble_control());
MessageConnector.start(context());
context().startQueue(queueShareNotify);
} catch (Exception e) {
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.organization.assemble.authentication;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.organization.assemble.authentication.jaxrs.authentication.QueueLoginRecord;
import com.x.organization.assemble.authentication.schedule.CleanupBind;
......@@ -26,7 +24,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_authentication());
context.startQueue(queueLoginRecord);
context.schedule(CleanupBind.class, "0 */15 * * * ?");
context.schedule(CleanupOauthCode.class, "0 */15 * * * ?");
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionCaptchaLogin.java
浏览文件 @ e02c184e
......@@ -15,7 +15,6 @@ import com.x.base.core.project.config.Config;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.Crypto;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionCodeLogin.java
浏览文件 @ e02c184e
......@@ -12,7 +12,6 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionLogin.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import com.x.base.core.project.config.Config;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.Crypto;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionLogout.java
浏览文件 @ e02c184e
......@@ -7,7 +7,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthDingdingLogin.java
浏览文件 @ e02c184e
......@@ -20,7 +20,6 @@ import com.x.base.core.project.config.Config;
import com.x.base.core.project.connection.HttpConnection;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthLogin.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import com.x.base.core.project.config.Config;
import com.x.base.core.project.config.Token.OauthClient;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthQiyeweixinLogin.java
浏览文件 @ e02c184e
......@@ -12,7 +12,6 @@ import com.x.base.core.project.config.Config;
import com.x.base.core.project.connection.HttpConnection;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionSwitchUser.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java
浏览文件 @ e02c184e
......@@ -19,7 +19,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ActionLoginWithCode.java
浏览文件 @ e02c184e
......@@ -21,7 +21,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/qiyeweixin/ActionGetLogin.java
浏览文件 @ e02c184e
......@@ -22,7 +22,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java
浏览文件 @ e02c184e
......@@ -24,7 +24,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.OrganizationDefinition;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/welink/ActionLogin.java
浏览文件 @ e02c184e
......@@ -23,7 +23,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/zhengwudingding/ActionLogin.java
浏览文件 @ e02c184e
......@@ -24,7 +24,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpToken;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.authentication.Business;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.organization.assemble.control;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_control());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.organization.assemble.express;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_express());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.organization.assemble.personal;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.organization.assemble.personal.jaxrs.exmail.QueueUpdateExmail;
import com.x.organization.assemble.personal.schedule.DisableExpiredEmpower;
......@@ -24,7 +22,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_organization_assemble_personal());
context.schedule(DisableExpiredEmpower.class, "0 0/20 * * * ?");
context.startQueue(queueUpdateExmail);
} catch (Exception e) {
......
o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.portal.assemble.designer;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_portal_assemble_designer());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.portal.assemble.surface;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_portal_assemble_surface());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_processplatform_assemble_bam/src/main/java/com/x/processplatform/assemble/bam/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.processplatform.assemble.bam;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.processplatform.assemble.bam.jaxrs.period.Period;
import com.x.processplatform.assemble.bam.jaxrs.state.State;
import com.x.processplatform.assemble.bam.schedule.PeriodTimer;
......@@ -24,7 +22,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_bam());
context().scheduleLocal(PeriodTimer.class, 180, 60 * 30);
/* state 运行统计需要读取组织库,如果开始运行的时候组织应用还没启动那么会为空 */
context().scheduleLocal(StateTimer.class, 180, 60 * 60 * 1);
......
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.processplatform.assemble.designer;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
public class ThisApplication {
......@@ -27,7 +25,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_designer());
MessageConnector.start(context());
context().startQueue(projectionExecuteQueue);
context().startQueue(mappingExecuteQueue);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.processplatform.assemble.surface;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.processplatform.assemble.surface.schedule.CleanKeyLock;
......@@ -22,7 +20,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_processplatform_assemble_surface());
context.schedule(CleanKeyLock.class, "2 0/2 * * * ?");
MessageConnector.start(context());
} catch (Exception e) {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionGetWithWorkCompleted.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.data;
import org.apache.commons.lang3.BooleanUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -11,8 +13,6 @@ import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.WorkCompletedControl;
import com.x.processplatform.core.entity.content.WorkCompleted;
import org.apache.commons.lang3.BooleanUtils;
class ActionGetWithWorkCompleted extends BaseAction {
ActionResult<JsonElement> execute(EffectivePerson effectivePerson, String id) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionGetWithWorkCompletedFromData.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.data;
import org.apache.commons.lang3.BooleanUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -11,8 +13,6 @@ import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.WorkCompletedControl;
import com.x.processplatform.core.entity.content.WorkCompleted;
import org.apache.commons.lang3.BooleanUtils;
class ActionGetWithWorkCompletedFromData extends BaseAction {
ActionResult<JsonElement> execute(EffectivePerson effectivePerson, String id) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionGetWithWorkCompletedFromItem.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.data;
import org.apache.commons.lang3.BooleanUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -10,8 +12,6 @@ import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.WorkCompletedControl;
import com.x.processplatform.core.entity.content.WorkCompleted;
import org.apache.commons.lang3.BooleanUtils;
class ActionGetWithWorkCompletedFromItem extends BaseAction {
ActionResult<JsonElement> execute(EffectivePerson effectivePerson, String id) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionUpdateWithWork.java
浏览文件 @ e02c184e
......@@ -9,7 +9,6 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.processplatform.assemble.surface.Business;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionUpdateWithWorkCompletedPath3.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import com.x.base.core.project.jaxrs.WoId;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.assemble.surface.jaxrs.data.ActionUpdateWithWorkCompletedPath2.Wo;
import com.x.processplatform.core.entity.content.WorkCompleted;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionUpdateWithWorkCompletedPath7.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import com.x.base.core.project.jaxrs.WoId;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.assemble.surface.jaxrs.data.ActionUpdateWithWorkCompletedPath5.Wo;
import com.x.processplatform.core.entity.content.WorkCompleted;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/ActionUpdateWithWorkPath6.java
浏览文件 @ e02c184e
......@@ -12,7 +12,6 @@ import com.x.base.core.project.jaxrs.WoId;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.assemble.surface.jaxrs.data.ActionUpdateWithWorkPath4.Wo;
import com.x.processplatform.core.entity.content.Work;
class ActionUpdateWithWorkPath6 extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListMyPaging.java
浏览文件 @ e02c184e
......@@ -9,7 +9,6 @@ import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.core.entity.content.Task;
class ActionListMyPaging extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListNextFilter.java
浏览文件 @ e02c184e
......@@ -2,13 +2,12 @@ package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.List;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.processplatform.assemble.surface.Business;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
......@@ -20,7 +19,7 @@ import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.base.core.project.jaxrs.InTerms;
import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.core.entity.content.Read;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
class ActionListNextFilter extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListPrevFilter.java
浏览文件 @ e02c184e
......@@ -2,13 +2,12 @@ package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.List;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.processplatform.assemble.surface.Business;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
......@@ -20,8 +19,7 @@ import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.base.core.project.jaxrs.InTerms;
import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.assemble.surface.jaxrs.task.ActionListNextFilter.Wi;
import com.x.processplatform.assemble.surface.jaxrs.task.ActionListNextFilter.Wo;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
class ActionListPrevFilter extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListWithWork.java
浏览文件 @ e02c184e
......@@ -11,7 +11,6 @@ import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.exception.ExceptionEntityFieldEmpty;
import com.x.base.core.project.exception.ExceptionEntityNotExist;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListNext.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.ArrayList;
import java.util.List;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
......@@ -9,9 +12,6 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.processplatform.core.entity.content.Task;
import java.util.ArrayList;
import java.util.List;
class ActionManageListNext extends BaseAction {
ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String id, Integer count)
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListNextFilter.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -16,9 +20,6 @@ import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
class ActionManageListNextFilter extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListPrev.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.ArrayList;
import java.util.List;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
......@@ -9,9 +12,6 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.processplatform.core.entity.content.Task;
import java.util.ArrayList;
import java.util.List;
class ActionManageListPrev extends BaseAction {
ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, String id, Integer count)
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListPrevFilter.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -16,9 +20,6 @@ import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
class ActionManageListPrevFilter extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListWithDateHour.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.Date;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
......@@ -13,15 +24,6 @@ import com.x.base.core.project.tools.DateTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.Task_;
import org.apache.commons.lang3.BooleanUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.Date;
import java.util.List;
class ActionManageListWithDateHour extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListWithPerson.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.List;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
......@@ -9,10 +14,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Task;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
class ActionManageListWithPerson extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageOpinion.java
浏览文件 @ e02c184e
......@@ -2,10 +2,11 @@ package com.x.processplatform.assemble.surface.jaxrs.task;
import java.util.Objects;
import org.apache.commons.lang3.BooleanUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.exception.ExceptionEntityNotExist;
......@@ -13,15 +14,12 @@ import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Read;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
public class ActionManageOpinion extends BaseAction {
ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManagePress.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.Applications;
......@@ -15,8 +17,6 @@ import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
class ActionManagePress extends BaseAction {
ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageProcessing.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.task;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -16,9 +19,6 @@ import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
class ActionManageProcessing extends BaseAction {
ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessing.java
浏览文件 @ e02c184e
......@@ -27,7 +27,6 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.jaxrs.WrapStringList;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessing2.java
浏览文件 @ e02c184e
......@@ -25,7 +25,6 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.jaxrs.WrapStringList;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessingNeural.java
浏览文件 @ e02c184e
......@@ -14,7 +14,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.base.core.project.logger.Audit;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.neuroph.core.data.DataSet;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Base.java
浏览文件 @ e02c184e
......@@ -10,7 +10,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.processplatform.core.entity.content.*;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -25,6 +24,14 @@ import com.x.base.core.project.tools.DateTools;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.Read;
import com.x.processplatform.core.entity.content.ReadCompleted;
import com.x.processplatform.core.entity.content.Review;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Task_;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkCompleted;
abstract class V2Base extends StandardJaxrsAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
浏览文件 @ e02c184e
......@@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -18,7 +22,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
......@@ -39,10 +42,6 @@ import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapProc
import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapUpdatePrevTaskIdentity;
import com.x.processplatform.core.express.service.processing.jaxrs.taskcompleted.WrapUpdateNextTaskIdentity;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
public class V2Reset extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(V2Reset.class);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java
浏览文件 @ e02c184e
......@@ -5,22 +5,25 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.Applications;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.Unit;
......@@ -30,7 +33,6 @@ import com.x.organization.core.express.Organization;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.core.entity.content.ProcessingType;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
......@@ -38,10 +40,6 @@ import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
class ActionCreate extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(ActionCreate.class);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.Applications;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
......@@ -14,30 +24,21 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.Unit;
import com.x.base.core.project.tools.DefaultCharset;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.SortTools;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.organization.core.express.Organization;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.core.entity.content.*;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
class ActionCreateForce extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java
浏览文件 @ e02c184e
......@@ -5,7 +5,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -19,12 +18,12 @@ import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.Unit;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcessForce.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.Applications;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
......@@ -13,31 +25,22 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.TokenType;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.organization.Unit;
import com.x.base.core.project.tools.DefaultCharset;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.SortTools;
import com.x.base.core.project.Applications;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.organization.core.express.Organization;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.core.entity.content.*;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/*
* 根据应用名称和流程名称进行创建,和直接用process创建基本相同
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionDelete.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.container.EntityManagerContainer;
......@@ -12,11 +9,12 @@ import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.core.entity.content.Work;
import org.apache.commons.lang3.StringUtils;
class ActionDelete extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java
浏览文件 @ e02c184e
......@@ -22,7 +22,6 @@ import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.exception.ExceptionEntityNotExist;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionListCountWithProcess.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
import javax.persistence.Tuple;
import javax.persistence.criteria.*;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -21,7 +22,6 @@ import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.Work_;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
class ActionListCountWithProcess extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionListNextCreatorWithCurrent.java
浏览文件 @ e02c184e
......@@ -2,29 +2,15 @@ package com.x.processplatform.assemble.surface.jaxrs.work;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.base.core.project.jaxrs.InTerms;
import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.assemble.surface.jaxrs.work.ActionListNextWithApplication.Wo;
import com.x.processplatform.assemble.surface.jaxrs.work.ActionListNextWithApplication.WoControl;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkStatus;
import com.x.processplatform.core.entity.element.Application;
class ActionListNextCreatorWithCurrent extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionListNextCreatorWithCurrentFilter.java
浏览文件 @ e02c184e
......@@ -19,7 +19,6 @@ import com.x.base.core.project.jaxrs.EqualsTerms;
import com.x.base.core.project.jaxrs.InTerms;
import com.x.base.core.project.jaxrs.LikeTerms;
import com.x.base.core.project.tools.ListTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.WorkControl;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkStatus;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionManageListCountWithProcess.java
浏览文件 @ e02c184e
......@@ -4,7 +4,11 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.*;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -18,8 +22,6 @@ import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.Work_;
import com.x.processplatform.core.entity.element.Application;
import com.x.processplatform.core.entity.element.Process;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
class ActionManageListCountWithProcess extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionManageListFilterPaging.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.annotation.FieldTypeDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.gson.GsonPropertyObject;
......@@ -15,17 +26,9 @@ import com.x.base.core.project.tools.DateTools;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.core.entity.content.*;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.List;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkStatus;
import com.x.processplatform.core.entity.content.Work_;
class ActionManageListFilterPaging extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2AddSplit.java
浏览文件 @ e02c184e
......@@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -38,10 +42,6 @@ import com.x.processplatform.core.entity.element.util.WorkLogTree.Nodes;
import com.x.processplatform.core.express.ProcessingAttributes;
import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddSplitWi;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
class V2AddSplit extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(V2AddSplit.class);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2ManageRetract.java
浏览文件 @ e02c184e
package com.x.processplatform.assemble.surface.jaxrs.work;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.Applications;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.base.core.project.annotation.ActionLogger;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
......@@ -19,11 +29,14 @@ import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.PropertyTools;
import com.x.base.core.project.tools.StringTools;
import com.x.base.core.project.x_processplatform_service_processing;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.core.entity.content.*;
import com.x.processplatform.core.entity.content.Record;
import com.x.processplatform.core.entity.content.RecordProperties.NextManual;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.element.Activity;
import com.x.processplatform.core.entity.element.ActivityType;
import com.x.processplatform.core.entity.element.Application;
......@@ -33,14 +46,6 @@ import com.x.processplatform.core.entity.element.util.WorkLogTree.Node;
import com.x.processplatform.core.entity.element.util.WorkLogTree.Nodes;
import com.x.processplatform.core.express.ProcessingAttributes;
import com.x.processplatform.core.express.service.processing.jaxrs.work.V2RetractWi;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
class V2ManageRetract extends BaseAction {
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java
浏览文件 @ e02c184e
......@@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......@@ -18,7 +22,6 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
......@@ -38,10 +41,6 @@ import com.x.processplatform.core.entity.element.ActivityType;
import com.x.processplatform.core.express.ProcessingAttributes;
import com.x.processplatform.core.express.service.processing.jaxrs.work.V2RerouteWi;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
class V2Reroute extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(V2Reroute.class);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Retract.java
浏览文件 @ e02c184e
......@@ -5,7 +5,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import com.x.base.core.project.logger.Audit;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -32,11 +31,11 @@ import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.core.entity.content.Record;
import com.x.processplatform.core.entity.content.RecordProperties.NextManual;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.content.RecordProperties.NextManual;
import com.x.processplatform.core.entity.element.Activity;
import com.x.processplatform.core.entity.element.ActivityType;
import com.x.processplatform.core.entity.element.Manual;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Rollback.java
浏览文件 @ e02c184e
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -24,16 +21,17 @@ import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
import com.x.base.core.project.jaxrs.WrapBoolean;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.base.core.project.tools.StringTools;
import com.x.processplatform.assemble.surface.Business;
import com.x.processplatform.assemble.surface.ThisApplication;
import com.x.processplatform.core.entity.content.Record;
import com.x.processplatform.core.entity.content.RecordProperties.NextManual;
import com.x.processplatform.core.entity.content.Task;
import com.x.processplatform.core.entity.content.TaskCompleted;
import com.x.processplatform.core.entity.content.Work;
import com.x.processplatform.core.entity.content.WorkLog;
import com.x.processplatform.core.entity.content.RecordProperties.NextManual;
import com.x.processplatform.core.express.ProcessingAttributes;
import com.x.processplatform.core.express.service.processing.jaxrs.work.V2RollbackWi;
......
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ThisApplication.java
浏览文件 @ e02c184e
......@@ -5,7 +5,6 @@ import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.message.MessageConnector;
import com.x.processplatform.service.processing.processor.embed.SyncEmbedQueue;
import com.x.processplatform.service.processing.processor.invoke.SyncJaxrsInvokeQueue;
......@@ -46,7 +45,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_processplatform_service_processing());
MessageConnector.start(context());
context().startQueue(syncJaxrsInvokeQueue);
context().startQueue(syncJaxwsInvokeQueue);
......
o2server/x_program_center/src/main/java/com/x/program/center/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,15 +2,11 @@ package com.x.program.center;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.x.base.core.project.cache.CacheManager;
import org.apache.commons.lang3.BooleanUtils;
import com.google.gson.internal.LinkedTreeMap;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.program.center.schedule.Area;
import com.x.program.center.schedule.Cleanup;
import com.x.program.center.schedule.CleanupCode;
......@@ -22,7 +18,6 @@ import com.x.program.center.schedule.DingdingSyncOrganizationTrigger;
import com.x.program.center.schedule.FireSchedule;
import com.x.program.center.schedule.QiyeweixinSyncOrganization;
import com.x.program.center.schedule.QiyeweixinSyncOrganizationTrigger;
import com.x.program.center.schedule.RefreshApplications;
import com.x.program.center.schedule.TriggerAgent;
import com.x.program.center.schedule.WeLinkSyncOrganization;
import com.x.program.center.schedule.WeLinkSyncOrganizationTrigger;
......@@ -56,11 +51,8 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_program_center());
/* 20190927新报告机制 */
context().startQueue(centerQueue);
context().startQueue(logQueue);
/* 政务钉钉拉入同步 */
if (BooleanUtils.isTrue(Config.zhengwuDingding().getEnable())) {
/* 启动同步任务 */
......
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.query.assemble.designer;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
public class ThisApplication {
......@@ -20,7 +18,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_query_assemble_designer());
} catch (Exception e) {
e.printStackTrace();
}
......
o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/ThisApplication.java
浏览文件 @ e02c184e
......@@ -2,8 +2,6 @@ package com.x.query.assemble.surface;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.query.assemble.surface.queue.QueueImportData;
public class ThisApplication {
......@@ -23,7 +21,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_query_assemble_surface());
context().startQueue(queueImportData);
} catch (Exception e) {
e.printStackTrace();
......
o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/ThisApplication.java
浏览文件 @ e02c184e
......@@ -5,7 +5,6 @@ import org.apache.commons.lang3.BooleanUtils;
import com.x.base.core.project.Context;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.query.service.processing.schedule.CrawlCms;
import com.x.query.service.processing.schedule.CrawlWork;
import com.x.query.service.processing.schedule.CrawlWorkCompleted;
......@@ -25,7 +24,6 @@ public class ThisApplication {
public static void init() {
try {
CacheManager.init(context.clazz().getSimpleName());
LoggerFactory.setLevel(Config.logLevel().x_query_service_processing());
if (BooleanUtils.isTrue(Config.query().getCrawlWork().getEnable())) {
context.schedule(CrawlWork.class, Config.query().getCrawlWork().getCron());
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或