diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java index 7cfe108..b7831f0 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java @@ -16,6 +16,7 @@ public class Constants { public static final String CHANNEL_NO = "X-SCFS-Channel-No"; public static final String APP_NO = "X-SCFS-App-No"; public static final String SIGNATURE = "X-SCFS-Signature"; + public static final String API_VERSION = "X-SCFS-Api-Version"; // http 自定义字段 public static final String TIMESTAMP = "X-SCFS-Timestamp"; public static final String NONCE = "X-SCFS-Nonce"; @@ -30,4 +31,7 @@ public class Constants { public static final String GZIP_ENCODING = "gzip"; public static final int HEX = 16; public static final String BASE_CHAR = "0123456789abcdefghijklmnopqrstuvwxyz"; + + // version + public static final String V_1 = "1.0.0"; } diff --git a/scfs-api-service/pom.xml b/scfs-api-service/pom.xml index 945625e..39cf5ba 100644 --- a/scfs-api-service/pom.xml +++ b/scfs-api-service/pom.xml @@ -16,6 +16,12 @@ jar + + org.projectlombok + lombok + 1.18.30 + + com.czcb.scfs scfs-api-core diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/TransType.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/TransType.java new file mode 100644 index 0000000..fc44d4a --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/TransType.java @@ -0,0 +1,10 @@ +package com.czcb.scfs.api.service; + +/** + * + * @author wangwei + * @date 2024/3/13 + */ +public @interface TransType { + String value(); +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/OpenAccRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/OpenAccRequest.java new file mode 100644 index 0000000..0ef69f9 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/OpenAccRequest.java @@ -0,0 +1,11 @@ +package com.czcb.scfs.api.service.v1.account; + +import java.io.Serializable; + +/** + * @author wangwei + * @date 2024/3/12 + */ +public class OpenAccRequest implements Serializable { + +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java index f115a59..cb75d70 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java @@ -3,8 +3,11 @@ package com.czcb.scfs.api.service.v1.sms; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.http.HttpHeaders; import com.czcb.scfs.api.core.http.HttpResponse; -import com.czcb.scfs.api.service.v1.sms.model.SmsRequest; -import com.czcb.scfs.api.service.v1.sms.model.SmsResponse; +import com.czcb.scfs.api.service.v1.sms.model.SendVerifySignRequest; +import com.czcb.scfs.api.service.v1.sms.model.SendVerifySignResponse; + +import static com.czcb.scfs.api.core.Constants.API_VERSION; +import static com.czcb.scfs.api.core.Constants.V_1; /** * 短信服务 @@ -18,10 +21,11 @@ public class SmsService { this.apiClient = apiClient; } - public SmsResponse send(SmsRequest request) { - String url = "/send/test"; + public SendVerifySignResponse send(SendVerifySignRequest request) { + String url = "/sms/sendVerifySign"; HttpHeaders headers = new HttpHeaders(); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SmsResponse.class); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SendVerifySignResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignRequest.java new file mode 100644 index 0000000..dca43fc --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignRequest.java @@ -0,0 +1,60 @@ +package com.czcb.scfs.api.service.v1.sms.model; + +import com.czcb.scfs.api.core.ApiRequest; +import com.czcb.scfs.api.service.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 短信验证码发送 + * + * @author wangwei + * @since 2.0.0 + */ +@Data +@Accessors(chain = true) +@TransType("100000") +public class SendVerifySignRequest implements ApiRequest { + @SerializedName("channel_no") + private String channelNo; + + @SerializedName("app_no") + private String appNo; + + @SerializedName("serial_no") + private String serialNo; + + @SerializedName("trade_no") + private String tradeNo; + + @SerializedName("model_no") + private String modelNo; + + @SerializedName("trade_type") + private String tradeType; + + @SerializedName("account_no") + private String accountNo; + + @SerializedName("amount") + private String amount; + + @SerializedName("card_no") + private String cardNo; + + @SerializedName("card_name") + private String cardName; + + @SerializedName("id_no") + private String idNo; + + @SerializedName("mobile") + private String mobile; + + @SerializedName("trans_date") + private String transDate; + + @SerializedName("trans_tradetime") + private String transTradetime; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignResponse.java new file mode 100644 index 0000000..f6f99e6 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SendVerifySignResponse.java @@ -0,0 +1,38 @@ +package com.czcb.scfs.api.service.v1.sms.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; + +/** + * @author wangwei + * @since 2.0.0 + */ +@Data +public class SendVerifySignResponse implements ApiResponse { + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_Info") + private String recodeInfo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("recode_Info") + private String sysTime; + + private String smsNo; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsRequest.java deleted file mode 100644 index 649e119..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.czcb.scfs.api.service.v1.sms.model; - -import com.czcb.scfs.api.core.ApiRequest; - -/** - * @author wangwei - * @since 2.0.0 - */ -public class SmsRequest implements ApiRequest { - private String mobile; - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } -} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsResponse.java deleted file mode 100644 index dc00ddc..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/model/SmsResponse.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.czcb.scfs.api.service.v1.sms.model; - -import com.czcb.scfs.api.core.ApiResponse; - -/** - * @author wangwei - * @since 2.0.0 - */ -public class SmsResponse implements ApiResponse { - private String recode; - - private String recodeInfo; - - public String getRecode() { - return recode; - } - - public void setRecode(String recode) { - this.recode = recode; - } - - public String getRecodeInfo() { - return recodeInfo; - } - - public void setRecodeInfo(String recodeInfo) { - this.recodeInfo = recodeInfo; - } - - private String mobile; - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } -}