From 879867476b1370399ef7a22ddf7e95411c8783ca Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Fri, 17 Sep 2021 18:14:02 +0800
Subject: [PATCH 1/2] replace parent docker

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d66c495f6..9877a7806 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,7 +266,7 @@
                         <version>${jib-maven-plugin.version}</version>
                         <configuration>
                             <from>
-                                <image>192.168.0.84:5000/royalpay/serverjre:openj9</image>
+                                <image>192.168.0.84:5000/royalpay/openjdk:openjdk8-openj9</image>
                             </from>
                             <to>
                                 <image>192.168.0.84:5000/royalpay/manage-dev</image>
@@ -304,7 +304,7 @@
                         <version>${jib-maven-plugin.version}</version>
                         <configuration>
                             <from>
-                                <image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
+                                <image>192.168.0.84:5000/royalpay/openjdk:openjdk8-openj9</image>
                             </from>
                             <to>
                                 <image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${project.version}

From bb1e1382c76db2919db19b8eb7368d8b9af97054 Mon Sep 17 00:00:00 2001
From: Todking <tod.wu@geekforbest.com>
Date: Fri, 17 Sep 2021 19:25:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20aps=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/partner_payment_info.html  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 13627efc0..d9dbc9338 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -250,13 +250,13 @@
                            ng-change="toggleChannel('rpaypmt_dd')">
                 </div>
             </div>
-            <div class="form-group col-sm-4">
-                <label class="col-xs-6 control-label">Alipay+|支付宝</label>
-                <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch
-                           ng-change="toggleChannel('alipayplus')">
-                </div>
-            </div>
+<!--            <div class="form-group col-sm-4">-->
+<!--                <label class="col-xs-6 control-label">Alipay+|支付宝</label>-->
+<!--                <div class="col-xs-6">-->
+<!--                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch-->
+<!--                           ng-change="toggleChannel('alipayplus')">-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">Alipay+(APS)</label>
                 <div class="col-xs-6">
@@ -556,7 +556,7 @@
             <div class="form-group col-sm-4">
                 <label class="col-xs-6 control-label">AlipayCN channel</label>
                 <div class="col-xs-6">
-                    <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="APS"
+                    <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="Alipay+(APS)"
                            switch-off-text="Alipay"
                            ng-change="switchAlipayCn(paymentInfo.client_id,paymentInfo.aps_config_id,paymentInfo.alipay_cn_switch)">
                 </div>