From cc3f01fea796bcc75f0ee5b1e60b24905b2b4d85 Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Tue, 17 Mar 2020 12:53:15 +0800 Subject: [PATCH] =?utf8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/application-devel-pg.properties | 4 +-- payapi/build.gradle | 1 + .../dlpay/api/ConsumeApiController.java | 25 ----------------- .../MyAuthenticationFailureHandler.java | 7 +++-- ...roller.java => OpenApiHomeController.java} | 21 +++++++------- .../api/controller/consume_api_controller.kt | 28 +++++++++---------- .../controller/k12_consume_api_controller.kt | 16 +++++------ .../src/main/resources/application.properties | 1 - 8 files changed, 39 insertions(+), 64 deletions(-) delete mode 100644 payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java rename payapi/src/main/java/org/openapitools/configuration/{HomeController.java => OpenApiHomeController.java} (55%) diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties index 288641d4..538f23a4 100644 --- a/config/application-devel-pg.properties +++ b/config/application-devel-pg.properties @@ -13,8 +13,6 @@ 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.70 spring.redis.port=10021 spring.redis.password=kingstar @@ -50,7 +48,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.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/build.gradle b/payapi/build.gradle index 656a3198..455aa289 100644 --- a/payapi/build.gradle +++ b/payapi/build.gradle @@ -76,6 +76,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-cache" + runtime "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-autoconfigure" implementation "org.springframework.security:spring-security-oauth2-jose" implementation "org.springframework.security:spring-security-oauth2-client" diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java b/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java deleted file mode 100644 index 7aac744e..00000000 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/ConsumeApiController.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.supwisdom.dlpay.api; - -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); -// } -// -//} diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java index f18d092f..70f17c2c 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/security/MyAuthenticationFailureHandler.java @@ -19,8 +19,11 @@ import java.io.IOException; @Component("myAuthenticationFailureHandler") public class MyAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler { - @Autowired - private ObjectMapper objectMapper; + private final ObjectMapper objectMapper; + + public MyAuthenticationFailureHandler(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } @Override diff --git a/payapi/src/main/java/org/openapitools/configuration/HomeController.java b/payapi/src/main/java/org/openapitools/configuration/OpenApiHomeController.java similarity index 55% rename from payapi/src/main/java/org/openapitools/configuration/HomeController.java rename to payapi/src/main/java/org/openapitools/configuration/OpenApiHomeController.java index 26974286..ec38d667 100644 --- a/payapi/src/main/java/org/openapitools/configuration/HomeController.java +++ b/payapi/src/main/java/org/openapitools/configuration/OpenApiHomeController.java @@ -7,13 +7,14 @@ 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 OpenApiHomeController { + + @RequestMapping("/swagger") + public String index() { + return "redirect:swagger-ui.html"; + } + + +} diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt index cfccf8d3..f5003275 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt @@ -31,18 +31,18 @@ import javax.validation.Valid @RestController @RequestMapping("/api/consume") @Validated -class ConsumeAPIController(private val qrCodeService: QRCodeService, - private val accountUtilServcie: AccountUtilServcie, - private val userService: UserService, - private val systemUtilService: SystemUtilService, - private val consumePayService: ConsumePayService, - private val transactionService: TransactionServiceProxy, - private val cardService: CardService, - private val agentPayServiceContext: AgentPayServiceContext, - private val sourceTypeService: SourceTypeService, - private val agentQueryResultTask: AgentQueryResultTask, - private val agentServiceProxy: AgentServiceProxy, - redisConnectionFactory: RedisConnectionFactory) { +class DaliConsumeAPIController(private val qrCodeService: QRCodeService, + private val accountUtilServcie: AccountUtilServcie, + private val userService: UserService, + private val systemUtilService: SystemUtilService, + private val consumePayService: ConsumePayService, + private val transactionService: TransactionServiceProxy, + private val cardService: CardService, + private val agentPayServiceContext: AgentPayServiceContext, + private val sourceTypeService: SourceTypeService, + private val agentQueryResultTask: AgentQueryResultTask, + private val agentServiceProxy: AgentServiceProxy, + redisConnectionFactory: RedisConnectionFactory) { private val redisTemplate = RedisTemplate() @@ -449,7 +449,7 @@ class ConsumeAPIController(private val qrCodeService: QRCodeService, .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "交易扣费失败")) } - @RequestMapping("/qrcode/init", method = [RequestMethod.POST, RequestMethod.GET]) +// @RequestMapping("/qrcode/init", method = [RequestMethod.POST, RequestMethod.GET]) fun qrcodePayInit(@Validated(InitAction::class) @RequestBody param: QrcodePayParam) : ResponseEntity { val apiResp = QrcodePayResponse() @@ -528,7 +528,7 @@ class ConsumeAPIController(private val qrCodeService: QRCodeService, private fun qrcodeSummary(st: TSourceType): String = st.paydesc + "扫码付" - @PostMapping("/qrcode/confirm") +// @PostMapping("/qrcode/confirm") fun qrcodePayConfirm(@Validated(ConfirmAction::class) @RequestBody param: QrcodePayParam) : ResponseEntity { //1. 交易检查 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 9aff498a..7d866779 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 @@ -1,4 +1,4 @@ -package com.supwisdom.dlpay.api +package com.supwisdom.dlpay.api.controller import com.supwisdom.dlpay.agent.AgentCode import com.supwisdom.dlpay.agent.AgentPayService @@ -6,27 +6,26 @@ 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.ConsumeApi 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.* -import com.supwisdom.dlpay.payapi.model.QrcodePayConfirmRequest +import com.supwisdom.dlpay.framework.util.StringUtil +import com.supwisdom.dlpay.framework.util.TradeErrorCode 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.ResponseEntity -import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController import org.springframework.web.context.request.NativeWebRequest - +import java.util.* import javax.validation.Valid -import java.util.Optional -@Controller +@RestController @RequestMapping("\${openapi.aPITitle.base-path:/api}") class K12ConsumeApiController constructor(private val request: NativeWebRequest, @@ -44,7 +43,6 @@ constructor(private val request: NativeWebRequest, } override fun qrcodePayInit(xTenantId: String, @Valid param: QrcodePayInitRequest): ResponseEntity { - TenantContextHolder.getContext().tenant.id = "{tenantid}" val apiResp = QrcodePayInitResponse() // 1. 检查 qrcode val qrcode: QrcodePattern diff --git a/payapi/src/main/resources/application.properties b/payapi/src/main/resources/application.properties index bdd8bfe0..3223e1cd 100644 --- a/payapi/src/main/resources/application.properties +++ b/payapi/src/main/resources/application.properties @@ -52,7 +52,6 @@ spring.redis.database=0 springfox.documentation.swagger.v2.path=/api-docs 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 multi-tenant.session.name=tenant-id multi-tenant.session.enableSessionScopedBean=false -- 2.17.1