From ffccc7d9c48692fb3a621686deb0b1f36746d478 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Thu, 25 Apr 2019 19:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=B1=BB?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/bean/DataSourceConfig.java | 15 ------ .../bean/DataSourceConfigDruid.java | 30 ----------- .../gateway/datasource/package-info.java | 6 --- .../filter/bean/FilterConfigBackup.java | 26 ---------- .../filter/bean/FilterConfigCompress.java | 26 ---------- .../bean/FilterConfigDataBusSender.java | 37 ------------- .../bean/FilterConfigDecMsgToDataBus.java | 37 ------------- .../filter/bean/FilterConfigDecompress.java | 25 --------- .../bean/FilterConfigEncryptDecrypt.java | 23 -------- .../filter/bean/FilterConfigOracleSqlldr.java | 30 ----------- .../bean/FilterConfigXibFileToDataBus.java | 34 ------------ .../filter/bean/FilterConfigXibToDataBus.java | 26 ---------- .../filter/bean/FilterConfigXmlMsgToDb.java | 26 ---------- .../gateway/filter/enums/CryptosEnum.java | 25 --------- .../gateway/filter/enums/StrategyEnum.java | 16 ------ .../gateway/quartz/enums/QuartzTypeEnum.java | 16 ------ .../receiver/bean/ReceiverConfigDataBus.java | 31 ----------- .../receiver/bean/ReceiverConfigEmail.java | 41 --------------- .../receiver/bean/ReceiverConfigFs.java | 52 ------------------- .../receiver/bean/ReceiverConfigFsSplit.java | 50 ------------------ .../receiver/bean/ReceiverConfigIbmMq.java | 34 ------------ .../receiver/bean/ReceiverConfigJms.java | 35 ------------- .../receiver/bean/ReceiverConfigKafka.java | 37 ------------- .../receiver/bean/ReceiverConfigMq.java | 34 ------------ .../receiver/bean/ReceiverConfigRabbitMq.java | 42 --------------- .../receiver/bean/ReceiverConfigRocketMq.java | 30 ----------- .../gateway/route/bean/SenderConfigEmail.java | 38 -------------- .../gateway/route/bean/SenderConfigFs.java | 36 ------------- .../gateway/route/bean/SenderConfigFtp.java | 41 --------------- .../gateway/route/bean/SenderConfigIbmMq.java | 38 -------------- .../gateway/route/bean/SenderConfigJms.java | 34 ------------ .../gateway/route/bean/SenderConfigKafka.java | 34 ------------ .../gateway/route/bean/SenderConfigMq.java | 31 ----------- .../route/bean/SenderConfigRabbitMq.java | 47 ----------------- .../route/bean/SenderConfigRocketMq.java | 36 ------------- .../gateway/route/bean/SenderConfigSftp.java | 36 ------------- .../gateway/route/enums/EmailMethod.java | 23 -------- .../GatewayConfToolController.java | 2 +- .../GatewayConfToolTaskViewController.java | 14 ++--- .../GatewayConfToolService.java | 2 +- .../GatewayConfToolServiceViewService.java | 4 +- .../GatewayConfToolTaskViewService.java | 8 +-- .../gateway/entity/TaskConfig.java | 11 ++-- .../gateway/filter/bean/FilterConfig.java | 2 +- .../receiver/bean/ReceiverConfigFtp.java | 14 +++-- .../receiver/bean/ReceiverConfigSftp.java | 4 +- .../receiver/entity/ReceiverConfig.java | 2 +- .../gateway/route/entity/SenderConfig.java | 2 +- 48 files changed, 35 insertions(+), 1208 deletions(-) delete mode 100644 src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfig.java delete mode 100644 src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfigDruid.java delete mode 100644 src/main/java/com/easipass/gateway/datasource/package-info.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigBackup.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigCompress.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigDataBusSender.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecMsgToDataBus.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecompress.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigEncryptDecrypt.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigOracleSqlldr.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibFileToDataBus.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibToDataBus.java delete mode 100644 src/main/java/com/easipass/gateway/filter/bean/FilterConfigXmlMsgToDb.java delete mode 100644 src/main/java/com/easipass/gateway/filter/enums/CryptosEnum.java delete mode 100644 src/main/java/com/easipass/gateway/filter/enums/StrategyEnum.java delete mode 100644 src/main/java/com/easipass/gateway/quartz/enums/QuartzTypeEnum.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigDataBus.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigEmail.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFs.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFsSplit.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigIbmMq.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigJms.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigKafka.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigMq.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRabbitMq.java delete mode 100644 src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRocketMq.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigEmail.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigFs.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigFtp.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigIbmMq.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigJms.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigKafka.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigMq.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigRabbitMq.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigRocketMq.java delete mode 100644 src/main/java/com/easipass/gateway/route/bean/SenderConfigSftp.java delete mode 100644 src/main/java/com/easipass/gateway/route/enums/EmailMethod.java rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/entity/TaskConfig.java (75%) rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/filter/bean/FilterConfig.java (83%) rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/receiver/bean/ReceiverConfigFtp.java (77%) rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/receiver/bean/ReceiverConfigSftp.java (93%) rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/receiver/entity/ReceiverConfig.java (82%) rename src/main/java/com/{easipass => xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool}/gateway/route/entity/SenderConfig.java (82%) diff --git a/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfig.java b/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfig.java deleted file mode 100644 index 70bc7b03..00000000 --- a/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.easipass.gateway.datasource.bean; - -import java.io.Serializable; -/** - * @ClassName: DataSourceConfig - * @Description: 数据源配置 - * @author: xufeng - * @date: 2018/12/6 17:15 - */ - -public interface DataSourceConfig extends Serializable { - String getId(); - void setId(String id); - boolean isEnable();//是否开启 -} diff --git a/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfigDruid.java b/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfigDruid.java deleted file mode 100644 index 1f95c5f5..00000000 --- a/src/main/java/com/easipass/gateway/datasource/bean/DataSourceConfigDruid.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.easipass.gateway.datasource.bean; - -import lombok.Data; - -@Data -public class DataSourceConfigDruid implements DataSourceConfig { - private String id;//获取数据源时唯一标识，全局不能重复 - private boolean enable = true;//是否开启 - - private String url;//数据库连接url - private String username;//用户名 - private String password;//密码 - private boolean decrypt = false;//是否使用加密 - private String publicKey;//加密公钥 - private String driverClassName = "oracle.jdbc.OracleDriver"; - private int initialSize = 5; - private int minIdle = 5; - private int maxActive = 30; - private int maxWait = 60000; - private int timeBetweenEvictionRunsMillis = 60000; - private int minEvictableIdleTimeMillis = 30000; - private String validationQuery = "SELECT 1 FROM DUAL"; - private boolean testWhileIdle = true; - private boolean testOnBorrow = false; - private boolean testOnReturn = false; - private boolean poolPreparedStatements = true; - private int maxPoolPreparedStatementPerConnectionSize = 20; - private String filters = "stat,wall,slf4"; - private String connectionProperties = "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"; -} diff --git a/src/main/java/com/easipass/gateway/datasource/package-info.java b/src/main/java/com/easipass/gateway/datasource/package-info.java deleted file mode 100644 index 596c752c..00000000 --- a/src/main/java/com/easipass/gateway/datasource/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.easipass.gateway.datasource; -/** - * @Description: 数据源管理 - * @author: xufeng - * @date: 2018/12/6 17:09 - */ diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigBackup.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigBackup.java deleted file mode 100644 index e300bc91..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigBackup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import com.easipass.gateway.filter.enums.StrategyEnum; -import lombok.Data; - -/** - * @ClassName: FilterConfigBackup - * @Description: 消息备份操作配置 - * @author: xufeng - * @date: 2018/5/28 16:34 - */ -@Data -public class FilterConfigBackup implements FilterConfig { - private String serviceName = "filterBackup";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - - private String path;//备份目录 - private String tmpPath;//备份缓冲路径(留空为不使用缓冲目录) - private boolean createPathFlag = false;//是否自动创建目录 - private String fileNameVar;//文件名模版 - private String strategy = StrategyEnum.direct.name();//文件目录策略（direct、day、hour、day_hour） - private boolean overload = false;//是否覆盖重名文件 -} \ No newline at end of file diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigCompress.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigCompress.java deleted file mode 100644 index f81e53d6..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigCompress.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigCompress - * @Description: 消息压缩操作配置 - * @author: xufeng - * @date: 2018/6/26 14:28 - */ - -@Data -public class FilterConfigCompress implements FilterConfig { - private String serviceName = "filterCompress";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = false;//是否发生异常时退出任务 - - private boolean isAddPostfixName = true;//是否添加压缩后缀名 - private String method = "zip";//压缩类型 - private Map args = new HashMap(); -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDataBusSender.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDataBusSender.java deleted file mode 100644 index 09c9124c..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDataBusSender.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigDataBusSender - * @Description: 数据总线发送配置 - * @author: xufeng - * @date: 2018/5/30 17:18 - */ - -@Data -public class FilterConfigDataBusSender implements FilterConfig { - private String serviceName = "filterDataBusSender";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String topic; - - private String sender;//发送方 - private String receiver;//接收方 - private String appCode;//应用标识 - private String type;//消息类型标识 被包装报文的类型（xml、ediflat等），这个应该在DBus中备案。 - private String format;//消息遵循的标准体系标识。例如EDIFLAT，EDIFACT等。这个标识需要在DBus中备案。 - private String version;//封套消息格式版本(用于标识封套自己的格式版本，非被封装报文和消息的版本。当前为1.0,非必填，默认为1.0。) - private String encoding;//需要与报文内容编码一致（留空则默认取msg中encoding） - private String mimeType = "text/plain";//报文媒体类型 - - private String plogType;//应用消息处理类型 - private String plogInfo;//应用消息处理说明 -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecMsgToDataBus.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecMsgToDataBus.java deleted file mode 100644 index ffd3a0b8..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecMsgToDataBus.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigDecMsgToDataBus - * @Description: 报关单传输发送配置 - * @author: xufeng - * @date: 2018/5/30 17:18 - */ - -@Data -public class FilterConfigDecMsgToDataBus implements FilterConfig { - private String serviceName = "filterDecMsgToDataBus";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String topic; - - private String sender;//发送方 - private String receiver;//接收方 - private String appCode;//应用标识 - private String type;//消息类型标识 被包装报文的类型（xml、ediflat等），这个应该在DBus中备案。 - private String format;//消息遵循的标准体系标识。例如EDIFLAT，EDIFACT等。这个标识需要在DBus中备案。 - private String version;//封套消息格式版本(用于标识封套自己的格式版本，非被封装报文和消息的版本。当前为1.0,非必填，默认为1.0。) - private String encoding;//需要与报文内容编码一致（留空则默认取msg中encoding） - private String mimeType = "text/plain";//报文媒体类型 - - private String plogType;//应用消息处理类型 - private String plogInfo;//应用消息处理说明 -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecompress.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecompress.java deleted file mode 100644 index cc0883ee..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigDecompress.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigDecompress - * @Description: 消息解压操作配置 - * @author: xufeng - * @date: 2018/5/29 16:38 - */ -@Data -public class FilterConfigDecompress implements FilterConfig { - private String serviceName = "filterDecompress";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = false;//是否发生异常时退出任务 - - private String method = "zip";//解压类型 - private String encoding; //文件编码 - private Map args = new HashMap(); -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigEncryptDecrypt.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigEncryptDecrypt.java deleted file mode 100644 index 04e1c477..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigEncryptDecrypt.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import com.easipass.gateway.filter.enums.CryptosEnum; -import lombok.Data; - -/** - * @ClassName: FilterConfigEncryptDecrypt - * @Description: 加密解密操作类 - * @author: xufeng - * @date: 2018/5/30 10:44 - */ -@Data -public class FilterConfigEncryptDecrypt implements FilterConfig { - private String serviceName = "filterEncryptDecrypt";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = false;//是否发生异常时退出任务 - - private String encoding = "utf-8";//编码 - private String cryptos = CryptosEnum.Null.name();//加解密算法 - private String actionType = "encrypt";//操作类型（encrypt、decrypt） -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigOracleSqlldr.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigOracleSqlldr.java deleted file mode 100644 index 017b0b21..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigOracleSqlldr.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigOracleSqlldr - * @Description: OracleSqlldr入库配置 - * @author: xufeng - * @date: 2019/2/14 15:39 - */ - -@Data -public class FilterConfigOracleSqlldr implements FilterConfig { - private String serviceName = "filterOracleSqlldr";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String tmpFilePath = "./tmpOracleSqlldrDir/sqlPath/"; - private String username; - private String password; - private String dbServiceName; - private String logPath = "./tmpOracleSqlldrDir/logPath/"; - private String badPath = "./tmpOracleSqlldrDir/badPath/"; -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibFileToDataBus.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibFileToDataBus.java deleted file mode 100644 index f2493c9d..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibFileToDataBus.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigXibFileToDataBus - * @Description: xib生成文件发送至数据总线配置 - * @author: xufeng - * @date: 2019/1/2 17:18 - */ - -@Data -public class FilterConfigXibFileToDataBus implements FilterConfig { - private String serviceName = "filterXibFileToDataBus";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String topic; - - private String appCode;//应用标识 - private String format;//消息遵循的标准体系标识。例如EDIFLAT，EDIFACT等。这个标识需要在DBus中备案。 - private String version;//封套消息格式版本(用于标识封套自己的格式版本，非被封装报文和消息的版本。当前为1.0,非必填，默认为1.0。) - private String encoding;//需要与报文内容编码一致（留空则默认取msg中encoding） - private String mimeType = "text/plain";//报文媒体类型 - - private String plogType;//应用消息处理类型 - private String plogInfo;//应用消息处理说明 -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibToDataBus.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibToDataBus.java deleted file mode 100644 index 02a392b6..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXibToDataBus.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FilterConfigXibToDataBus - * @Description: xib封套发送至数据总线 - * @author: xufeng - * @date: 2018/8/8 19:24 - */ - - -@Data -public class FilterConfigXibToDataBus implements FilterConfig { - private String serviceName = "filterXibToDataBus";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String topic; -} diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXmlMsgToDb.java b/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXmlMsgToDb.java deleted file mode 100644 index 6d52cf20..00000000 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfigXmlMsgToDb.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.easipass.gateway.filter.bean; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @program: gatewaySpring - * @author: qqzhang - * @create: 2018-12-07 09:54 - * @description: xml入库 - */ - -@Deprecated -@Data -public class FilterConfigXmlMsgToDb implements FilterConfig { - private String serviceName = "filterXmlMsgToDb";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - private Map args = new HashMap();//自定义参数 - - private String dataSourceConfigId; -} diff --git a/src/main/java/com/easipass/gateway/filter/enums/CryptosEnum.java b/src/main/java/com/easipass/gateway/filter/enums/CryptosEnum.java deleted file mode 100644 index 4ba4ad1a..00000000 --- a/src/main/java/com/easipass/gateway/filter/enums/CryptosEnum.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.easipass.gateway.filter.enums; - -import org.apache.commons.codec.binary.Base32; - -/** - * @ClassName: CryptosEnum - * @Description: 加密类型 - * @author: xufeng - * @date: 2018/5/30 11:01 - */ - -public enum CryptosEnum { - Null,//不做任何转换 - Ascii, - Base32, - Base64; - public static CryptosEnum getEnum(String name) { - for (CryptosEnum cryptosEnum : CryptosEnum.values()) { - if(cryptosEnum.toString().equalsIgnoreCase(name)){ - return cryptosEnum; - } - } - return null; - } -} diff --git a/src/main/java/com/easipass/gateway/filter/enums/StrategyEnum.java b/src/main/java/com/easipass/gateway/filter/enums/StrategyEnum.java deleted file mode 100644 index f40712e6..00000000 --- a/src/main/java/com/easipass/gateway/filter/enums/StrategyEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.easipass.gateway.filter.enums; - -/** - * @ClassName: StrategyEnum - * @Description: 备份目录策略 - * @author: xufeng - * @date: 2018/5/28 17:28 - */ - -public enum StrategyEnum { - direct//默认目录 - , day//按天分目录 - , hour//按小时分目录 - , day_hour//按天/小时分目录 - , minutes;//按分钟分目录 -} diff --git a/src/main/java/com/easipass/gateway/quartz/enums/QuartzTypeEnum.java b/src/main/java/com/easipass/gateway/quartz/enums/QuartzTypeEnum.java deleted file mode 100644 index d72d8127..00000000 --- a/src/main/java/com/easipass/gateway/quartz/enums/QuartzTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.easipass.gateway.quartz.enums; - -/** - * @ClassName: QuartzTypeEnum - * @Description: quartz表达式类型 - * @author: xufeng - * @date: 2018/3/26 14:40 - */ -public enum QuartzTypeEnum { - SIMPLE //simple 简单表达式 - , CRON; //cron Cron表达式 - - public static QuartzTypeEnum getEnum(String name) { - return QuartzTypeEnum.valueOf(name.toUpperCase()); - } -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigDataBus.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigDataBus.java deleted file mode 100644 index 11a64857..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigDataBus.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * @ClassName: ReceiverConfigDataBus - * @Description: 数据总线消息接收配置 - * @author: xufeng - * @date: 2018/6/6 10:11 - */ - -@Data -public class ReceiverConfigDataBus implements ReceiverConfig { - private String serviceName = "receiverDataBus";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String clientId;//groupId - private List topics = new ArrayList<>();//topic（可多个） - private boolean saveSolr = false; //是否使用solr - private boolean saveMongodb = false;//是否使用Mongodb -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigEmail.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigEmail.java deleted file mode 100644 index 49ce9e3a..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigEmail.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import com.easipass.gateway.route.enums.EmailMethod; -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @ClassName: ReceiverConfigEmail - * @Description: Email接收器配置 - * @author: xufeng - * @date: 2018/4/9 11:25 - */ -@Data -public class ReceiverConfigEmail implements ReceiverConfig { - private String serviceName = "receiverEmail";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private List receiverConfigEmailList = new ArrayList<>(); - - @Data - public static class ReceiverConfigEmailRow implements Serializable { - private int max = 100; //接收数量。一次从邮件服务器上接收邮件的最大数量 - private String host; //邮件服务器(IP或邮件服务器的域名) - private int port = 110; //端口。接收邮件使用的端口，默认值为：110 - private String user; //用户名。邮件帐号 - private String password; //密码，帐号密码 - private String excPath; //异常路径。存放接收邮件时发生异常时的文件目录 - private String procotol = "pop3"; //协议。接收邮件协议 - private String receiveType = EmailMethod.attachment.name(); //接收方式。接收邮件方式 - } -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFs.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFs.java deleted file mode 100644 index 70b07f05..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFs.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: ReceiverConfigFs - * @Description: Fs接收器配置 - * @author: xufeng - * @date: 2018/4/9 11:25 - */ -@Data -public class ReceiverConfigFs implements ReceiverConfig { - private String serviceName = "receiverFs";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - /** 接收目录 */ - private String pathIn; - /** 接收缓冲目录 */ - private String pathTmp; - /** 一次最大处理数 */ - private int max = 100; - /** 文件最大大小 */ - private long maxSize = 4194304; - /** 编码 */ - private String encoding = "utf-8"; - /** 是否有缓冲目录 */ - private boolean hasTmpPath = true; - /** 是否删除原文件 */ - private boolean delReceiveFile = true; - /** 文件名后缀表达式 */ - private String fileNameRegex; - /** 是否扫描子目录 */ - private boolean includeSubdirectory = false; - /** 延时过滤时间，单位为毫秒 */ - private long delayTime = 0; - /** 过滤最小文件 */ - private long minSize; - /** 大文件保存目录 */ - private String bigFilePath; - - private Map args = new HashMap();//自定义参数 -} \ No newline at end of file diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFsSplit.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFsSplit.java deleted file mode 100644 index 08cdd670..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFsSplit.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.filter.bean.FilterConfigBackup; -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * @ClassName: ReceiverConfigFsSplit - * @Description: Fs接收器大文件拆分操作配置接收器配置 - * @author: xufeng - * @date: 2018/9/4 17:19 - */ - -@Data -public class ReceiverConfigFsSplit implements ReceiverConfig { - private String serviceName = "receiverFsSplit";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - /** 接收目录 */ - private String pathIn; - /** 接收缓冲目录 */ - private String pathTmp; - /** 一次最大处理数 */ - private int max = 100; - /** 编码 */ - private String encoding = "utf-8"; - /** 是否有缓冲目录 */ - private boolean hasTmpPath = true; - /** 是否删除原文件 */ - private boolean delReceiveFile = true; - /** 文件名后缀表达式 */ - private String fileNameRegex; - /** 是否扫描子目录 */ - private boolean includeSubdirectory = false; - /** 延时过滤时间，单位为毫秒 */ - private long delayTime = 0; - /** 拆分结关时一批发送多少行 */ - private int defaultRow = 100; - /** 备份大报文配置 */ - private List filterConfigBackupList = new ArrayList<>(); -} \ No newline at end of file diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigIbmMq.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigIbmMq.java deleted file mode 100644 index 26696c48..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigIbmMq.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -/** - * @ClassName: ReceiverConfigIbmMq - * @Description: IbmMq接收器配置 - * @author: xufeng - * @date: 2018/12/12 09:12 - */ - -@Data -public class ReceiverConfigIbmMq implements ReceiverConfig { - private String serviceName = "receiverIbmMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String hostName;//hostName(可留空为本地localhost) - private String channel;//channel(hostName非空时填写) - private Integer port;//Mq连接端口(hostName非空时填写) - private String queueManagerName;//MQ队列管理器的名称 - private String queueName;//Mq队列的名称 - private String username;//用户名 - private String password;//密码 - private Integer CCSID;//队列管理器字符集 - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 - private Integer concurrentConsumers;//初始化消费者数量 -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigJms.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigJms.java deleted file mode 100644 index e46bf19b..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigJms.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -/** - * @ClassName: ReceiverConfigJms - * @Description: Jms接收器配置 - * @author: xufeng - * @date: 2019/1/17 16:23 - */ - - -@Data -public class ReceiverConfigJms implements ReceiverConfig { - private String serviceName = "receiverJms";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String jmsJndiFactory; - private String jmsFactory; - private String jmsQueue; - private String jmsUrl ; - private String jmsMessage = "JMS_MESSAGE"; - - private boolean useJms102 = false; - private int sessionSize = 0;// no cache, or only one - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigKafka.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigKafka.java deleted file mode 100644 index 60c3cfcd..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigKafka.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * @ClassName: ReceiverConfigKafka - * @Description: Kafka接收器配置 - * @author: xufeng - * @date: 2018/6/6 15:03 - */ - -@Data -public class ReceiverConfigKafka implements ReceiverConfig { - private String serviceName = "receiverKafka";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String servers;//kafka服务器地址 - private List topics = new ArrayList<>();//topic列表 - private String clientId;//消费者分区id - -// 假设每条消息最多处理一分钟（如果超出一分钟，消息队列会抛异常） - private int sessionTimeout = 180000; - private int maxRequestSize = 5242880; - private int requestTimeout = 305000; - private int pollTimeout = 5000;//获取消息时连接时间(毫秒)，尽量设置的大一些否则取不到消息 - private int maxPollRecords = 3;//一次请求返回最大消息记录数，与session.timeout.ms有关，不能够乱设 -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigMq.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigMq.java deleted file mode 100644 index d08844f7..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigMq.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -/** - * @ClassName: ReceiverConfigMq - * @Description: Mq接收器配置 - * @author: xufeng - * @date: 2018/6/13 16:12 - */ - -@Data -@Deprecated //推荐使用IbmMq -public class ReceiverConfigMq implements ReceiverConfig { - private String serviceName = "receiverMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String hostName;//hostName(可留空为本地localhost) - private String channel;//channel(hostName非空时填写) - private Integer port;//Mq连接端口(hostName非空时填写) - private String queueManagerName;//MQ队列管理器的名称 - private String queueName;//Mq队列的名称 - private Integer CCSID;//队列管理器字符集 - /** 一次最大处理数,小于等于0表示当前目录下有多少文件就取多少文件,默认为0 */ - private int max = 0; - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRabbitMq.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRabbitMq.java deleted file mode 100644 index 615edbd8..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRabbitMq.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -/** - * @ClassName: ReceiverConfigRabbitMq - * @Description: RabbitMq接收器配置 - * @author: xufeng - * @date: 2018/12/3 10:48 - */ - -@Data -public class ReceiverConfigRabbitMq implements ReceiverConfig { - private String serviceName = "receiverRabbitMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String host = "localhost";//RabbitMQ服务器地址 - private int port = 5672;//服务端口 - private String username;//账户 - private String password;//密码 - private String virtualHost;//虚拟主机 - private String addresses;//该方法配置多个host，在当前连接host down掉的时候会自动去重连后面的host - private Integer requestedHeartbeat;//连接心跳时间 - - private boolean publisherConfirms;//是否支持发布确认 - private boolean publisherReturns;//是否支持发布返回 - private Integer connectionTimeout;//连接超时时间 - private int prefetchCount = 3;//设置每个消费者获取的最大的消息数量 - private Integer concurrentConsumers;//初始化消费者数量 - private Integer maxConcurrentConsumers;//最大消费者数量 - - private String topic;//topic列表 - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 -} diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRocketMq.java b/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRocketMq.java deleted file mode 100644 index 399f856c..00000000 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigRocketMq.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.easipass.gateway.receiver.bean; - -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import lombok.Data; - -/** - * @ClassName: ReceiverConfigRocketMq - * @Description: RocketMq接收器配置 - * @author: xufeng - * @date: 2018/12/28 10:48 - */ - -@Data -public class ReceiverConfigRocketMq implements ReceiverConfig { - private String serviceName = "receiverRocketMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - /** 是否开启 */ - private boolean enable = true; - /** 是否异步执行 */ - private boolean async = false; - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = false; - - private String namesrvAddr = "localhost:9876"; - private String groupName = "EPMS-GATEWAY"; - private String topic;//topic列表 - private String tags = "";//tags标签 - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigEmail.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigEmail.java deleted file mode 100644 index 76059d61..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigEmail.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import com.easipass.gateway.route.enums.EmailMethod; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @ClassName: SenderConfigEmail - * @Description: Email发送配置 - * @author: xufeng - * @date: 2018/4/11 11:05 - */ - -@Getter -@Setter -@ToString -public class SenderConfigEmail implements SenderConfig { - private String serviceName = "senderEmail";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - - private String host; //服务器。邮件服务器。支持变量替换。 - private int port = 25;//端口。发送邮件使用的端口，默认值为：25。 - private String user;//用户名。邮件帐号。 - private String password;//密码，帐号密码。 - - private String from;//发件人。发送邮件方地址,支持变量替换。 - private String to;//收件人。接收方邮件地址,支持变量替换。 - private String subject;//主题,邮件主题,支持变量替换。 - private String protocol;//协议。发送邮件协议。目前只有smtp可以选择。 - private String method = EmailMethod.attachment.name();//发送类型 - private String fileName;//文件名,发送方式为附件时的文件名。支持变量替换。 - private String encoding = "utf-8";//编码。详细说明请参考[wiki:EpmsBook/SenderFs 文件发送器]的配置中的Encoding说明。 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigFs.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigFs.java deleted file mode 100644 index 55a39269..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigFs.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -/** - * @ClassName: SenderConfigFs - * @Description: Fs发送配置 - * @author: xufeng - * @date: 2018/4/11 11:05 - */ - -@Data -public class SenderConfigFs implements SenderConfig { - private String serviceName = "senderFs";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - /** 发送目录 */ - private String path; - /** 发送缓冲目录 */ - private String tmp; - private String fileName;//文件名,发送方式为附件时的文件名。支持变量替换。 - /** 编码 */ - private String encoding = "utf-8"; - /** 是否创建目录 */ - private boolean createPathFlag = false; - /** 是否有缓冲目录 */ - private boolean hasTmpPath = true; - private String postfixName;//后缀名添加 - /** 是否覆盖重名文件 */ - private boolean overload = false; -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigFtp.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigFtp.java deleted file mode 100644 index aca0ef7a..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigFtp.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -/** - * @ClassName: SenderConfigFtp - * @Description: Ftp发送配置 - * @author: xufeng - * @date: 2018/4/11 11:05 - */ - -@Data -public class SenderConfigFtp implements SenderConfig { - private String serviceName = "senderFtp";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String host; //FTP主机地址 - private int port = 21; //FTP主机端口 - private String user; //FTP用户名 - private String password; //FTP密码 - private boolean isFtps = false; //是否为ftps连接 - private String path; //ftp上路径 - private String fileName;//文件名,发送方式为附件时的文件名。支持变量替换。 - private String serversEncoding = "AUTO";// - private String encoding = "AUTO";//编码。消息写入文件的编码。消息说明请参考[wiki:EpmsBook/SenderFs 文件发送器]中的编码配置描述。 - private int timeout = 300000;//连接超时设置，时间单位为秒。 - private int socketTimeout = 300000;//Socket超时设置，时间单位为秒。 - private boolean longConnection;//是否使用长连接。使用长连接可以提供消息发送的性能，但对FTP服务器的负担可能加重。在持续有消息发送时候，建议使用长连接。 - private boolean passive = false;//:是否被动式，默认为主动式。 - private boolean binary = false;//文件传输方式，是二进制还是ACSII方式。 - private boolean overload = false;//是否覆盖目标目录中相同文件名。 - private String tmpPath;//临时存放目录。 - private boolean hasTmpPath = true;// - private String fileNamePostfix;// - private boolean createPathFlag = false; //是否创建路径 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigIbmMq.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigIbmMq.java deleted file mode 100644 index e54b6dda..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigIbmMq.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: SenderConfigIbmMq - * @Description: IbmMq发送配置 - * @author: xufeng - * @date: 2018/12/10 16:09 - */ - - -@Data -public class SenderConfigIbmMq implements SenderConfig { - private String serviceName = "senderIbmMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String hostName;//hostName(留空为本地localhost) - private String channel;//channel（hostName非空时填写） - private Integer port;//连接端口（hostName非空时填写） - private String queueManagerName;//MQ队列管理器的名称 - private String queueName;//Mq队列的名称 - private String username;//用户名 - private String password;//密码 - private Integer CCSID;//队列管理器字符集 - private boolean targetClient = false;//是否关闭jms标签 - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 - private Map args = new HashMap();//扩展参数 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigJms.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigJms.java deleted file mode 100644 index fd0d1cb2..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigJms.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: SenderConfigJms - * @Description: Jms发送配置 - * @author: xufeng - * @date: 2019/2/13 14:31 - */ - -@Data -public class SenderConfigJms implements SenderConfig { - private String serviceName = "senderJms";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - - private String jmsJndiFactory; - private String jmsFactory; - private String jmsQueue; - private String jmsUrl ; - private boolean targetClient = false;//是否关闭jms标签 - - private int sessionCacheSize = 0; - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 - private Map args = new HashMap();//扩展参数 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigKafka.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigKafka.java deleted file mode 100644 index aa6f71a3..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigKafka.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * @ClassName: SenderConfigKafka - * @Description: Kafka发送配置 - * @author: xufeng - * @date: 2018/4/11 11:05 - */ - -@Getter -@Setter -@ToString -public class SenderConfigKafka implements SenderConfig { - private String serviceName = "senderKafka";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String servers;//kafka服务器地址 - private String topic;//topic列表 - - private String acks = "all"; - private int retries = 0; - private int batchSize = 16384; - private int linger = 1; - private int bufferMemory = 33554432; -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigMq.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigMq.java deleted file mode 100644 index c083c13f..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigMq.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -/** - * @ClassName: SenderConfigMq - * @Description: Mq发送配置 - * @author: xufeng - * @date: 2018/6/11 15:01 - */ - -@Deprecated //推荐使用IbmMq -@Data -public class SenderConfigMq implements SenderConfig { - private String serviceName = "senderMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String hostName;//hostName(留空为本地localhost) - private String channel;//channel（hostName非空时填写） - private Integer port;//连接端口（hostName非空时填写） - private String queueManagerName;//MQ队列管理器的名称 - private String queueName;//Mq队列的名称 - private Integer CCSID;//队列管理器字符集 - private boolean targetClient = false;//是否关闭jms标签 - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigRabbitMq.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigRabbitMq.java deleted file mode 100644 index 87e97fff..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigRabbitMq.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: SenderConfigRabbitMq - * @Description: RabbitMq发送配置 - * @author: xufeng - * @date: 2018/4/11 11:05 - */ - -@Getter -@Setter -@ToString -public class SenderConfigRabbitMq implements SenderConfig { - private String serviceName = "senderRabbitMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String host = "localhost";//RabbitMQ服务器地址 - private int port = 5672;//服务端口 - private String username;//账户 - private String password;//密码 - private String virtualHost;//虚拟主机 - private String addresses;//该方法配置多个host，在当前连接host down掉的时候会自动去重连后面的host - private Integer requestedHeartbeat;//连接心跳时间 - - private boolean publisherConfirms;//是否支持发布确认 - private boolean publisherReturns;//是否支持发布返回 - private Integer connectionTimeout;//连接超时时间 - - private String exchange = "";//交换器名称 - private String topic;//topic列表 - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 - private String contentType = "text/plain";//文件类型 - private Map args = new HashMap();//扩展参数 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigRocketMq.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigRocketMq.java deleted file mode 100644 index 8877a662..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigRocketMq.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: SenderConfigRocketMq - * @Description: RocketMq发送配置 - * @author: xufeng - * @date: 2018/12/29 11:05 - */ - -@Getter -@Setter -@ToString -public class SenderConfigRocketMq implements SenderConfig { - private String serviceName = "senderRocketMq";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - /** 是否发生异常时退出任务 */ - private boolean exceptionExit = true; - - private String namesrvAddr = "localhost:9876"; - private String groupName = "EPMS-GATEWAY"; - private String topic;//topic列表 - private String tags = "";//tags标签 - - private String fileNameField = "EP_GATEWAY_FILE_NAME";//文件名获取字段 - private Map args = new HashMap();//扩展参数 -} diff --git a/src/main/java/com/easipass/gateway/route/bean/SenderConfigSftp.java b/src/main/java/com/easipass/gateway/route/bean/SenderConfigSftp.java deleted file mode 100644 index 0f4b5284..00000000 --- a/src/main/java/com/easipass/gateway/route/bean/SenderConfigSftp.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.easipass.gateway.route.bean; - -import com.easipass.gateway.route.entity.SenderConfig; -import lombok.Data; - -/** - * @ClassName: SenderConfigSftp - * @Description: Sftp发送配置 - * @author: xufeng - * @date: 2019/2/13 15:30 - */ - -@Data -public class SenderConfigSftp implements SenderConfig { - private String serviceName = "senderSftp";//对应服务名称 - private String id;//如果留空则系统自动分配 - private boolean enable = true;//是否开启 - private boolean async = false;//是否异步执行 - private boolean exceptionExit = true;//是否发生异常时退出任务 - - private String host; //FTP主机地址 - private int port = 22; //FTP主机端口 - private String username; //FTP用户名 - private String password; //FTP密码 - private String path; //ftp上路径 - private String fileName;//文件名,发送方式为附件时的文件名。支持变量替换。 - private String serversEncoding = "AUTO";// - private String encoding = "AUTO";//编码。消息写入文件的编码。消息说明请参考[wiki:EpmsBook/SenderFs 文件发送器]中的编码配置描述。 - private int timeout = 300000;//连接超时设置，时间单位为秒。 - private int socketTimeout = 300000;//Socket超时设置，时间单位为秒。 - private boolean longConnection;//是否使用长连接。使用长连接可以提供消息发送的性能，但对FTP服务器的负担可能加重。在持续有消息发送时候，建议使用长连接。 - private boolean overload = false;//是否覆盖目标目录中相同文件名。 - private String tmpPath;//临时存放目录。 - private boolean hasTmpPath = true;// - private boolean createPathFlag = false; //是否创建路径 -} diff --git a/src/main/java/com/easipass/gateway/route/enums/EmailMethod.java b/src/main/java/com/easipass/gateway/route/enums/EmailMethod.java deleted file mode 100644 index 3dc31663..00000000 --- a/src/main/java/com/easipass/gateway/route/enums/EmailMethod.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.easipass.gateway.route.enums; - -/** - * @ClassName: EmailMethod - * @Description: 发送邮件类型 - * @author: xufeng - * @date: 2018/6/22 15:04 - */ - -public enum EmailMethod { - attachment,//附件类型 - raw, //原始邮件 - plain;//文本类型 - - public static EmailMethod getEnum(String name) { - for (EmailMethod emailMethod : EmailMethod.values()) { - if (emailMethod.toString().equalsIgnoreCase(name)) { - return emailMethod; - } - } - return null; - } -} diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolController.java index a32d3060..0fc725a6 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolController.java @@ -1,6 +1,6 @@ package com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool; -import com.easipass.gateway.entity.TaskConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.entity.TaskConfig; import com.jcraft.jsch.ChannelSftp; import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.GatewayConfToolService; import com.xwintop.xJavaFxTool.view.epmsTools.gatewayConfTool.GatewayConfToolView; diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolTaskViewController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolTaskViewController.java index 639ec4ba..da36671c 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolTaskViewController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/epmsTools/gatewayConfTool/GatewayConfToolTaskViewController.java @@ -1,11 +1,11 @@ package com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool; -import com.easipass.gateway.entity.TaskConfig; -import com.easipass.gateway.filter.bean.FilterConfig; -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import com.easipass.gateway.route.entity.SenderConfig; import com.xwintop.xJavaFxTool.controller.IndexController; import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.GatewayConfToolTaskViewService; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.entity.TaskConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.filter.bean.FilterConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity.ReceiverConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.route.entity.SenderConfig; import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil; import com.xwintop.xJavaFxTool.view.epmsTools.gatewayConfTool.GatewayConfToolTaskViewView; import javafx.beans.value.ChangeListener; @@ -98,7 +98,7 @@ public void changed(ObservableValue observable, String oldValu receiverConfigListView.setOnMouseClicked(event -> { if (event.getButton() == MouseButton.SECONDARY) { Menu menu = new Menu("添加"); - String packageName = "com.easipass.gateway.receiver.bean"; + String packageName = "com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.bean"; String[] classNameS = new String[]{"ReceiverConfigDataBus", "ReceiverConfigEmail", "ReceiverConfigFs", @@ -182,7 +182,7 @@ public void changed(ObservableValue observable, String oldValu filterConfigsListView.setOnMouseClicked(event -> { if (event.getButton() == MouseButton.SECONDARY) { Menu menu = new Menu("添加"); - String packageName = "com.easipass.gateway.filter.bean"; + String packageName = "com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.filter.bean"; String[] classNameS = new String[]{ "FilterConfigBackup", "FilterConfigCompress", @@ -265,7 +265,7 @@ public void changed(ObservableValue observable, String oldValu senderConfigListView.setOnMouseClicked(event -> { if (event.getButton() == MouseButton.SECONDARY) { Menu menu = new Menu("添加"); - String packageName = "com.easipass.gateway.route.bean"; + String packageName = "com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.route.bean"; String[] classNameS = new String[]{ "SenderConfigEmail", "SenderConfigFs", diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolService.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolService.java index 5f6bcaed..ce803c28 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolService.java @@ -1,6 +1,6 @@ package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool; -import com.easipass.gateway.entity.TaskConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.entity.TaskConfig; import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolServiceViewService.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolServiceViewService.java index 5e29b68d..f004b71c 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolServiceViewService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolServiceViewService.java @@ -1,9 +1,9 @@ package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool; -import com.easipass.gateway.receiver.bean.ReceiverConfigFtp; -import com.easipass.gateway.receiver.bean.ReceiverConfigSftp; import com.jfoenix.controls.JFXCheckBox; import com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool.GatewayConfToolServiceViewController; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.bean.ReceiverConfigFtp; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.bean.ReceiverConfigSftp; import com.xwintop.xJavaFxTool.utils.JavaFxViewUtil; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolTaskViewService.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolTaskViewService.java index a6c00dc4..8e257072 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolTaskViewService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/GatewayConfToolTaskViewService.java @@ -1,9 +1,9 @@ package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool; -import com.easipass.gateway.entity.TaskConfig; -import com.easipass.gateway.filter.bean.FilterConfig; -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import com.easipass.gateway.route.entity.SenderConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.entity.TaskConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.filter.bean.FilterConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity.ReceiverConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.route.entity.SenderConfig; import com.jcraft.jsch.ChannelSftp; import com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool.GatewayConfToolController; import com.xwintop.xJavaFxTool.controller.epmsTools.gatewayConfTool.GatewayConfToolServiceViewController; diff --git a/src/main/java/com/easipass/gateway/entity/TaskConfig.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/entity/TaskConfig.java similarity index 75% rename from src/main/java/com/easipass/gateway/entity/TaskConfig.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/entity/TaskConfig.java index bbd56002..a7eb5879 100644 --- a/src/main/java/com/easipass/gateway/entity/TaskConfig.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/entity/TaskConfig.java @@ -1,9 +1,8 @@ -package com.easipass.gateway.entity; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.entity; -import com.easipass.gateway.filter.bean.FilterConfig; -import com.easipass.gateway.quartz.enums.QuartzTypeEnum; -import com.easipass.gateway.receiver.entity.ReceiverConfig; -import com.easipass.gateway.route.entity.SenderConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.filter.bean.FilterConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity.ReceiverConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.route.entity.SenderConfig; import lombok.Data; import java.io.Serializable; @@ -23,7 +22,7 @@ public class TaskConfig implements Serializable { private String name;//任务名称(唯一标识，不可重复) private Boolean isEnable = true;//是否开启 private String taskType;//任务类型(script/receiver/execute flow) - private String triggerType = QuartzTypeEnum.SIMPLE.name();//触发器类型(simple/cron) + private String triggerType = "SIMPLE";//触发器类型(simple/cron) private Integer intervalTime = 5;//两次任务调度的间隔时间(simple类型触发器显示该信息)，单位为秒 private Integer executeTimes = -1;//任务执行次数(simple类型触发器显示该信息，-1表示无限次) private String triggerCron;//任务调度的时间(cron类型触发器显示该信息) diff --git a/src/main/java/com/easipass/gateway/filter/bean/FilterConfig.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/filter/bean/FilterConfig.java similarity index 83% rename from src/main/java/com/easipass/gateway/filter/bean/FilterConfig.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/filter/bean/FilterConfig.java index e61727dd..261dd560 100644 --- a/src/main/java/com/easipass/gateway/filter/bean/FilterConfig.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/filter/bean/FilterConfig.java @@ -1,4 +1,4 @@ -package com.easipass.gateway.filter.bean; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.filter.bean; import java.io.Serializable; diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFtp.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigFtp.java similarity index 77% rename from src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFtp.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigFtp.java index cc56c689..d6a4691b 100644 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigFtp.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigFtp.java @@ -1,6 +1,6 @@ -package com.easipass.gateway.receiver.bean; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.bean; -import com.easipass.gateway.receiver.entity.ReceiverConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity.ReceiverConfig; import lombok.Data; import java.io.Serializable; @@ -26,15 +26,21 @@ public class ReceiverConfigFtp implements ReceiverConfig { private int port = 21; //FTP主机端口 private String user; //FTP用户名 private String password; //FTP密码 - private boolean isFtps = false; //是否为ftps连接 + private int connectionType = 0; //连接类型（0:FTP 1:FTP using implicit SSL 2:FTP using explicit SSL(Auth SSL) 3:FTP using explicit SSL(Auth TLS)） private int timeout = 300000; //Ftp服务器超时限制，单位为毫秒 private int socketTimeout = 300000; //Socket连接超时限制，单位为毫秒；用于FTP服务器未知的情况，避免接收器长时间无响应；非特别情况下无需指定 private boolean longConnection; //连接方式：长连接或每次接收消息时创建连接；使用长连接可以提高FTP接收器的接收消息的速度 + private int connectionPoolSize = 10;//ftp连接池大小 private boolean passive = false; //连接模式：主动式和被动式；缺省为主动式 private boolean binary = false; //消息传输方式：ASCII码和二进制；默认为ASCII码方式 + private Integer fileType; //文件传输方式（设置除二进制、ACSII方式之外的传输方式） + private Integer bufferSize; //缓冲数据流缓冲区大小 private String tmpPath; //远程临时路径。用于存放中间读入的消息文件。读取完成后（消息成功放入队列）将删除该文件。同一FTPServer的多个Remote Path共享一个TMP路径 private boolean hasTmpPath = true; //是否使用临时目录，该选项与Tmp Path和Postfix参数相关 private String serversEncoding = "AUTO";//编码格式 + private String prot = "P";//数据通道保护等级（ftps独有） + private boolean checkServerValidity = false;//是否检测服务器证书有效性（ftps独有） + private List receiverConfigFsList = new ArrayList<>(); @Data @@ -44,7 +50,7 @@ public static class ReceiverConfigFtpRow implements Serializable{ private long maxSize = 4194304; //处理文件最大长度 private String encoding = "AUTO"; //文件编码格式 private boolean delReceiveFile = true; //是否删除原文件 - private String fileNameRegex; //文件后缀；当不使用临时目录时；输入该参数用于将接收目录中的文件临时重命名为该消息的'原始文件名.+后缀' + private String fileNameRegex; //文件名正则表达式过滤； private boolean includeSubdirectory; //是否接收该目录的子目录。 private long delayTime = 0; //延时过滤，单位为毫秒。即文件最后修改时间与当前时间之差小于设置值时不处理该文件，默认为0 private long minSize = -1; //文件最小长度过滤，默认为-1，否则当文件长度小于该值时不处理该文件 diff --git a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigSftp.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigSftp.java similarity index 93% rename from src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigSftp.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigSftp.java index 5ba48775..996bcc1d 100644 --- a/src/main/java/com/easipass/gateway/receiver/bean/ReceiverConfigSftp.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/bean/ReceiverConfigSftp.java @@ -1,6 +1,6 @@ -package com.easipass.gateway.receiver.bean; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.bean; -import com.easipass.gateway.receiver.entity.ReceiverConfig; +import com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity.ReceiverConfig; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/easipass/gateway/receiver/entity/ReceiverConfig.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/entity/ReceiverConfig.java similarity index 82% rename from src/main/java/com/easipass/gateway/receiver/entity/ReceiverConfig.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/entity/ReceiverConfig.java index b27e439c..a472b2d8 100644 --- a/src/main/java/com/easipass/gateway/receiver/entity/ReceiverConfig.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/receiver/entity/ReceiverConfig.java @@ -1,4 +1,4 @@ -package com.easipass.gateway.receiver.entity; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.receiver.entity; import java.io.Serializable; diff --git a/src/main/java/com/easipass/gateway/route/entity/SenderConfig.java b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/route/entity/SenderConfig.java similarity index 82% rename from src/main/java/com/easipass/gateway/route/entity/SenderConfig.java rename to src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/route/entity/SenderConfig.java index 8523cf92..69e95455 100644 --- a/src/main/java/com/easipass/gateway/route/entity/SenderConfig.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/epmsTools/gatewayConfTool/gateway/route/entity/SenderConfig.java @@ -1,4 +1,4 @@ -package com.easipass.gateway.route.entity; +package com.xwintop.xJavaFxTool.services.epmsTools.gatewayConfTool.gateway.route.entity; import java.io.Serializable;