update: cr

Author: zhiwen-lw

pom.xml

@@ -76,6 +76,11 @@
             <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,8 +90,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>8</source>
+                    <target>8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

src/main/java/com/alipay/global/api/example/RiskDecideTeeDemoCode.java

@@ -43,7 +43,7 @@
 
 public class RiskDecideTeeDemoCode {
     private static final String       CLIENT_ID           = "";
-    private static final String       GATE_WAY_URL        = "https://open-id-pre.alipay.com";
+    private static final String       GATE_WAY_URL        = "";
     private static final String       merchantPrivateKey  = "";
     private static final String       alipayPublicKey     = "";
     private static final AlipayClient defaultAlipayClient = new DefaultAlipayClient(GATE_WAY_URL, merchantPrivateKey, alipayPublicKey);
@@ -68,7 +68,6 @@ public static RiskDecideResponse preAuthDecide() {
             response = defaultAlipayClient.execute(request);
         } catch (AlipayApiException e) {
             // TODO Handle AlipayApiException and log
-            e.printStackTrace();
         }
         return response;
     }
@@ -112,8 +111,8 @@ public static void encryptRequest(RiskDecideRequest request) {
                 EncryptKeyEnum.BUYER_PHONE_NO,
                 EncryptKeyEnum.BUYER_REGISTRATION_TIME,
                 EncryptKeyEnum.BILL_TO_NAME,
-                EncryptKeyEnum.SHIPPING_ADDR1,
-                EncryptKeyEnum.SHIPPING_ADDR2,
+                EncryptKeyEnum.SHIPPING_ADDRESS1,
+                EncryptKeyEnum.SHIPPING_ADDRESS2,
                 EncryptKeyEnum.SHIPPING_NAME,
                 EncryptKeyEnum.SHIPPING_EMAIL,
                 EncryptKeyEnum.SHIPPING_PHONE_NO
@@ -146,7 +145,6 @@ public static SendPaymentResultResponse sendPaymentResult() {
             response = defaultAlipayClient.execute(request);
         } catch (AlipayApiException e) {
             // TODO Handle AlipayApiException and log
-            e.printStackTrace();
         }
         return response;
     }
@@ -162,7 +160,6 @@ public static SendRefundResultResponse sendPaymentRefund() {
             response = defaultAlipayClient.execute(request);
         } catch (AlipayApiException e) {
             // TODO Handle AlipayApiException and log
-            e.printStackTrace();
         }
         return response;
     }
@@ -181,7 +178,6 @@ public static RiskReportResponse reportRisk() {
             response = defaultAlipayClient.execute(request);
         } catch (AlipayApiException e) {
             // TODO Handle AlipayApiException and log
-            e.printStackTrace();
         }
         return response;
     }
@@ -234,7 +230,7 @@ private static void buildRiskDecideRequest(RiskDecideRequest request) {
         buyer.setReferenceBuyerId("test12345678");
         buyer.setBuyerPhoneNo("12345678912");
         buyer.setBuyerEmail("[email protected]");
-        buyer.setAccountVerified(true);
+        buyer.setIsAccountVerified(true);
         buyer.setSuccessfulOrderCount(100);
         UserName buyerName = new UserName();
         buyerName.setFirstName("Dehua");

src/main/java/com/alipay/global/api/model/risk/PaymentMethodMetaData.java

@@ -59,7 +59,7 @@ public class PaymentMethodMetaData {
      * The cardholder's name.
      * 持卡人姓名。
      */
-    private UserName cardholderName;
+    private UserName cardHolderName;
     /**
      * The sender's email address.
      * 付款人的邮箱

src/main/java/com/alipay/global/api/request/ams/risk/tee/constants/CryptoSdkConstant.java

@@ -7,8 +7,8 @@
 import java.nio.charset.StandardCharsets;
 
 /**
- * necessary constants for encrypt sdk
- * ¼ÓÃÜ SDK µÄ±ØÐë³£Á¿
+ * necessary constants for encrypt SDK
+ * 加密 SDK 必要常量
  */
 public class CryptoSdkConstant {
     public static final int    TAG_LENGTH             = 96;

src/main/java/com/alipay/global/api/request/ams/risk/tee/encryptstrategy/RiskDecideEncryptStrategy.java

@@ -88,7 +88,7 @@ private void doEncrypt(byte[] data_key, RiskDecideRequest request, List<EncryptK
                         encryptName(data_key, paymentDetail.getPaymentMethod().getPaymentMethodMetaData().getCardHolderName(), crypto);
                     }
                     break;
-                case SHIPPING_ADDR1:
+                case SHIPPING_ADDRESS1:
                     for (Order order : orders) {
                         String address1 = order.getShipping().getShippingAddress().getAddress1();
                         if (address1 == null || address1.isEmpty()) {
@@ -98,7 +98,7 @@ private void doEncrypt(byte[] data_key, RiskDecideRequest request, List<EncryptK
                         order.getShipping().getShippingAddress().setAddress1(Base64.getEncoder().encodeToString(encrypt));
                     }
                     break;
-                case SHIPPING_ADDR2:
+                case SHIPPING_ADDRESS2:
                     for (Order order : orders) {
                         String address2 = order.getShipping().getShippingAddress().getAddress2();
                         if (address2 == null || address2.isEmpty()) {
@@ -150,19 +150,19 @@ private void encryptName(byte[] data_key, UserName userName, AESCrypto crypto) {
         if (userName == null) {
             return;
         }
-        if (userName.getFirstName() != null) {
+        if (userName.getFirstName() != null && !userName.getFirstName().isEmpty()) {
             userName.setFirstName(Base64.getEncoder().encodeToString(
                     crypto.encrypt(data_key, userName.getFirstName().getBytes(StandardCharsets.UTF_8))));
         }
-        if (userName.getMiddleName() != null) {
+        if (userName.getMiddleName() != null && !userName.getMiddleName().isEmpty()) {
             userName.setMiddleName(Base64.getEncoder().encodeToString(
                     crypto.encrypt(data_key, userName.getMiddleName().getBytes(StandardCharsets.UTF_8))));
         }
-        if (userName.getLastName() != null) {
+        if (userName.getLastName() != null && !userName.getLastName().isEmpty()) {
             userName.setLastName(Base64.getEncoder().encodeToString(
                     crypto.encrypt(data_key, userName.getLastName().getBytes(StandardCharsets.UTF_8))));
         }
-        if (userName.getFullName() != null) {
+        if (userName.getFullName() != null && !userName.getFullName().isEmpty()) {
             userName.setFullName(Base64.getEncoder().encodeToString(
                     crypto.encrypt(data_key, userName.getFullName().getBytes(StandardCharsets.UTF_8))));
         }

src/main/java/com/alipay/global/api/request/ams/risk/tee/enums/EncryptKeyEnum.java

@@ -9,15 +9,15 @@
  * 商户可选择的加密字段枚举类
  */
 public enum EncryptKeyEnum {
-    BUYER_EMAIL("BUYER_EMAIL", "buyer.buyerEmail"),
-    BUYER_PHONE_NO("BUYER_PHONE_NO", "buyer.buyerPhoneNo"),
-    BUYER_REGISTRATION_TIME("BUYER_REGISTRATION_TIME", "buyer.buyerRegistrationTime"),
-    BILL_TO_NAME("BILL_TO_NAME", "paymentDetails.paymentMethod.paymentMethodMetaData.cardholderName"),
-    SHIPPING_ADDR1("SHIPPING_ADDR1", "orders.shipping.shippingAddress.address1"),
-    SHIPPING_ADDR2("SHIPPING_ADDR2", "orders.shipping.shippingAddress.address2"),
-    SHIPPING_NAME("SHIPPING_NAME", "orders.shipping.shippingName"),
-    SHIPPING_EMAIL("SHIPPING_EMAIL", "orders.shipping.shipToEmail"),
-    SHIPPING_PHONE_NO("SHIPPING_PHONE_NO", "orders.shipping.shippingPhoneNo")
+    BUYER_EMAIL("buyerEmail", "buyer.buyerEmail"),
+    BUYER_PHONE_NO("buyerPhoneNo", "buyer.buyerPhoneNo"),
+    BUYER_REGISTRATION_TIME("buyerRegistrationTime", "buyer.buyerRegistrationTime"),
+    BILL_TO_NAME("cardHolderName", "paymentDetails.paymentMethod.paymentMethodMetaData.cardHolderName"),
+    SHIPPING_ADDRESS1("address1", "orders.shipping.shippingAddress.address1"),
+    SHIPPING_ADDRESS2("address2", "orders.shipping.shippingAddress.address2"),
+    SHIPPING_NAME("shippingName", "orders.shipping.shippingName"),
+    SHIPPING_EMAIL("shipToEmail", "orders.shipping.shipToEmail"),
+    SHIPPING_PHONE_NO("shippingPhoneNo", "orders.shipping.shippingPhoneNo")
 
     ;
     private final String code;