|
|
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.Instant;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -449,7 +448,9 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
|
|
|
greObj.put("field", "page_type");
|
|
|
greObj.put("operator", "EQUALS");
|
|
|
greObj.put("values", "PAGE_TYPE_WECHAT_CANVAS");
|
|
|
- param.put("filtering", filtering);
|
|
|
+ filtering.add(greObj);
|
|
|
+
|
|
|
+// param.put("filtering", filtering);
|
|
|
String result = HttpUtils.httpGet("https://api.e.qq.com/v3.0/wechat_pages/get", param, new HashMap<>());
|
|
|
JSONObject obj = JSONObject.parseObject(result);
|
|
|
if (!Check.isNull(obj)) {
|
|
|
@@ -536,7 +537,10 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
|
|
|
if (!Check.isNull(wechatMiniProgramSpec)) {
|
|
|
object.put("mini_program_id", wechatMiniProgramSpec.getString("mini_program_id"));
|
|
|
object.put("mini_program_path", wechatMiniProgramSpec.getString("mini_program_path"));
|
|
|
-
|
|
|
+ }
|
|
|
+ JSONObject officialSpec = pageSpec.getJSONObject("wechat_canvas_spec");
|
|
|
+ if (!Check.isNull(officialSpec)) {
|
|
|
+ object.put("page_id", officialSpec.getLong("page_id"));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -556,6 +560,10 @@ public class BytedanceCdpProjectServiceImpl implements IBytedanceCdpProjectServi
|
|
|
object.put("mini_program_id", wechatMiniProgramSpec.getString("mini_program_id"));
|
|
|
object.put("mini_program_path", wechatMiniProgramSpec.getString("mini_program_path"));
|
|
|
}
|
|
|
+ JSONObject officialSpec = pageSpec.getJSONObject("wechat_canvas_spec");
|
|
|
+ if (!Check.isNull(officialSpec)) {
|
|
|
+ object.put("page_id", officialSpec.getLong("page_id"));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|