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

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -25,7 +25,6 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.system.core.TradeSecureService;
-import au.com.royalpay.payment.manage.system.core.beans.TradeSecureFile;
 import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
@@ -65,8 +64,6 @@ import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -103,7 +103,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -4855,7 +4854,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             needCheckParams.put("bank_account_no", bankAccount.getString("account_no"));
         }
         List<JSONObject> listRiskySimilarMerchants = riskAttentionMerchantsMapper.listRiskySimilarMerchants(needCheckParams);
-        if (listRiskySimilarMerchants.size() > 0) {
+        if (!listRiskySimilarMerchants.isEmpty()) {
             StringBuilder appendStr = new StringBuilder();
             StringBuilder infoStr = new StringBuilder();
 
@@ -5173,8 +5172,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         KeyPair keyPairGen = RSACrypt.generateKeyPairs();
         RSAPublicKey publicKey = (RSAPublicKey) keyPairGen.getPublic();
         RSAPrivateKey privateKey = (RSAPrivateKey) keyPairGen.getPrivate();
-        key.put("public_key", new BASE64Encoder().encode(publicKey.getEncoded()));
-        key.put("private_key", new BASE64Encoder().encode(privateKey.getEncoded()));
+        key.put("public_key", Base64.encodeBase64String(publicKey.getEncoded()));
+        key.put("private_key", Base64.encodeBase64String(privateKey.getEncoded()));
         return key;
     }
 

src/main/java/au/com/royalpay/payment/manage/merchants/enums/PaymentScenarioEnum.java

@@ -0,0 +1,59 @@
+package au.com.royalpay.payment.manage.merchants.enums;
+
+/**
+ * @Author: luoyang
+ * @Date: 2019-05-29 10:30
+ */
+public enum PaymentScenarioEnum {
+    PC_WEB("101", "PC网站"),//1
+
+    MOBILE_WEB("102", "手机端网站"),//2
+
+    APP("103", "APP"),//3
+
+    WECHAT_ALIPAY_WEB("104", "微信内、支付宝内网站"),//4
+
+    MINIPROGRAM("105", "小程序"),//5
+
+    QRCODE_BOARD("201", "二维码立牌"),//6
+
+    ROYALPAY_POS("202", "Royalpay POS"),//7
+
+    CASHIER_POS("203", "收银系统"),//8
+
+    IPOS("20301", "ipos"),//9
+
+    POSPAL("20302", "pospal"),//10
+
+    AUPOS("20303", "aupos"),//11
+
+    OTHER("20399", "other"),//12
+
+    VENDING_MACHINE("204", "无人售货机"),//13
+
+    LOTUS("20304", "Lotus"),
+
+    AOSHANGBAO("20305", "AoShangBao"),
+
+    INFINITY("20306", "Infinity"),
+
+    EASY_CLOUD("20307", "EasyCloud"),
+
+    AOMAIKE("20308", "AoMaiKe");
+
+    private final String scenarioTypeId;
+    private final String desc;
+
+    public String getScenarioTypeId() {
+        return scenarioTypeId;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    PaymentScenarioEnum(String scenarioTypeId, String desc) {
+        this.scenarioTypeId = scenarioTypeId;
+        this.desc = desc;
+    }
+}

src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java

@@ -1,47 +0,0 @@
-package au.com.royalpay.payment.manage.merchants.enums;
-
-/**
- * @Author: luoyang
- * @Date: 2019-05-29 10:30
- */
-public enum paymentScenarioEnum {
-    PC_WEB(1, "PC网站"),
-
-    MOBILE_WEB(2, "手机端网站"),
-
-    APP(3, "APP"),
-
-    WECHAT_ALIPAY_WEB(4, "微信内、支付宝内网站"),
-
-    MINIPROGRAM(5, "小程序"),
-
-    QRCODE_BOARD(6, "二维码立牌"),
-
-    ROYALPAY_POS(7,"Royalpay POS"),
-
-    CASHIER_POS(8,"收银系统"),
-
-    IPOS(9,"ipos"),
-
-    POSPAL(10,"pospal"),
-
-    AUPOS(11,"aupos"),
-
-    OTHER(12,"other"),
-
-    VENDING_MACHINE(13,"无人售货机");
-
-    private final int scenarioTypeId;
-    private final String desc;
-
-    public int getScenarioTypeId() {
-        return scenarioTypeId;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-    paymentScenarioEnum(int scenarioTypeId, String desc) {
-        this.scenarioTypeId = scenarioTypeId;
-        this.desc = desc;
-    }}