yumeng 1 kuukausi sitten
vanhempi
commit
5a6e1614fd

+ 9 - 1
src/main/java/com/adx/tencent/vivo/controller/VivoTrackingController.java

@@ -348,7 +348,12 @@ public class VivoTrackingController {
             if (oaid != null && !oaid.isBlank()) {
                 putUid(uid, "oaid", oaid);
             } else {
-                putUid(uid, "oaidMd5", firstParam(p, "oaidMD5", "oaid_md5", "oaidMd5"));
+                String oaidMd5 = firstParam(p, "oaidMD5", "oaid_md5", "oaidMd5");
+                if (oaidMd5 != null && !oaidMd5.isBlank()) {
+                    putUid(uid, "oaidMd5", oaidMd5);
+                } else {
+                    putUid(uid, "didMd5", firstParam(p, "imeiMD5", "imei_md5", "imeiMd5"));
+                }
             }
             return uid;
         }
@@ -676,6 +681,9 @@ public class VivoTrackingController {
         if (firstParam(params, "eventSourceId", "srcId") == null) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "missing vivo eventSourceId");
         }
+        if (firstParam(params, "oaid", "oaidMD5", "oaid_md5", "oaidMd5", "imeiMD5", "imei_md5", "imeiMd5") == null) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "missing vivo oaid/oaidMD5/imeiMD5");
+        }
     }
 
     private static String firstRequestParam(HttpServletRequest request, String... keys) {