From c3e81c06e7e491902672cedb2d9683e8763d6330 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 30 Mar 2020 13:51:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96gateway=20=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/gateway/web/GtwPayController.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index be6d056b7..57a345101 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.20 + 1.4.21 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/gateway/web/GtwPayController.java b/src/main/java/au/com/royalpay/payment/manage/gateway/web/GtwPayController.java index 5079ba76b..280863f6d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/gateway/web/GtwPayController.java +++ b/src/main/java/au/com/royalpay/payment/manage/gateway/web/GtwPayController.java @@ -5,7 +5,10 @@ import au.com.royalpay.payment.core.utils.PaymentValidUtils; import au.com.royalpay.payment.manage.gateway.advice.Gtw2Ctrl; import au.com.royalpay.payment.manage.gateway.core.GatewayMerchantApply; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; +import au.com.royalpay.payment.tools.exceptions.BadRequestException; import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -19,6 +22,7 @@ import javax.annotation.Resource; @RequestMapping("/api/v1.0/org_gateway/partners/{shortId}") @Gtw2Ctrl public class GtwPayController { + private Logger logger = LoggerFactory.getLogger(getClass()); @Resource private GatewayMerchantApply gatewayMerchantApply; @Resource @@ -41,12 +45,18 @@ public class GtwPayController { } @PostMapping("/attachment/files") - public JSONObject uploadFile(@PathVariable String shortId,@RequestParam MultipartFile file) throws Exception { + public JSONObject uploadFile(@PathVariable String shortId,@RequestParam MultipartFile file) { JSONObject org = gatewayMerchantApply.validOrgV200(shortId); if (org == null) { throw new InvalidShortIdException(); } - JSONObject fileInfo = attachmentClient.uploadFile(file, false); + JSONObject fileInfo = new JSONObject(); + try { + fileInfo = attachmentClient.uploadFile(file, false); + } catch (Exception e) { + logger.error("file upload fail :{}" , e.getMessage()); + throw new BadRequestException("File upload failed"); + } fileInfo.put("file_type", fileInfo.getString("filetype")); fileInfo.remove("filepath"); fileInfo.remove("length"); From 697c687c223c662a29466c513a3760e058295072 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 30 Mar 2020 16:52:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Y]=20h5=E7=BD=91=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/images/guide.png | Bin 0 -> 1011 bytes .../ui/static/templates/skip_wxbrowser.css | 193 ++++++++++++++++++ .../ui/static/templates/skip_wxbrowser.js | 50 +++++ 3 files changed, 243 insertions(+) create mode 100644 src/main/ui/static/images/guide.png create mode 100644 src/main/ui/static/templates/skip_wxbrowser.css create mode 100644 src/main/ui/static/templates/skip_wxbrowser.js diff --git a/src/main/ui/static/images/guide.png b/src/main/ui/static/images/guide.png new file mode 100644 index 0000000000000000000000000000000000000000..1f1e23f74467d92fb7420ec0bbf5653084f7b9ff GIT binary patch literal 1011 zcmeAS@N?(olHy`uVBq!ia0vp^UO+sBgBeINTlvcXsdWK9A+A9B|Ih)tU0<|-F19QQ z@(X78^P^qr)4MI4V!ZoyPR+7Zd9kUU~}1(8-o7knBAJO?NN=?rJD8EcN(&n_Hc%HIj*{Ds!FX% zOFGv+zdN6}{`2wYp4)yYynMC#&r*iv=d*)PKXP6&FIf54sl9*Bzy9rY(mD0{mVJK% zdH+2-clqPn&pZauVWPGY! zcdJV3Nz2r>HFB*{uXrXZW#3l}@hxRO z>Z!{0b%|+f)~i;hUXz6Z%x5*G1Pdyi-D(i<#X@&W$ijf^#A)9m_iIe)KhrV$Yr~`I zZ83)OJCgEJH*CBf+U(()cOu;M!~@=#;>ndKLKiHzbFnIZTyiLK^&B%1t$^uHx*ImV zJpI_`OfegKxO4Kl$Xvysd8ezwRsCLDa)mzH@@{2=?H*lT5m{5C8`s%a1zo!}3};j@xfZgSNLJxX^l|8=W`U9<{VD?)BMOib9T^~sRC_^P>J?K$|2dHr z$B$j>xc#DJ#kvPmmM=LMd4VCi;?10;GG}HOS2LFV|8?%0W^K{hRXsod?JTwC*m^K0 zIpp}fht)Cvc{Zp9-?Q=x$@kjuT_EDp?pwwG*7WA;Jr>a3Z{A@t*?np}b8(gF>lO3r z4wT78XFtF3c6GwtqwQRlyAqu0FWEJ{D|W-rRTK9;4a}^VuhwOXl@! zP8Z-aIW*_1(5e~B{z!!yyyN1vTg{mwrn~g4d0_OvuAKJ3G=<|P(-yDa!Sz>#wUTMd z=cn?V*%K@>LmcKb<}^pn)BB@l+Isjxidr3WK!?}HQw6g$fO&zz)78&qol`;+0I*s$ A`2YX_ literal 0 HcmV?d00001 diff --git a/src/main/ui/static/templates/skip_wxbrowser.css b/src/main/ui/static/templates/skip_wxbrowser.css new file mode 100644 index 000000000..e91cd1866 --- /dev/null +++ b/src/main/ui/static/templates/skip_wxbrowser.css @@ -0,0 +1,193 @@ +* { + margin: 0; + padding: 0; +} + +a { + text-decoration: none; +} + +img { + max-width: 100%; + height: auto; +} + +.weixin-tip { + padding-top: 10px; + display: none; + position: fixed; + left: 0; + top: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.8); + filter: alpha(opacity=80); + height: 100%; + width: 100%; + z-index: 100; +} + +.weixin-tip p { + text-align: center; + margin-top: 10%; + padding: 0 5%; +} + +body { + font-weight: 500; + font-family: PingFangSC-Regular, "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; +} + +.am-header { + display: none; +} + +.alipay-logo { + display: none; +} + +.result { + margin-top: 40px; + width: 100%; +} + +.result-alipay-logo { + width: 70px; + height: 98px; + margin: auto; + background-image: url(data:image/png;base64,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); + background-repeat: no-repeat; + background-size: contain; +} + +.result-royalpay-logo { + width: 70px; + height: 98px; + margin: auto; + background-image: url(data:image/png;base64,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); + background-repeat: no-repeat; + background-size: contain; +} + +.result-title { + margin: 40px 0 14px; + text-align: center; + font-size: 21px; + color: #f06101; + line-height: 25px; +} + +.result-tips { + max-width: 370px; + margin: 0 auto 10px; + padding: 0 15px; + font-size: 15px; + color: #a5a5a5; + line-height: 18px; + text-align: left; + word-break: break-all; + word-wrap: break-word; +} + +.guide-tips { + max-width: 200px; + margin: 0 auto 10px; + padding: 0 15px; + font-size: 16px; + color: #a5a5a5; + line-height: 30px; + text-align: left; + word-break: break-all; + word-wrap: break-word; +} + +.result-botton { + margin: 0 15px 20px; +} + +.result-botton a { + display: block; + margin: auto; + -webkit-box-sizing: border-box; + box-sizing: border-box; + max-width: 384px; + height: 44px; + text-align: center; +} + +.result-botton a.am-button-white { + color: #f06101; + background: #ffffff; + border: 1px solid #f06101; +} + +.result-botton .am-button[disabled=disabled] { + color: #e6e6e6; + background: #f8f8f8; + border: 1px solid #dedede; +} + +.loading { + display: none; +} + +.close-weixin-tip img { + padding-left: 30px; + padding-top: 30px; + width: 25px; +} + +.guide-tip { + display: inline; + float: right; + height: 20%; +} + + +.am-button { + -ms-box-sizing: border-box; + box-sizing: border-box; + display: inline-block; + margin: 0; + padding: 4px 8px; + width: 100%; + text-align: center; + font-size: 18px; + line-height: 2; + border-radius: 4px; + background-clip: padding-box; +} + +.am-button-royalpay { + border: 1px solid #f06101; + color: #fff; + background: #f06101; +} + +.pay-brands { + text-align: center; + line-height: 20px; + font-size: 24px; + margin-top: 12px; + color: #dddddd; +} + +.pay-brands img { + height: 18px; +} + + +ol { + padding: 2%; + counter-reset: sectioncounter; + color: #ffffff; +} + +ol > li:before { + counter-increment: sectioncounter; + color: #ffffff; + text-align: center; +} + +ol li { + list-style-position: outside; +} diff --git a/src/main/ui/static/templates/skip_wxbrowser.js b/src/main/ui/static/templates/skip_wxbrowser.js new file mode 100644 index 000000000..fbf786dcd --- /dev/null +++ b/src/main/ui/static/templates/skip_wxbrowser.js @@ -0,0 +1,50 @@ +window = {}; +$(function () { + 'use strict'; + var winHeight = $(window).height(); + var ua = navigator.userAgent.toLowerCase(); + if (ua.indexOf('micromessenger') >= 0) { + $(".weixin-tip").show().css("height", winHeight); + } else { + location.href = window.target_href; + } + $('.close-weixin-tip').bind('touchstart', function () { + $(".weixin-tip").hide(); + checkOrderStd(window.client_moniker, window.partner_order_id, true); + }); + $('#complete').bind('touchstart', function () { + checkOrderStd(window.client_moniker, window.partner_order_id, false); + }); + $('#continue_use_browser').bind('touchstart', function () { + location.href = window.target_href; + }); + + function checkOrderStd(clientMoniker, merchantOrderId, needLoop) { + if (!clientMoniker || !merchantOrderId) { + return; + } + $.ajax({ + url: '/api/v1.0/payment/clients/' + clientMoniker + '/orders/' + merchantOrderId + '/status', + method: 'GET', + dataType: 'json', + success: function (res) { + if (res.paid) { + location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true&time=' + res.time + '&nonce_str=' + res.nonce_str + '&sign=' + res.sign; + } else { + if (needLoop) { + setTimeout(checkOrderStd(clientMoniker, merchantOrderId, needLoop), 3000); + } + if (!needLoop && !res.paid) { + alert("订单未支付，请稍后再试"); + } + } + }, + error: function (res) { + if (needLoop && res.message) { + alert(res.message); + } + } + }) + } +}) +;