From b1439322ac3f7a6af82fdc82b95652fde67762fd Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 5 Jun 2025 17:30:17 +0800
Subject: [PATCH] no message

---
 .../web/controller/tool/NoticeController.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 64261685..7fb2481b 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
@@ -19,10 +19,8 @@ import com.ruoyi.system.domain.NoticeRequest;
 import com.ruoyi.system.domain.OppoCheck;
 import com.ruoyi.system.service.IClewPhoneService;
 import com.ruoyi.web.core.config.GlobalLogHelper;
-import io.swagger.models.Model;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -88,10 +86,14 @@ public class NoticeController {
                                @RequestParam("actionType")String actionType,
                                @RequestParam("callBack")String callBack){
         log.info("归因转化回调内容,{},{},{},{},{},{},{}", aid, appId, oaid, idType, uniqueId, actionType, callBack);
+        String token= getToken();
+        if (StringUtils.isEmpty(token)){
+            token="eyJraWQiOiJ1MUFEcW95T21wT1ZHcXh6VzNnaWtPNER3UmJDZ2RNRCIsInR5cCI6IkpXVCIsImFsZyI6IkhTMjU2In0.eyJzdWIiOiIxMjczODgzNzQ1NTQ3NDkzODI0IiwiZG4iOjEsImNsaWVudF90eXBlIjoxLCJleHAiOjE3NDkyODE2MjUsImlhdCI6MTc0OTEwODgyNX0.FxqWkjbHgLav_q6sg8HWxTCMYl4_YkFf7MYSo6cFffk";
+        }
         HuaweiRequest huaweiRequest=new HuaweiRequest();
-        huaweiRequest.setActionType(actionType);
+        huaweiRequest.setActionType("4");
         huaweiRequest.setActionTime(System.currentTimeMillis());
-        huaweiRequest.setDeviceIdType(idType);
+        huaweiRequest.setDeviceIdType("OAID");
         huaweiRequest.setAppId(appId);
         huaweiRequest.setCallBack(callBack);
         huaweiRequest.setDeviceId(oaid);
@@ -99,8 +101,8 @@ public class NoticeController {
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("Content-Type", "application/json");
         headerMap.put("client_id",  "1273883745547493824");
-        headerMap.put("Authorization",  "Bearer "+getToken());
-        log.info("请求https://connect-api.cloud.huawei.com/api/datasource/v1/track/activate的属性{}", JSONObject.toJSONString(huaweiRequest));
+        headerMap.put("Authorization",  "Bearer "+token);
+        log.info("请求https://connect-api.cloud.huawei.com/api/datasource/v1/track/activate的属性{},headermap{}", JSONObject.toJSONString(huaweiRequest),headerMap);
         String s = sendPost("https://connect-api.cloud.huawei.com/api/datasource/v1/track/activate", JSONObject.toJSONString(huaweiRequest), headerMap);
         log.info("请求https://connect-api.cloud.huawei.com/api/datasource/v1/track/activate的响应{}", s);