From 22bc2583526018bde9006a0bd47219b59045b282 Mon Sep 17 00:00:00 2001 From: "sijun.li" Date: Tue, 17 Mar 2020 09:35:53 +0800 Subject: [PATCH] =?utf8?q?=E5=AE=8C=E5=96=84=E6=89=AB=E7=A0=81=E6=B6=88?= =?utf8?q?=E8=B4=B9=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/application-devel-pg.properties | 7 +- .../dlpay/payapi/model/ErrorResponse.java | 2 +- .../payapi/model/QrcodePayConfirmRequest.java | 2 +- .../model/QrcodePayConfirmResponse.java | 48 ++------ .../payapi/model/QrcodePayInitRequest.java | 2 +- .../payapi/model/QrcodePayInitResponse.java | 13 +-- .../dlpay/payapi/model/RefundRequest.java | 2 +- .../dlpay/payapi/model/RefundResponse.java | 2 +- .../com/supwisdom/dlpay/api/ConsumeApi.java | 107 +++++++++++++++--- .../dlpay/api/ConsumeApiController.java | 38 +++---- .../configuration/HomeController.java | 20 ++-- .../controller/k12_consume_api_controller.kt | 82 ++++++-------- .../src/main/resources/application.properties | 3 +- .../controller/security_controller_test.kt | 7 ++ 14 files changed, 188 insertions(+), 147 deletions(-) diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties index 26e14990..288641d4 100644 --- a/config/application-devel-pg.properties +++ b/config/application-devel-pg.properties @@ -13,8 +13,10 @@ spring.datasource.continue-on-error=true spring.datasource.initialization-mode=always # Redis settings #spring.redis.host=ykt.supwisdom.com -spring.redis.host=172.28.201.101 -spring.redis.port=16379 +#spring.redis.host=172.28.201.101 +#spring.redis.port=16379 +spring.redis.host=172.28.201.70 +spring.redis.port=10021 spring.redis.password=kingstar # jwt settings jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw= @@ -48,6 +50,7 @@ spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.Str #===============kafka consumer ======================= # 指定默认消费者group id spring.kafka.listen.auto.start=false +spring.kafka.listener.missing-topics-fatal: false spring.kafka.consumer.group-id=epaymessager1 spring.kafka.consumer.auto-offset-reset=earliest spring.kafka.consumer.enable-auto-commit=true diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/ErrorResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/ErrorResponse.java index 6a239b04..f9cb7a71 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/ErrorResponse.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/ErrorResponse.java @@ -12,7 +12,7 @@ import javax.validation.constraints.*; /** * ErrorResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-16T21:13:31.022+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class ErrorResponse { @JsonProperty("code") diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmRequest.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmRequest.java index cc34fe2c..e9db9f13 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmRequest.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.*; /** * QrcodePayConfirmRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-13T16:43:43.940+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class QrcodePayConfirmRequest { @JsonProperty("billno") diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmResponse.java index 71d6839b..e6944c4a 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmResponse.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayConfirmResponse.java @@ -3,7 +3,7 @@ package com.supwisdom.dlpay.payapi.model; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; +import com.supwisdom.dlpay.payapi.model.TransResult; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; @@ -13,7 +13,7 @@ import javax.validation.constraints.*; /** * QrcodePayConfirmResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-13T16:43:43.940+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class QrcodePayConfirmResponse { @JsonProperty("refno") @@ -28,43 +28,8 @@ public class QrcodePayConfirmResponse { @JsonProperty("description") private String description; - /** - * Gets or Sets result - */ - public enum ResultEnum { - SUCCESS("success"), - - REQUIRE_QUERY("require_query"), - - ALREADY_SUCCESS("already_success"), - - FAILED("failed"); - - private String value; - - ResultEnum(String value) { - this.value = value; - } - - @Override - @JsonValue - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static ResultEnum fromValue(String value) { - for (ResultEnum b : ResultEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - } - @JsonProperty("result") - private ResultEnum result; + private TransResult result; public QrcodePayConfirmResponse refno(String refno) { this.refno = refno; @@ -146,7 +111,7 @@ public class QrcodePayConfirmResponse { this.description = description; } - public QrcodePayConfirmResponse result(ResultEnum result) { + public QrcodePayConfirmResponse result(TransResult result) { this.result = result; return this; } @@ -157,12 +122,13 @@ public class QrcodePayConfirmResponse { */ @ApiModelProperty(value = "") + @Valid - public ResultEnum getResult() { + public TransResult getResult() { return result; } - public void setResult(ResultEnum result) { + public void setResult(TransResult result) { this.result = result; } diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitRequest.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitRequest.java index f3fbfac4..c570f7e4 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitRequest.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitRequest.java @@ -13,7 +13,7 @@ import javax.validation.constraints.*; /** * QrcodePayInitRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-13T16:43:43.940+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class QrcodePayInitRequest { @JsonProperty("qrcode") diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitResponse.java index 0cce9375..eec032d0 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitResponse.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/QrcodePayInitResponse.java @@ -1,21 +1,16 @@ package com.supwisdom.dlpay.payapi.model; -import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.supwisdom.dlpay.api.bean.ApiResponse; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.jackson.nullable.JsonNullable; -import javax.validation.Valid; -import javax.validation.constraints.*; + +import java.util.Objects; /** * QrcodePayInitResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-13T16:43:43.940+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") -public class QrcodePayInitResponse extends ApiResponse { +public class QrcodePayInitResponse { @JsonProperty("anonymous") private Boolean anonymous; diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundRequest.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundRequest.java index 95d32459..d1494125 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundRequest.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundRequest.java @@ -12,7 +12,7 @@ import javax.validation.constraints.*; /** * RefundRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-16T21:13:31.022+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class RefundRequest { @JsonProperty("billno") diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundResponse.java b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundResponse.java index 08535732..69eaaed7 100644 --- a/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundResponse.java +++ b/payapi-common/src/main/java/com/supwisdom/dlpay/payapi/model/RefundResponse.java @@ -13,7 +13,7 @@ import javax.validation.constraints.*; /** * RefundResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-16T21:13:31.022+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") public class RefundResponse { @JsonProperty("billno") diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java index 86c57a81..7c593090 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApi.java @@ -5,8 +5,13 @@ */ package com.supwisdom.dlpay.api; +import com.supwisdom.dlpay.payapi.model.ErrorResponse; import com.supwisdom.dlpay.payapi.model.QrcodePayConfirmRequest; +import com.supwisdom.dlpay.payapi.model.QrcodePayConfirmResponse; import com.supwisdom.dlpay.payapi.model.QrcodePayInitRequest; +import com.supwisdom.dlpay.payapi.model.QrcodePayInitResponse; +import com.supwisdom.dlpay.payapi.model.RefundRequest; +import com.supwisdom.dlpay.payapi.model.RefundResponse; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -27,7 +32,7 @@ import javax.validation.constraints.*; import java.util.List; import java.util.Map; import java.util.Optional; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-12T16:17:20.799+08:00[Asia/Shanghai]") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-17T08:49:02.541+08:00[Asia/Shanghai]") @Validated @Api(value = "consume", description = "the consume API") @@ -37,43 +42,117 @@ public interface ConsumeApi { return Optional.empty(); } - @ApiOperation(value = "", nickname = "qrcodePayConfirm", notes = "", tags={ "pos", }) + @ApiOperation(value = "", nickname = "qrcodePayConfirm", notes = "", response = QrcodePayConfirmResponse.class, tags={ "pos", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "交易成功"), - @ApiResponse(code = 409, message = "交易正忙，稍后重试"), - @ApiResponse(code = 200, message = "交易失败") }) + @ApiResponse(code = 200, message = "交易成功", response = QrcodePayConfirmResponse.class), + @ApiResponse(code = 409, message = "交易正忙，稍后重试", response = ErrorResponse.class), + @ApiResponse(code = 200, message = "交易失败", response = ErrorResponse.class) }) @RequestMapping(value = "/consume/qrcode/confirm", produces = { "application/json" }, consumes = { "application/json" }, method = RequestMethod.POST) - default ResponseEntity qrcodePayConfirm(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "Qrcode确认" ) @Valid @RequestBody QrcodePayConfirmRequest qrcodePayConfirmRequest) { + default ResponseEntity qrcodePayConfirm(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "Qrcode确认" ) @Valid @RequestBody QrcodePayConfirmRequest qrcodePayConfirmRequest) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"hostTime\" : \"hostTime\", \"refno\" : \"refno\", \"hostDate\" : \"hostDate\", \"description\" : \"description\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } - @ApiOperation(value = "", nickname = "qrcodePayInit", notes = "", tags={ "pos", }) + @ApiOperation(value = "", nickname = "qrcodePayInit", notes = "", response = QrcodePayInitResponse.class, tags={ "pos", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "初始化成功"), - @ApiResponse(code = 200, message = "请求错误") }) + @ApiResponse(code = 200, message = "初始化成功", response = QrcodePayInitResponse.class), + @ApiResponse(code = 200, message = "请求错误", response = ErrorResponse.class) }) @RequestMapping(value = "/consume/qrcode/init", produces = { "application/json" }, consumes = { "application/json" }, method = RequestMethod.POST) - default ResponseEntity qrcodePayInit(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "QrCode 初始化" ) @Valid @RequestBody QrcodePayInitRequest qrcodePayInitRequest) { + default ResponseEntity qrcodePayInit(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "QrCode 初始化" ) @Valid @RequestBody QrcodePayInitRequest qrcodePayInitRequest) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"anonymous\" : true, \"sourcetype\" : \"sourcetype\", \"userid\" : \"userid\", \"username\" : \"username\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } - @ApiOperation(value = "", nickname = "qrcodePayQuery", notes = "根据系统交易参考号查询流水状态", tags={ "pos", }) + @ApiOperation(value = "", nickname = "qrcodePayQuery", notes = "根据系统交易参考号查询流水状态", response = QrcodePayConfirmResponse.class, tags={ "pos", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "查询成功"), - @ApiResponse(code = 200, message = "查询失败") }) + @ApiResponse(code = 200, message = "查询成功", response = QrcodePayConfirmResponse.class), + @ApiResponse(code = 200, message = "查询失败", response = ErrorResponse.class) }) @RequestMapping(value = "/consume/qrcode/query/{refno}", produces = { "application/json" }, method = RequestMethod.GET) - default ResponseEntity qrcodePayQuery(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "系统交易参考号",required=true) @PathVariable("refno") String refno) { + default ResponseEntity qrcodePayQuery(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "系统交易参考号",required=true) @PathVariable("refno") String refno) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"hostTime\" : \"hostTime\", \"refno\" : \"refno\", \"hostDate\" : \"hostDate\", \"description\" : \"description\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + + @ApiOperation(value = "", nickname = "refund", notes = "退款交易", response = RefundResponse.class, tags={ "pos", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "退款申请成功，等待查询", response = RefundResponse.class), + @ApiResponse(code = 409, message = "退款申请失败，订单号已存在或正在退款中", response = ErrorResponse.class), + @ApiResponse(code = 200, message = "退款申请失败", response = ErrorResponse.class) }) + @RequestMapping(value = "/consume/refund", + produces = { "application/json" }, + consumes = { "application/json" }, + method = RequestMethod.POST) + default ResponseEntity refund(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "" ) @Valid @RequestBody RefundRequest refundRequest) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"hostTime\" : \"hostTime\", \"refno\" : \"refno\", \"hostDate\" : \"hostDate\", \"billno\" : \"billno\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + + + @ApiOperation(value = "", nickname = "refundQuery", notes = "退款申请查询", response = RefundResponse.class, tags={ "pos", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "退款申请查询成功", response = RefundResponse.class), + @ApiResponse(code = 404, message = "退款申请订单不存在", response = ErrorResponse.class), + @ApiResponse(code = 200, message = "退款申请失败", response = ErrorResponse.class) }) + @RequestMapping(value = "/consume/refund/query/{billno}", + produces = { "application/json" }, + method = RequestMethod.GET) + default ResponseEntity refundQuery(@ApiParam(value = "租户ID" ,required=true) @RequestHeader(value="X-Tenant-Id", required=true) String xTenantId,@ApiParam(value = "退款订单号",required=true) @PathVariable("billno") String billno) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"hostTime\" : \"hostTime\", \"refno\" : \"refno\", \"hostDate\" : \"hostDate\", \"billno\" : \"billno\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java index dc318fef..7aac744e 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java @@ -4,22 +4,22 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.request.NativeWebRequest; import java.util.Optional; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-12T16:09:45.966+08:00[Asia/Shanghai]") - -@Controller -@RequestMapping("${openapi.aPITitle.base-path:/api}") -public class ConsumeApiController implements ConsumeApi { - - private final NativeWebRequest request; - - @org.springframework.beans.factory.annotation.Autowired - public ConsumeApiController(NativeWebRequest request) { - this.request = request; - } - - @Override - public Optional getRequest() { - return Optional.ofNullable(request); - } - -} +//@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2020-03-12T16:09:45.966+08:00[Asia/Shanghai]") +// +//@Controller +//@RequestMapping("${openapi.aPITitle.base-path:/api}") +//public class ConsumeApiController implements ConsumeApi { +// +// private final NativeWebRequest request; +// +// @org.springframework.beans.factory.annotation.Autowired +// public ConsumeApiController(NativeWebRequest request) { +// this.request = request; +// } +// +// @Override +// public Optional getRequest() { +// return Optional.ofNullable(request); +// } +// +//} diff --git a/payapi/src/main/java/org/openapitools/configuration/HomeController.java b/payapi/src/main/java/org/openapitools/configuration/HomeController.java index 25727830..26974286 100644 --- a/payapi/src/main/java/org/openapitools/configuration/HomeController.java +++ b/payapi/src/main/java/org/openapitools/configuration/HomeController.java @@ -7,13 +7,13 @@ import org.springframework.web.bind.annotation.RequestMapping; /** * Home redirection to OpenAPI api documentation */ -@Controller -public class HomeController { - - @RequestMapping("/") - public String index() { - return "redirect:swagger-ui.html"; - } - - -} +//@Controller +//public class HomeController { +// +// @RequestMapping("/") +// public String index() { +// return "redirect:swagger-ui.html"; +// } +// +// +//} diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/k12_consume_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/k12_consume_api_controller.kt index 5fe60feb..9aff498a 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/k12_consume_api_controller.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/k12_consume_api_controller.kt @@ -3,22 +3,21 @@ package com.supwisdom.dlpay.api import com.supwisdom.dlpay.agent.AgentCode import com.supwisdom.dlpay.agent.AgentPayService import com.supwisdom.dlpay.agent.AgentPayServiceContext +import com.supwisdom.dlpay.agent.domain.QrcodePattern import com.supwisdom.dlpay.agent.domain.QrcodePayTrans import com.supwisdom.dlpay.agent.service.AgentServiceProxy import com.supwisdom.dlpay.api.bean.QrcodePayResponse import com.supwisdom.dlpay.api.service.* +import com.supwisdom.dlpay.exception.BadRequestError import com.supwisdom.dlpay.exception.TransactionCheckException import com.supwisdom.dlpay.framework.ResponseBodyBuilder import com.supwisdom.dlpay.framework.service.SystemUtilService -import com.supwisdom.dlpay.framework.util.Dictionary -import com.supwisdom.dlpay.framework.util.TradeCode -import com.supwisdom.dlpay.framework.util.TradeDict -import com.supwisdom.dlpay.framework.util.TradeErrorCode +import com.supwisdom.dlpay.framework.util.* import com.supwisdom.dlpay.payapi.model.QrcodePayConfirmRequest import com.supwisdom.dlpay.payapi.model.QrcodePayInitRequest import com.supwisdom.dlpay.payapi.model.QrcodePayInitResponse +import com.supwisdom.multitenant.TenantContextHolder import org.apache.commons.lang3.StringUtils -import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.RequestMapping @@ -38,25 +37,28 @@ constructor(private val request: NativeWebRequest, private val userService: UserService, private val consumePayService: ConsumePayService, private val transactionService: TransactionServiceProxy, - private val accountUtilServcie: AccountUtilServcie ) : ConsumeApi { + private val accountUtilServcie: AccountUtilServcie) : ConsumeApi { override fun getRequest(): Optional { return Optional.ofNullable(request) } - override fun qrcodePayInit(xTenantId: String, @Valid param: QrcodePayInitRequest): ResponseEntity { + override fun qrcodePayInit(xTenantId: String, @Valid param: QrcodePayInitRequest): ResponseEntity { + TenantContextHolder.getContext().tenant.id = "{tenantid}" val apiResp = QrcodePayInitResponse() // 1. 检查 qrcode - val qrcode = agentServiceProxy.qrcodeMatch(param.qrcode) - ?: return ResponseBodyBuilder.badRequest("未识别的支付码") as ResponseEntity - + val qrcode: QrcodePattern + try { + qrcode = agentServiceProxy.qrcodeMatch(param.qrcode) + ?: throw BadRequestError("未识别的支付码") + } catch (e: Exception) { + throw BadRequestError(e.message!!) + } val sourceType = sourceTypeService.getBySourceType(qrcode.sourceType) - ?: return ResponseBodyBuilder.badRequest( - "不支持的支付方式<${qrcode.sourceType}>") as ResponseEntity + ?: throw BadRequestError("不支持的支付方式<${qrcode.sourceType}>") if (sourceType.paySubjno.isEmpty() || !StringUtils.isNumeric(sourceType.paySubjno)) { - return ResponseBodyBuilder.notFound( - "支付方式<${qrcode.sourceType}>未配置科目号") as ResponseEntity + throw BadRequestError("支付方式<${qrcode.sourceType}>未配置科目号") } val systime = systemUtilService.sysdatetime // 2. 记录 qrcode 交易明细表 @@ -83,45 +85,35 @@ constructor(private val request: NativeWebRequest, return when (agentResp.code) { AgentCode.SUCCESS -> { val qrcodeTransResp = agentResp.payload - // 更新qrcode交易明细表 是否匿名 字段 - agentServiceProxy.qrcodePayTransSaveOrUpdate(qrcodeTrans.also{ - it.isAnonymous = qrcodeTransResp.isAnonymous - }) if (!sourceType.anonymousEnable && qrcodeTransResp.isAnonymous) { - ResponseBodyBuilder.failEntity(apiResp, - HttpStatus.BAD_REQUEST.value(), - "支付方式<${qrcode.sourceType}> 不支持匿名支付") as ResponseEntity + throw BadRequestError("支付方式<${qrcode.sourceType}> 不支持匿名支付") } else { - val person = userService.findByUseridOrThirdUniqueIdenty(qrcodeTransResp.userid, null) - ResponseBodyBuilder.successEntity( - QrcodePayInitResponse().apply { - this.anonymous = qrcodeTransResp.isAnonymous - this.sourcetype = sourceType.sourceType + // 更新qrcode交易明细表 是否匿名 字段 + if (StringUtil.isEmpty(qrcodeTransResp.userid)) { + qrcodeTransResp.isAnonymous = true + } else { + val person = userService.findByUseridOrThirdUniqueIdenty(qrcodeTransResp.userid, null) + if (person == null) { + qrcodeTransResp.isAnonymous = true + } else { + apiResp.apply { + qrcodeTransResp.isAnonymous = false this.userid = qrcodeTransResp.agentUserId - this.username = person!!.name + this.username = person.name } - ) as ResponseEntity + } + } + agentServiceProxy.qrcodePayTransSaveOrUpdate(qrcodeTrans.also { + it.isAnonymous = qrcodeTransResp.isAnonymous + }) + ResponseBodyBuilder.ok(apiResp) } } AgentCode.NOT_SUPPORT -> { - val qrcodeTransResp = agentResp.payload - agentServiceProxy.qrcodePayTransSaveOrUpdate(qrcodeTrans.also{ - it.isAnonymous = qrcodeTransResp.isAnonymous - }) - if (!sourceType.anonymousEnable) { - ResponseBodyBuilder.failEntity(apiResp, - HttpStatus.BAD_REQUEST.value(), - "支付方式<${qrcode.sourceType}> 不支持匿名支付") as ResponseEntity - } else { - ResponseBodyBuilder.successEntity(apiResp.also { - it.anonymous = qrcodeTransResp.isAnonymous - }) as ResponseEntity - } + throw BadRequestError("系统或商户暂不支持当前的支付类型}") } else -> { - ResponseBodyBuilder.failEntity(apiResp, - HttpStatus.INTERNAL_SERVER_ERROR.value(), - "第三方身份错误,<${agentResp.agentMsg}") as ResponseEntity + throw BadRequestError("第三方身份错误,<${agentResp.agentMsg}") } } } @@ -242,7 +234,7 @@ constructor(private val request: NativeWebRequest, // } // } // } -// + // override fun qrcodePayQuery(xTenantId: String, refno: String): ResponseEntity { // return null // } diff --git a/payapi/src/main/resources/application.properties b/payapi/src/main/resources/application.properties index 7565c8c1..bdd8bfe0 100644 --- a/payapi/src/main/resources/application.properties +++ b/payapi/src/main/resources/application.properties @@ -50,8 +50,7 @@ auth.password.bcrypt.length=10 spring.redis.database=0 ################################################### springfox.documentation.swagger.v2.path=/api-docs -openapi.aPITitle.base-path=/payapi -spring.jackson.date-format=com.supwisdom.dlpay.payapi.RFC3339DateFormat +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false multi-tenant.header.key=X-TENANT-ID diff --git a/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt index 65bd05bb..96d2460d 100644 --- a/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt +++ b/payapi/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt @@ -123,4 +123,11 @@ class SecurityControllerTest : MvcBaseTest() { } } + @Test + fun testHMACSHA256() { + val token = "TJ3UlX9/tyunSZ2b" + val secret = "5f788ce433ec44f299351cdf7f137e81" + val jwt = HmacUtil.HMACSHA256(token, secret) + println(jwt) + } } \ No newline at end of file -- 2.17.1