From 410d1519de4c5222a12e1880c716c6558eb70284 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 28 Jun 2018 18:01:39 +0800 Subject: [PATCH 1/6] fix html --- .../templates/client_partner_detail.html | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index ef00c50bd..1fb94fbac 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -315,18 +315,26 @@

-
- - +
+
-

+ +
+

No more than 100 characters

+
-
- - +
+
-

+ +
+

No more than 50 characters

+
Date: Thu, 28 Jun 2018 18:46:49 +0800 Subject: [PATCH 2/6] fix --- src/main/ui/static/css/hf_gateway.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/css/hf_gateway.css b/src/main/ui/static/css/hf_gateway.css index ebc34860d..e4be7ec62 100644 --- a/src/main/ui/static/css/hf_gateway.css +++ b/src/main/ui/static/css/hf_gateway.css @@ -23,11 +23,11 @@ } .order-box{ - height: 600px; width: 800px; margin: 2% auto; box-shadow: 0px 0px 25px 0px rgba(0,0,0,0.21); } + .order-box:after{ content:''; display:block; @@ -121,4 +121,13 @@ font-size: 17px; color: #444444; letter-spacing: 0px; +} + +@media(max-width:800px){ + .order-box{ + width:100%; + } + .order-info{ + padding:50px 10px; + } } \ No newline at end of file From f06271cd09ef10ddb89ef9166c09bd28e84eb597 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 29 Jun 2018 09:21:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A9?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/simple-apply.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/simple-apply.js b/src/main/ui/static/payment/partner/simple-apply.js index 53bcb622e..ad4422a48 100644 --- a/src/main/ui/static/payment/partner/simple-apply.js +++ b/src/main/ui/static/payment/partner/simple-apply.js @@ -8,7 +8,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS controller: 'simpleApplicationListCtrl', data: {label: '商户自主申请列表'} }).state('partner_apply.apply_detail', { - url: '/{client_pre_apply_id}/detail', + url: '/{client_pre_apply_id}/apply/detail', templateUrl: '/static/payment/partner/templates/simple_application_detail.html', controller: 'simpleApplicationDetailCtrl', resolve: { From a498e4dcd4a21a639670c26e0e26f903ab810082 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 29 Jun 2018 10:57:29 +0800 Subject: [PATCH 4/6] fix bug --- .../analysis/monitoring/templates/analysis_monitoring.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html index 692c46047..7ebb4c4ff 100644 --- a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html +++ b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html @@ -19,7 +19,7 @@
  • 欠款|Pre Refund
    • -
  • +
  • 风控记录|Risk Records
    • From 91bcf7f9b3e1d5167560ebae87022a98ebf25339 Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 29 Jun 2018 14:56:45 +0800 Subject: [PATCH 5/6] fix hf --- .../signin/core/SignInStatusManager.java | 4 +++ .../core/impls/SignInStatusManagerImpl.java | 26 +++++++++++++++++++ .../manage/signin/web/SignInController.java | 17 ++++++++++++ src/main/ui/static/css/hf_gateway.css | 3 ++- 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java index 03b17d6f3..df81168df 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java @@ -62,5 +62,9 @@ public interface SignInStatusManager { String appQRCodeSignInStatus(String codeId); + JSONObject customerQRCode(); + void scanCustomerQrcode(String codeId, String openid); + + String getWechatCustomerId(String codeId); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java index 739d5925a..a3f4cbf41 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.servlet.ModelAndView; import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; import javax.annotation.Resource; @@ -319,6 +320,31 @@ public class SignInStatusManagerImpl implements SignInStatusManager { return statusKey; } + @Override + public JSONObject customerQRCode() { + String codeId = "customer_" + RandomStringUtils.random(15, true, true) + "_" + System.currentTimeMillis(); + JSONObject res = new JSONObject(); + res.put("code_id", codeId); + res.put("code_img", QRCodeUtils.qrcodeImageCode(PlatformEnvironment.getEnv().concatUrl("/global/userstatus/customer_wechat_qrcode/" + codeId), 300,false)); + System.out.println("====code:"+codeId); + return res; + } + + @Override + public void scanCustomerQrcode(String codeId, String openid) { + stringRedisTemplate.boundValueOps(redisPrefix + ":customer_qrcode:code:" + codeId).set(openid, 1, TimeUnit.MINUTES); + } + + @Override + public String getWechatCustomerId(String codeId) { + String statusKey = stringRedisTemplate.boundValueOps(redisPrefix + ":customer_qrcode:code:" + codeId).get(); + if (statusKey == null) { + throw new ForbiddenException("Not signed yet"); + } + stringRedisTemplate.delete(redisPrefix + ":customer_qrcode:code:" + codeId); + return statusKey; + } + private void lockRandomCodeId(String codeId) { stringRedisTemplate.boundValueOps(redisPrefix + "partner_signin" + codeId).set(codeId, 30, TimeUnit.SECONDS); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java index 4bab11773..97c1b2199 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java @@ -326,4 +326,21 @@ public class SignInController { } throw new ForbiddenException("error.not_support_browser"); } + + @RequestMapping(value = "/customer_wechat_qrcode", method = RequestMethod.GET) + public JSONObject customerQRCode() { + return signInStatusManager.customerQRCode(); + } + + @WechatMapping(value = "/customer_wechat_qrcode/{codeId}", method = RequestMethod.GET) + public ModelAndView scanCustomerQrcode(@PathVariable String codeId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wechatUser) { + signInStatusManager.scanCustomerQrcode(codeId, wechatUser.getString("openid")); + return new ModelAndView("manager_bind_success"); + } + + @RequestMapping(value = "/customer_wechat_qrcode/{codeId}/check", method = RequestMethod.GET) + public void getCustomerID(@PathVariable String codeId, HttpServletResponse response) { + String statusKey = signInStatusManager.getWechatCustomerId(codeId); + HttpUtils.setCookie(response, "CustomerID", statusKey,false); + } } diff --git a/src/main/ui/static/css/hf_gateway.css b/src/main/ui/static/css/hf_gateway.css index e4be7ec62..8c6ada962 100644 --- a/src/main/ui/static/css/hf_gateway.css +++ b/src/main/ui/static/css/hf_gateway.css @@ -23,6 +23,7 @@ } .order-box{ + height: 400px; width: 800px; margin: 2% auto; box-shadow: 0px 0px 25px 0px rgba(0,0,0,0.21); @@ -66,7 +67,7 @@ color: #FFFFFF; } .intro{ - line-height: 550px; + margin: 100px 0 50px; color: #FFFFFF; } .order-box .right{ From 212f9411d7e5b6738ace75c91878a148180bbfdb Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 29 Jun 2018 16:37:48 +0800 Subject: [PATCH 6/6] fix hf css --- src/main/ui/static/css/hf_gateway.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/css/hf_gateway.css b/src/main/ui/static/css/hf_gateway.css index 8c6ada962..6644c0482 100644 --- a/src/main/ui/static/css/hf_gateway.css +++ b/src/main/ui/static/css/hf_gateway.css @@ -106,9 +106,9 @@ /*成功页*/ .order-box .success-logo{ text-align: center; - height: 200px; + height: 150px; background: #F0F3FA; - line-height: 200px; + line-height: 150px; font-family: PingFangSC-Regular; font-size: 22px; color: #444444;