build: 2.1.2 rpaysvc

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
@@ -37,6 +37,10 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>hf-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.com.royalpay.payment</groupId>
+            <artifactId>rppaymentsvc</artifactId>
+        </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>jd-core</artifactId>

src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java

@@ -1,9 +1,6 @@
 package au.com.royalpay.payment.manage;
 
 import au.com.royalpay.payment.manage.permission.manager.ManagerUserInterceptor;
-import au.com.royalpay.payment.tools.permission.alipay.AlipayUserInterceptor;
-import au.com.royalpay.payment.tools.permission.consumer.ConsumersInterceptor;
-import au.com.royalpay.payment.tools.permission.wechat.WechatUserInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -17,20 +14,11 @@ import javax.annotation.Resource;
 public class WebConfiguration implements WebMvcConfigurer {
     @Resource
     private ManagerUserInterceptor managerUserInterceptor;
-    @Resource
-    private WechatUserInterceptor wechatUserInterceptor;
-    @Resource
-    private AlipayUserInterceptor alipayUserInterceptor;
-    @Resource
-    private ConsumersInterceptor consumersInterceptor;
 
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(managerUserInterceptor).order(1);
-        registry.addInterceptor(wechatUserInterceptor).order(1);
-        registry.addInterceptor(alipayUserInterceptor).order(1);
-        registry.addInterceptor(consumersInterceptor).order(1);
     }
 
 

src/main/resources/application-rppaysvc.yml

@@ -0,0 +1,7 @@
+app:
+  rpaysvc:
+    appid: 3daefd62-3003-4a93-821e-5962d5ff67c2
+    priv-key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDE55tREo6t6m1hekGlaMmDivorV3a+MkA/Wna0k917u/CGYIf7FtmWk1um7VcBRdljluLjqThePZgbgtwqTdHWXJP2gPwoJjLUluVEyKh19blSgrq7K1FEryAzQ5XFLzMX//EMc1BNrqcREHC6XVlJeNzpOd8+C83cxGxL+ayLoQ/ePEyp/8yXBbA6t2yXyi7H1ry8WiFFg9RFf+zAeESFXlKIS72fw9I9GxG6PLUhbD8S+IIJ2A0ZudKUQIUw4M0wSilo40lfqp/xRyfUBZevKcPrO5/ZCJX6V2d154s1m5p0Z/eLtQ1ido0quVi/LzBb1KXDYNHV6hPJjNQmNbMnAgMBAAECggEAY/rqLW9LzVk0cwN947xiXg2qW2mM3KRtZP3NOoG+O37BcaoAQelnUILATfFDdVz/Ngc+a7TX71o9KvL2UfCztLHLW6ZA4y4KL1HzVkrA5yx/DjtdD36+RC7cHcuad8YwnmYSAm1nABrHr+12H9sYZCsfmLkO9tVNkWSXTLiY+UhJ1hTua2LYgaTsHR9lYLt/K+PNIBAToKuMcKFTEMWbrnekrFhXkPdeS3alFL/0X7csaPhLvZTDaAtpAytvnmN4nuZmnONnDqPJ3IEFjc7xwZ15D9Qgv/+g74q1VzU/0+2421S6BSijUK3kUdeHXASU3YvIczfnbr5t+NYL7nd68QKBgQDlLFNMz9rVFLd5b351tnld9rni8KzHi+V+eXeJpQ+zriTODOvvkFJrTSZKm+JQoBrpTI+EA1fovxLnDBhNnrR4HmHhudMTGqU6JOZLj+fk8UQKXDpVEGWO6QT68ds+Ii1ex1UEkbBkLWGrrHlFAdY0q+Af7L7Fe0osZX9382b+aQKBgQDb9EmDD79IFOxSjMJVnlN0g2P48hQ9M40cEzXRD/iyyBr9l8rE400Q6GT35ZgHKSrG2nXZehWCaQQqniHu+y6UHnJfhbC0LEYdcYRoyamlGwEFp8xSRJ88R2IoL+2g+XJ1Tc6eACjsEJWZooga6bqdrYjaAe0uSGid0Buh6JMTDwKBgGIfJFtS84MgJ55a2m5T/or4xIYiPhgCEfSg1Umd3qcz/JYseihMRr2ifq6bJ78VjfAt05TWSaFhjhpW12EEfoifmZEoGvOnCO9oNSJNLyCbHGLDMkaRiqoxouw++XwU7hASkJgwOLHrrFHwusuNCcXrgT6qAtRTAWMY4gbdtE9hAoGAWnZsTZUKbND+KS1vN9t4I3FuipK1tD4hiSx1c9iHxq/6OdZWNQfvSEbsT/CDyF4sE8EBu0I02n/qkMSc3Dc+fvjOvW60sEWNSMrJVHesaBVlJDhRFnzWqOoK+tBLgWtWodwwYFdcfUqM3LU2GSuL7xHSOSeVrvVk4ZMX6k1HQA0CgYAypY0eecX8Gc7SCt7wpYoNuL2MuZZIDXNZVMpWYMokA1Z74oX1uzecyTNLHgCFHpjiJPyc6KW1/pnDpcA9FuTmLUuNyuqsX85IEMZPkIqPFebAl4IvOuwzvXDPxxgh8B+XBQBydgFADeqgqXG8rxomC4PUrX47pKb1G89bTGp8Dw==
+    pub-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmifNnVZG6HZBYdvLnCGyNm7rQTZKyl3w+7xdBGgjsQeaskdy/IgmrWRG4Ii1o82KV/ZA+bw86vE37axpoxbqOU3LYVb69nVYvmJOL018iBs74HhbZ8CtWtQmEIKqmX/rNUdp15OgwzDckvrK/EEzjdOoQfAkFB68wLOsTcsRwBB3JUL/uiHGK6b5Ofmh4PxYeAVNpWYHyCaQIuN6JH85VHBVS4etP25GbgWxl+ktuZucaPsQ2G25mwhlpNiC28J4la0wD33JKMfCNCjORlWkw2HcDvrRLqza4lJOXu0rFy3JuUkZ0hn834ZWd3MboqNNE6a2xe4ppZUJ9ccM9312JQIDAQAB
+    server-root: https://channel.rpayplus.com/channel/v1/
+

src/main/resources/application.yml

@@ -179,7 +179,7 @@ spring:
     host: smtp.office365.com
     port: 587
   profiles:
-    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay
+    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc
   redis:
     database: 1
     host: 127.0.0.1

src/main/ui/static/templates/payment/v1/card_pay.js

@@ -0,0 +1,38 @@
+$(function () {
+    let $container = $('.qr-img-box')[0];
+    let cardFrame = window.channel_account_id ? TokenInputFrame($container, window.channel_account_id) : CardInputFrame($container);
+    cardFrame.onSuccess = function (secretData) {
+        $.ajax({
+            url: 'commit',
+            data: JSON.stringify(secretData),
+            contentType: 'application/json',
+            success: function () {
+                startCheckOrder(window.client_moniker, window.partner_order_id);
+            }
+        })
+    };
+    cardFrame.show();
+
+    $('#payBtn').click(function () {
+        cardFrame.commit();
+    });
+
+    function startCheckOrder(clientMoniker, merchantOrderId) {
+        function checkOrderStd() {
+            $.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 {
+                        setTimeout(checkOrderStd, 500);
+                    }
+                }
+            })
+        }
+
+        checkOrderStd();
+    }
+});