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 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;