Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

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

通知 1
Star 1
Fork 0
o2oa
o2oa

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

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

Merge branch 'fix/console' into 'develop' 

Fix/console 增加了web客户端输入服务器命令执行与上传war、jar包并自动部署v2,去了日志

See merge request o2oa/o2oa!541
上级 d5c149dc 2f4296ac
隐藏空白更改
内联 并排
Showing with 79 addition and 238 deletion
o2server/start_windows_debug.bat
浏览文件 @ a053e42a
......@@ -144,5 +144,5 @@ if exist "%~dp0local\update" (
)
)
@echo on
"%~dp0jvm\windows\bin\java" -server Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
"%~dp0jvm\windows\bin\java" -server -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar "%~dp0console.jar"
pause
\ No newline at end of file
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileUpload.java
浏览文件 @ a053e42a
......@@ -6,7 +6,6 @@ import java.io.OutputStream;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
......@@ -14,10 +13,6 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import com.x.attendance.assemble.common.excel.reader.ExcelReaderUtil;
import com.x.attendance.assemble.common.excel.reader.IRowReader;
import com.x.attendance.assemble.common.excel.reader.ImportExcelReader;
import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionCheckImportData;
import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionEmptyExtension;
import com.x.attendance.assemble.control.jaxrs.attachment.exception.ExceptionGetFileName;
import com.x.attendance.assemble.control.jaxrs.fileimport.exception.ExceptionFileImportProcess;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.entity.AttendanceImportFileInfo;
import com.x.base.core.container.EntityManagerContainer;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceadmin;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceadmin;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
import com.x.attendance.entity.AttendanceAdmin;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionListAll.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
import com.x.attendance.entity.AttendanceAdmin;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionSave.java
浏览文件 @ a053e42a
......@@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
import com.x.attendance.entity.AttendanceAdmin;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceadmin/AttendanceAdminAction.java
浏览文件 @ a053e42a
......@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendanceadmin.exception.ExceptionAttendanceAdminProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealArchive.java
浏览文件 @ a053e42a
......@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealAudit.java
浏览文件 @ a053e42a
......@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCheck.java
浏览文件 @ a053e42a
......@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealCreate.java
浏览文件 @ a053e42a
......@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.AppealConfig;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceDetailNotExists;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
......@@ -14,7 +12,6 @@ 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 org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealProcessFirst.java
浏览文件 @ a053e42a
......@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAppealProcessSecond.java
浏览文件 @ a053e42a
......@@ -8,9 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealNotExists;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionPersonHasNoUnit;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAttendanceDetailAppeal.java
浏览文件 @ a053e42a
......@@ -10,8 +10,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.AppealConfig;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceDetailNotExists;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionAttendanceDetailArchive.java
浏览文件 @ a053e42a
......@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceappealinfo;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.attendance.entity.AttendanceAppealInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceappealinfo/AttendanceAppealInfoAction.java
浏览文件 @ a053e42a
......@@ -16,7 +16,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendanceappealinfo.exception.ExceptionAttendanceAppealProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionAnalyseAttendanceDetail.java
浏览文件 @ a053e42a
......@@ -4,10 +4,6 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
import com.x.attendance.entity.AttendanceDetail;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.attendance.entity.AttendanceWorkDayConfig;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionAnalyseAttendanceDetails.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.assemble.control.processor.sender.SenderForAnalyseData;
import com.x.attendance.entity.AttendanceStatisticalCycle;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionArchiveAttendanceDetail.java
浏览文件 @ a053e42a
......@@ -3,8 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionCheckWithPersonByCycle.java
浏览文件 @ a053e42a
......@@ -4,10 +4,6 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionCycleMonthEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionCycleYearEmpty;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.assemble.control.processor.sender.SenderForSupplementData;
import com.x.attendance.entity.AttendanceEmployeeConfig;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionDeleteMobile.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetaillMobileNotExists;
import com.x.attendance.entity.AttendanceDetailMobile;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailNotExists;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionGetMobile.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancedetail;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetailMobileIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionDetaillMobileNotExists;
import com.x.attendance.entity.AttendanceDetailMobile;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListImportByFileName.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionFileIdEmpty;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java
浏览文件 @ a053e42a
......@@ -5,14 +5,10 @@ import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionQueryParameterEmpty;
import com.x.attendance.entity.AttendanceDetailMobile;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListNextWithFilter.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListPrevWithFilter.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithEmployee.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithFilter.java
浏览文件 @ a053e42a
......@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithTopUnit.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListWithUnit.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendance.java
浏览文件 @ a053e42a
......@@ -9,9 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionPersonNameEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionRecordDateEmpty;
import com.x.attendance.entity.AttendanceDetail;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.attendance.entity.AttendanceSelfHoliday;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java
浏览文件 @ a053e42a
......@@ -10,11 +10,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAddressEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionLatitudeEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionLongitudeEmpty;
import com.x.attendance.entity.AttendanceDetail;
import com.x.attendance.entity.AttendanceDetailMobile;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.http.ActionResult;
......@@ -129,10 +124,7 @@ public class ActionReciveAttendanceMobile extends BaseAction {
if( check ){
//对该员工的所有移动考勤数据进行一个整合
attendanceDetailServiceAdv.pushToDetail( currentPerson.getDistinguishedName(), attendanceDetailMobile.getRecordDateString() );
}
return result;
}
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/AttendanceDetailAction.java
浏览文件 @ a053e42a
......@@ -17,7 +17,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancedetail/AttendanceDetailMobileAction.java
浏览文件 @ a053e42a
......@@ -17,7 +17,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigNotExists;
import com.x.attendance.entity.AttendanceEmployeeConfig;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionConfigNotExists;
import com.x.attendance.entity.AttendanceEmployeeConfig;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionListAll.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.entity.AttendanceEmployeeConfig;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/ActionSave.java
浏览文件 @ a053e42a
......@@ -6,7 +6,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.entity.AttendanceEmployeeConfig;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceemployeeconfig/AttendanceEmployeeConfigAction.java
浏览文件 @ a053e42a
......@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionDelete.java
浏览文件 @ a053e42a
......@@ -3,12 +3,7 @@ package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
import java.io.File;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionFileIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionImportFileNotExists;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.entity.AttendanceImportFileInfo;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionGet.java
浏览文件 @ a053e42a
......@@ -2,10 +2,6 @@ package com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionFileIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionImportFileNotExists;
import com.x.attendance.entity.AttendanceImportFileInfo;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/ActionListAll.java
浏览文件 @ a053e42a
......@@ -8,8 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.Gson;
import com.x.attendance.assemble.control.jaxrs.attendanceemployeeconfig.exception.ExceptionAttendanceEmployeeProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
import com.x.attendance.assemble.control.processor.monitor.StatusImportFileDetail;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.entity.AttendanceImportFileInfo;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceimportfileinfo/AttendanceImportFileInfoAction.java
浏览文件 @ a053e42a
......@@ -13,8 +13,6 @@ import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.x.attendance.assemble.control.jaxrs.attendanceimportfileinfo.exception.ExceptionAttendanceImportFileProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNotExists;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNotExists;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListAll.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListByTopUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNameEmpty;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionListByUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleNameEmpty;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/ActionSave.java
浏览文件 @ a053e42a
......@@ -6,9 +6,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionCanNotFindUnitWithUnitName;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionScheduleUnitEmpty;
import com.x.attendance.entity.AttendanceScheduleSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceschedulesetting/AttendanceScheduleSettingAction.java
浏览文件 @ a053e42a
......@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendanceschedulesetting.exception.ExceptionAttendanceScheduleProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionDelete.java
浏览文件 @ a053e42a
......@@ -3,10 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancesetting;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingIdEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingNotExists;
import com.x.attendance.entity.AttendanceSetting;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancesetting;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingIdEmpty;
import com.x.attendance.entity.AttendanceSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionGetWithCode.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancesetting;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingCodeEmpty;
import com.x.attendance.entity.AttendanceSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionListAll.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.attendance.entity.AttendanceSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/ActionSave.java
浏览文件 @ a053e42a
......@@ -6,9 +6,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingCodeEmpty;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionSettingNameEmpty;
import com.x.attendance.entity.AttendanceSetting;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancesetting/AttendanceSettingAction.java
浏览文件 @ a053e42a
......@@ -16,7 +16,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStForPersonInUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticPersonForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStForPersonInUnitSubNested.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticPersonForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStForUnitInTopUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionTopUnitNameEmpty;
import com.x.attendance.entity.StatisticUnitForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStdForTopUnit.java
浏览文件 @ a053e42a
......@@ -3,9 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancestatistic;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionTopUnitNameEmpty;
import com.x.attendance.entity.StatisticTopUnitForDay;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStdForUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticUnitForDay;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStmForPerson.java
浏览文件 @ a053e42a
......@@ -3,9 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancestatistic;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionPersonNameEmpty;
import com.x.attendance.entity.StatisticPersonForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStmForTopUnit.java
浏览文件 @ a053e42a
......@@ -3,9 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancestatistic;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionTopUnitNameEmpty;
import com.x.attendance.entity.StatisticTopUnitForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStmForUnit.java
浏览文件 @ a053e42a
......@@ -3,9 +3,6 @@ package com.x.attendance.assemble.control.jaxrs.attendancestatistic;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticUnitForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionShowStmForUnitSubnested.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticUnitForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/ActionSumStForUnit.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionAttendanceStatisticProcess;
import com.x.attendance.assemble.control.jaxrs.attendancestatistic.exception.ExceptionQueryStatisticUnitNameEmpty;
import com.x.attendance.entity.StatisticUnitForMonth;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/AttendanceStatisticAction.java
浏览文件 @ a053e42a
......@@ -9,9 +9,6 @@ import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.http.ActionResult;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatistic/AttendanceStatisticShowAction.java
浏览文件 @ a053e42a
......@@ -15,7 +15,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.jaxrs.attendancesetting.exception.ExceptionAttendanceSettingProcess;
import com.x.base.core.project.annotation.JaxrsDescribe;
import com.x.base.core.project.annotation.JaxrsMethodDescribe;
import com.x.base.core.project.annotation.JaxrsParameterDescribe;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionCycleDetail.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle;
import com.alibaba.druid.util.StringUtils;
import com.x.attendance.assemble.control.exception.PersonHasNoIdentityException;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle.exception.*;
import com.x.attendance.assemble.control.service.AttendanceStatisticalCycleServiceAdv;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.entity.JpaObject;
......@@ -54,7 +52,7 @@ public class ActionCycleDetail extends BaseAction {
Exception exception = new ExceptionCanNotFindTopUnitNameByPerson( effectivePerson.getDistinguishedName());
result.error(exception);
}
} catch (PersonHasNoIdentityException e) {
} catch (ExceptionPersonHasNoIdentity e) {
check = false;
result.error(e);
logger.error(e, effectivePerson, request, null);
......@@ -73,7 +71,7 @@ public class ActionCycleDetail extends BaseAction {
Exception exception = new ExceptionCanNotFindUnitNameByPerson( effectivePerson.getDistinguishedName());
result.error(exception);
}
} catch (PersonHasNoIdentityException e) {
} catch (ExceptionPersonHasNoIdentity e) {
check = false;
result.error(e);
logger.error(e, effectivePerson, request, null);
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle.exception.ExceptionStatisticCycleNotExists;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle.exception.ExceptionStatisticCycleProcess;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionSave.java
浏览文件 @ a053e42a
......@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticalcycle.exception.ExceptionStatisticCycleProcess;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatisticrequirelog/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendancestatisticrequirelog;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticrequirelog.exception.ExceptionStatisticRequireNotExists;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticrequirelog.exception.ExceptionStatisticRequireProcess;
import com.x.attendance.entity.AttendanceStatisticRequireLog;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendancestatisticrequirelog/ActionSave.java
浏览文件 @ a053e42a
......@@ -4,7 +4,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendancestatisticrequirelog.exception.ExceptionStatisticRequireProcess;
import com.x.attendance.entity.AttendanceStatisticRequireLog;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.attendanceworkdayconfig;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.attendanceworkdayconfig.exception.ExceptionWorkDayConfigNotExists;
import com.x.attendance.assemble.control.jaxrs.attendanceworkdayconfig.exception.ExceptionWorkDayConfigProcess;
import com.x.attendance.entity.AttendanceWorkDayConfig;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionSave.java
浏览文件 @ a053e42a
......@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.attendanceworkdayconfig.exception.ExceptionWorkDayConfigProcess;
import com.x.attendance.entity.AttendanceWorkDayConfig;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/fileimport/ActionCheckDataImportFile.java
浏览文件 @ a053e42a
......@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.common.excel.reader.ExcelReaderUtil;
import com.x.attendance.assemble.common.excel.reader.IRowReader;
import com.x.attendance.assemble.common.excel.reader.ImportExcelReader;
import com.x.attendance.assemble.control.jaxrs.fileimport.exception.ExceptionFileImportProcess;
import com.x.attendance.assemble.control.processor.monitor.StatusImportFileDetail;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
import com.x.attendance.entity.AttendanceImportFileInfo;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/fileimport/ActionImportDateInFile.java
浏览文件 @ a053e42a
......@@ -7,8 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.jaxrs.DateRecord;
import com.x.attendance.assemble.control.jaxrs.fileimport.exception.ExceptionDataCacheNotExists;
import com.x.attendance.assemble.control.jaxrs.fileimport.exception.ExceptionFileImportProcess;
import com.x.attendance.assemble.control.processor.EntityImportDataDetail;
import com.x.attendance.assemble.control.processor.monitor.StatusImportFileDetail;
import com.x.attendance.assemble.control.processor.monitor.StatusSystemImportOpt;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDelete.java
浏览文件 @ a053e42a
......@@ -4,9 +4,6 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayNotExists;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayProcess;
import com.x.attendance.entity.AttendanceSelfHoliday;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.container.EntityManagerContainer;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java
浏览文件 @ a053e42a
......@@ -6,7 +6,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayProcess;
import com.x.attendance.entity.AttendanceSelfHoliday;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.container.EntityManagerContainer;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionListNextWithFilter.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayProcess;
import com.x.attendance.entity.AttendanceSelfHoliday;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionListPrevWithFilter.java
浏览文件 @ a053e42a
......@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayProcess;
import com.x.attendance.entity.AttendanceSelfHoliday;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionSave.java
浏览文件 @ a053e42a
......@@ -2,7 +2,6 @@ package com.x.attendance.assemble.control.jaxrs.selfholiday;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.selfholiday.exception.ExceptionSelfHolidayProcess;
import com.x.attendance.entity.AttendanceSelfHoliday;
import com.x.attendance.entity.AttendanceStatisticalCycle;
import com.x.base.core.container.EntityManagerContainer;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/workplace/ActionDelete.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.workplace;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceIdEmpty;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceProcess;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/workplace/ActionGet.java
浏览文件 @ a053e42a
package com.x.attendance.assemble.control.jaxrs.workplace;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceProcess;
import com.x.attendance.entity.AttendanceWorkPlace;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/workplace/ActionListAll.java
浏览文件 @ a053e42a
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceProcess;
import com.x.attendance.entity.AttendanceWorkPlace;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/workplace/ActionSave.java
浏览文件 @ a053e42a
......@@ -6,10 +6,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.attendance.assemble.control.ExceptionWrapInConvert;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionLatitudeEmpty;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionLongitudeEmpty;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceNameEmpty;
import com.x.attendance.assemble.control.jaxrs.workplace.exception.ExceptionWorkPlaceProcess;
import com.x.attendance.entity.AttendanceWorkPlace;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.bean.WrapCopier;
......
o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/service/AttendanceDetailServiceAdv.java
浏览文件 @ a053e42a
......@@ -8,7 +8,6 @@ import org.apache.commons.lang3.StringUtils;
import com.x.attendance.assemble.common.date.DateOperation;
import com.x.attendance.assemble.control.Business;
import com.x.attendance.assemble.control.jaxrs.attendancedetail.exception.ExceptionAttendanceDetailProcess;
import com.x.attendance.entity.AttendanceDetail;
import com.x.attendance.entity.AttendanceDetailMobile;
import com.x.attendance.entity.AttendanceEmployeeConfig;
......
o2server/x_console/src/main/java/com/x/server/console/Main.java
浏览文件 @ a053e42a
......@@ -126,9 +126,12 @@ public class Main {
}
}
}.start();
/* 启动NodeAgent */
if (BooleanUtils.isTrue(Config.currentNode().nodeAgentEnable())) {
NodeAgent nodeAgent = new NodeAgent();
nodeAgent.setCommandQueue(commandQueue);
nodeAgent.setDaemon(true);
nodeAgent.start();
}
......
o2server/x_console/src/main/java/com/x/server/console/NodeAgent.java
浏览文件 @ a053e42a
......@@ -5,6 +5,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -46,11 +47,25 @@ public class NodeAgent extends Thread {
public static final Pattern upload_resource_pattern = Pattern.compile("^uploadResource:(.+)$", Pattern.CASE_INSENSITIVE);
public static final Pattern read_log_pattern = Pattern.compile("^readLog:(.+)$", Pattern.CASE_INSENSITIVE);
public static final Pattern execute_command_pattern = Pattern.compile("^command:(.+)$", Pattern.CASE_INSENSITIVE);
public static final int LOG_MAX_READ_SIZE = 6 * 1024;
private static final int BUFFER_SIZE = 1024*1024*1000;
private LinkedBlockingQueue<String> commandQueue;
private FileOutputStream fos;
public LinkedBlockingQueue<String> getCommandQueue() {
return commandQueue;
}
public void setCommandQueue(LinkedBlockingQueue<String> commandQueue) {
this.commandQueue = commandQueue;
}
@Override
public void run() {
try (ServerSocket serverSocket = new ServerSocket(Config.currentNode().nodeAgentPort())) {
......@@ -59,12 +74,10 @@ public class NodeAgent extends Thread {
try (Socket socket = serverSocket.accept()) {
try (DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
DataInputStream dis = new DataInputStream(socket.getInputStream())) {
//String json = dis.readUTF();
final char[] data = new char[BUFFER_SIZE];
final BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
final int len = br.read(data);
final String json = String.valueOf(data, 0, len);
String json = dis.readUTF();
//logger.info("receive socket json={}",json);
CommandObject commandObject = XGsonBuilder.instance().fromJson(json, CommandObject.class);
if (BooleanUtils.isTrue(Config.currentNode().nodeAgentEncrypt())) {
String decrypt = Crypto.rsaDecrypt(commandObject.getCredential(), Config.privateKey());
......@@ -74,16 +87,50 @@ public class NodeAgent extends Thread {
continue;
}
}
matcher = redeploy_pattern.matcher(commandObject.getCommand());
if (matcher.find()) {
byte[] bytes = Base64.decodeBase64(commandObject.getBody());
String result = this.redeploy(matcher.group(1), bytes);
dos.writeUTF(result);
dos.flush();
String strCommand = commandObject.getCommand();
strCommand = strCommand.trim();
strCommand = strCommand.substring(strCommand.indexOf(":")+1, strCommand.length());
logger.info("收接到命令:"+strCommand);
String filename = dis.readUTF();
File tempFile = null;
switch (strCommand) {
case "storeWar":
tempFile = Config.dir_store();
break;
case "storeJar":
tempFile = Config.dir_store_jars();
break;
case "customWar":
tempFile = Config.dir_custom();
break;
case "customJar":
tempFile = Config.dir_custom_jars();
break;
}
FileTools.forceMkdir(tempFile);
logger.info("文件名path:"+tempFile.getAbsolutePath()+ File.separator + filename);
File file = new File(tempFile.getAbsolutePath()+ File.separator + filename);
fos = new FileOutputStream(file);
byte[] bytes = new byte[1024];
int length =0;
while((length = dis.read(bytes, 0, bytes.length)) != -1) {
fos.write(bytes, 0, length);
fos.flush();
}
fos.close();
bytes = IOUtils.xxxx(file);
filename = filename.substring(0,filename.lastIndexOf("."));
//部署
String result = this.redeploy(filename, bytes);
logger.info("部署:"+result);
continue;
}
matcher = upload_resource_pattern.matcher(commandObject.getCommand());
if (matcher.find()) {
int fileLength = dis.readInt();
......@@ -114,6 +161,17 @@ public class NodeAgent extends Thread {
continue;
}
matcher = execute_command_pattern.matcher(commandObject.getCommand());
if (matcher.find()) {
String strCommand = commandObject.getCommand();
strCommand = strCommand.trim();
strCommand = strCommand.substring(strCommand.indexOf(":")+1, strCommand.length());
logger.info("收接到命令:"+strCommand);
commandQueue.add(strCommand);
continue;
}
dos.writeUTF("failure:no pattern method!");
dos.flush();
......@@ -228,8 +286,6 @@ public class NodeAgent extends Thread {
FileTools.forceMkdir(dist);
}
List<String> subs = new ArrayList<>();
subs.add("x_");
subs.add("o2_");
JarTools.unjar(zipFile, subs, dist, asNew);
FileUtils.cleanDirectory(tempFile);
......
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/ActionApplication.java
浏览文件 @ a053e42a
......@@ -15,6 +15,7 @@ import com.x.program.center.jaxrs.captcha.CaptchaAction;
import com.x.program.center.jaxrs.center.CenterAction;
import com.x.program.center.jaxrs.code.CodeAction;
import com.x.program.center.jaxrs.collect.CollectAction;
import com.x.program.center.jaxrs.command.CommandAction;
import com.x.program.center.jaxrs.config.ConfigAction;
import com.x.program.center.jaxrs.datastructure.DataStructureAction;
import com.x.program.center.jaxrs.dingding.DingdingAction;
......@@ -49,6 +50,7 @@ public class ActionApplication extends AbstractActionApplication {
classes.add(PromptErrorLogAction.class);
classes.add(UnexpectedErrorLogAction.class);
classes.add(WarnLogAction.class);
classes.add(CommandAction.class);
classes.add(JestAction.class);
classes.add(ModuleAction.class);
classes.add(PmsAction.class);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或