diff --git a/circuit-api/pom.xml b/circuit-api/pom.xml index a188ce0..6109b0e 100644 --- a/circuit-api/pom.xml +++ b/circuit-api/pom.xml @@ -1,26 +1,27 @@ - - 4.0.0 - + + 4.0.0 + + com.lamp + circuit + 0.0.1-SNAPSHOT + com.lamp - circuit + circuit-api 0.0.1-SNAPSHOT - - com.lamp - circuit-api - 0.0.1-SNAPSHOT - circuit-api - http://maven.apache.org - - UTF-8 - - - - junit - junit - 3.8.1 - test - - + circuit-api + http://maven.apache.org + + UTF-8 + + + + junit + junit + 3.8.1 + test + + diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/SendSms.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/SendSms.java index 5f525c8..12f6ae8 100644 --- a/circuit-api/src/main/java/com/lamp/circuit/api/sms/SendSms.java +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/SendSms.java @@ -1,13 +1,17 @@ package com.lamp.circuit.api.sms; +import com.lamp.circuit.api.sms.message.SendSmsDetail; +import com.lamp.circuit.api.sms.message.SendSmsQuery; import com.lamp.circuit.api.sms.message.SendSmsRequest; +import com.lamp.circuit.api.sms.message.SendSmsResponse; -public interface SendSms { +import java.util.List; +public interface SendSms { - void sendSms(SendSmsRequest sendSmsRequest ); - - void sendBatchSms(); - - void querySendDetails(); + SendSmsResponse sendSms(SendSmsRequest sendSmsRequest ); + + SendSmsResponse sendBatchSms(List sendSmsRequestList); + + SendSmsDetail querySendDetails(SendSmsQuery sendSmsQuery); } diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/BaseQuery.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/BaseQuery.java new file mode 100644 index 0000000..4c64a6d --- /dev/null +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/BaseQuery.java @@ -0,0 +1,31 @@ +/* + * frxs Inc. 湖南兴盛优选电子商务有限公司. + * Copyright (c) 2017-2019. All Rights Reserved. + */ +package com.lamp.circuit.api.sms.message; + +/** + * @author ouyangzhaobing + * @version : BaseQuery.java,v 0.1 2020年07月17日 1:13 上午 + */ +public class BaseQuery { + private Long pageNo = 1L; + + private Long pageSize = 10L; + + public void setPageNo(Long pageNo) { + this.pageNo = pageNo; + } + + public void setPageSize(Long pageSize) { + this.pageSize = pageSize; + } + + public Long getPageNo() { + return pageNo; + } + + public Long getPageSize() { + return pageSize; + } +} \ No newline at end of file diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendBatchSms.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendBatchSms.java new file mode 100644 index 0000000..0902223 --- /dev/null +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendBatchSms.java @@ -0,0 +1,14 @@ +/* + * frxs Inc. 湖南兴盛优选电子商务有限公司. + * Copyright (c) 2017-2019. All Rights Reserved. + */ +package com.lamp.circuit.api.sms.message; + +import com.lamp.circuit.api.Information; + +/** + * @author ouyangzhaobing + * @version : SendBatchSms.java,v 0.1 2020年07月17日 12:57 上午 + */ +public class SendBatchSms extends Information { +} \ No newline at end of file diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsDetail.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsDetail.java new file mode 100644 index 0000000..03ec69a --- /dev/null +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsDetail.java @@ -0,0 +1,55 @@ +/* + * frxs Inc. 湖南兴盛优选电子商务有限公司. + * Copyright (c) 2017-2019. All Rights Reserved. + */ +package com.lamp.circuit.api.sms.message; + +import java.util.Date; + +/** + * @author ouyangzhaobing + * @version : SendSmsDetail.java,v 0.1 2020年07月17日 1:17 上午 + */ +public class SendSmsDetail { + + private String code; + + private String message; + + private String requestId; + + /** + * 发送总数 + */ + private Long totalCount; + + private String templateId; + + /** + * 短信发送状态，包括： + * 1：等待回执。 + * 2：发送失败。 + * 3：发送成功。 + */ + private int status; + + private Date sendDate; + + private Date receiveDate; + + private String phoneNo; + + private String content; + + /** + * 拓展字段 + */ + private String outId; + + /** + * 运营商短信状态码。 + * 短信发送成功：DELIVERED。 + * 短信发送失败：失败错误码请参考错误码文档。 + */ + private String errorCode; +} \ No newline at end of file diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsQuery.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsQuery.java new file mode 100644 index 0000000..6c21dbc --- /dev/null +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsQuery.java @@ -0,0 +1,20 @@ +/* + * frxs Inc. 湖南兴盛优选电子商务有限公司. + * Copyright (c) 2017-2019. All Rights Reserved. + */ +package com.lamp.circuit.api.sms.message; + +import java.util.Date; + +/** + * @author ouyangzhaobing + * @version : SendSmsQuery.java,v 0.1 2020年07月17日 1:15 上午 + */ +public class SendSmsQuery extends BaseQuery { + + private String phoneNo; + + private Date sendDate; + + private String bizId; +} \ No newline at end of file diff --git a/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsResponse.java b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsResponse.java new file mode 100644 index 0000000..e7642d9 --- /dev/null +++ b/circuit-api/src/main/java/com/lamp/circuit/api/sms/message/SendSmsResponse.java @@ -0,0 +1,34 @@ +/* + * frxs Inc. 湖南兴盛优选电子商务有限公司. + * Copyright (c) 2017-2019. All Rights Reserved. + */ +package com.lamp.circuit.api.sms.message; + +/** + * @author ouyangzhaobing + * @version : SnedSmsResponse.java,v 0.1 2020年07月17日 12:43 上午 + */ +public class SendSmsResponse { + + /** + * 回执id,可以用来获取盖茨发送的详细信息如发送状态等 + */ + private String bizId; + + /** + * 请求状态码 + * 返回OK代表请求成功 + * 其他错误码详见错误码列表 + */ + private String code; + + /** + * 状态码的描述 + */ + private String message; + + /** + * 请求ID + */ + private String requestId; +} \ No newline at end of file diff --git a/circuit-api/target/classes/com/lamp/circuit/api/sms/ProcessingResults.class b/circuit-api/target/classes/com/lamp/circuit/api/sms/ProcessingResults.class deleted file mode 100644 index 31028a4..0000000 Binary files a/circuit-api/target/classes/com/lamp/circuit/api/sms/ProcessingResults.class and /dev/null differ diff --git a/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsSign.class b/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsSign.class deleted file mode 100644 index b69f4d0..0000000 Binary files a/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsSign.class and /dev/null differ diff --git a/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsTemplate.class b/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsTemplate.class deleted file mode 100644 index f0ad424..0000000 Binary files a/circuit-api/target/classes/com/lamp/circuit/api/sms/SmsTemplate.class and /dev/null differ diff --git a/circuit-api/target/test-classes/com/lamp/circuit/api/AppTest.class b/circuit-api/target/test-classes/com/lamp/circuit/api/AppTest.class deleted file mode 100644 index eabdb0a..0000000 Binary files a/circuit-api/target/test-classes/com/lamp/circuit/api/AppTest.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/NetworkHandler.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/NetworkHandler.class deleted file mode 100644 index be6e353..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/NetworkHandler.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage$AgreementWrapper.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage$AgreementWrapper.class deleted file mode 100644 index d536fd3..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage$AgreementWrapper.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage.class deleted file mode 100644 index 43474e6..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/AgreementManage.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/CmppAgreement.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/CmppAgreement.class deleted file mode 100644 index 77667db..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/CmppAgreement.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerConfig.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerConfig.class deleted file mode 100644 index 7314c8c..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerConfig.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerManage.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerManage.class deleted file mode 100644 index 9626985..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/agreement/ManufacturerManage.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyClientHandler.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyClientHandler.class deleted file mode 100644 index e435386..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyClientHandler.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyDecoder.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyDecoder.class deleted file mode 100644 index 38f9e78..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyDecoder.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyEncoder.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyEncoder.class deleted file mode 100644 index 51f4bdf..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/ManufacturerNettyEncoder.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyClientHandler.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyClientHandler.class deleted file mode 100644 index 6f8c0ec..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyClientHandler.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyConnectManageHandler.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyConnectManageHandler.class deleted file mode 100644 index e5612da..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient$ManufacetNettyConnectManageHandler.class and /dev/null differ diff --git a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient.class b/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient.class deleted file mode 100644 index c93d47e..0000000 Binary files a/circuit-sms-manufacturer/target/classes/com/lamp/circuit/sms/manufacturer/netty/NettyClient.class and /dev/null differ