用户退出接口修改

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/TokenController.java

@@ -124,10 +124,9 @@ public class TokenController extends BaseController {
 		return succeed(objectMapper.readValue(resp.getBody(), Map.class));
 	}
 
-	@PostMapping(value = "exit",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	@GetMapping(value = "exit")
 	@ApiOperation(value = "退出登录")
 	public HttpResponseResult<String> logout(HttpServletRequest request) {
-		
 		String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
 		if (StringUtils.isBlank(authHeader)) {
 			return failed("退出失败，token 为空");

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -133,7 +133,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
                 }
                 return BaseResult.succeed(payment);
             } else {
-                return BaseResult.failed(response.getMsg());
+                return BaseResult.failed(response.getMsg() + ":" + response.getSubMsg());
             }
         } catch (AlipayApiException e) {
             log.error("调用支付宝APP查询订单接口失败，err_code={} err_msg={}", e.getErrCode(), e.getErrMsg());
@@ -162,7 +162,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
             if (response.isSuccess()) {
                 return BaseResult.succeed(closePayment);
             } else {
-                return BaseResult.failed(response.getMsg());
+                return BaseResult.failed(response.getMsg() + ":" + response.getSubMsg());
             }
         } catch (AlipayApiException e) {
             log.error("调用支付宝APP支付关单接口失败，err_code={} err_msg={}", e.getErrCode(), e.getErrMsg());
@@ -193,7 +193,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
                 refundBill.setStatus(TradeStatusEnum.succeeded);
                 return BaseResult.succeed(refundBill);
             } else {
-                return BaseResult.failed(response.getMsg());
+                return BaseResult.failed(response.getMsg() + ":" + response.getSubMsg());
             }
         } catch (AlipayApiException e) {
             log.error("调用支付宝APP支付退款接口失败，err_code={} err_msg={}", e.getErrCode(), e.getErrMsg());