From 882e8a477bdad74f9a44d17ecf5786585848936a Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Wed, 9 Aug 2023 22:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=9B=9E=E8=B0=83=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/tool/NoticeController.java    | 7 ++++++-
 .../main/java/com/ruoyi/system/domain/NoticeRequest.java   | 4 ++++
 .../src/main/java/com/ruoyi/system/domain/OppoCheck.java   | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
index 260de293..253c2329 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
@@ -134,7 +134,12 @@ public class NoticeController {
                     // 回调
                     OppoCheck model = new OppoCheck();
                     model.setTimestamp(System.currentTimeMillis());
-                    model.setOuId(encode(model.getOuId().getBytes()));
+                    if(StringUtils.isNotEmpty(request.getImei())){
+                        model.setImei(encode(request.getImei().getBytes()));
+                    }
+                    if(StringUtils.isNotEmpty(request.getOaid())){
+                        model.setOuId(encode(request.getOaid().getBytes()));
+                    }
                     String content = JSONObject.toJSONString(model) + model.getTimestamp() + "e0u6fnlag06lc3pl";
                     log.info("请求的content加密前属性{}", content);
                     Map<String, String> headerMap = new HashMap<>();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/NoticeRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/NoticeRequest.java
index d2244b39..f66fcae1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/NoticeRequest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/NoticeRequest.java
@@ -22,4 +22,8 @@ public class NoticeRequest {
      * */
     private String code;
 
+
+    private String imei;
+
+    private String oaid;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OppoCheck.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OppoCheck.java
index 4a8e4539..2376e367 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OppoCheck.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OppoCheck.java
@@ -16,6 +16,7 @@ public class OppoCheck {
     private Integer channel = 1;
     private Integer type = 1;
     private Integer ascribeType = 0;
+    private String imei;
 //    private Long adId = 101097648L;