Merge remote-tracking branch 'origin/alipayplus_aps' into alipayplus_aps

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}

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">
+<!--            <div class="form-group col-sm-4">-->
-                <label class="col-xs-6 control-label">Alipay+|支付宝</label>
+<!--                <label class="col-xs-6 control-label">Alipay+|支付宝</label>-->
-                <div class="col-xs-6">
+<!--                <div class="col-xs-6">-->
-                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch
+<!--                    <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch-->
-                           ng-change="toggleChannel('alipayplus')">
+<!--                           ng-change="toggleChannel('alipayplus')">-->
-                </div>
+<!--                </div>-->
-            </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>