将CMQ替换为rabbitmq

admin

2024-10-14 b9b263043cbb2e028017b9a5626c664b54513749

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -73,7 +73,8 @@
    @Resource
    private AppVersionService appVersionService;

    @Reference(version = "1.0", check = false)
    //TODO 测试
//    @Reference(version = "1.0", check = false)
    private BPushTaskService bPushTaskService;

    @Resource
@@ -116,7 +117,7 @@
                // 限制推送版本号：0
                String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS, system);
                if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
                    iosPushService.pushGoods(uid, Long.parseLong(gid), title, content, codes, system);
                    iosPushService.pushGoods(uid, gid, title, content, codes, system);
                }
            }

@@ -125,14 +126,14 @@
                // 限制推送版本号：0
                String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid, system);
                if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
                    xmPushService.pushGoods(uid, Long.parseLong(gid), title, content, versions, system);
                    xmPushService.pushGoods(uid, gid, title, content, versions, system);
                }
                // 华为推送
                if (listAndroid == null || listAndroid.size() > 0) {
                    List<Integer> versionCodeList = null;
                    if (listAndroid != null)
                        versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                    hwPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));
                    hwPushService.pushGoods(uid, gid, new PushBaseContent(title, content, versionCodeList, system));
                }

                // OPPO推送
@@ -140,14 +141,14 @@
                    List<Integer> versionCodeList = null;
                    if (listAndroid != null)
                        versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                    oPPOPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));
                    oPPOPushService.pushGoods(uid, gid, new PushBaseContent(title, content, versionCodeList, system));
                }
                // VIVO推送
                if (listAndroid == null || listAndroid.size() > 0) {
                    List<Integer> versionCodeList = null;
                    if (listAndroid != null)
                        versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                    vIVOPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));
                    vIVOPushService.pushGoods(uid, gid, new PushBaseContent(title, content, versionCodeList, system));
                }
            }
        }
@@ -433,7 +434,7 @@
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            }
            try {
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createBaichuan(jumpDetailV2Service.getByTypeCache("system_msg", system), url));
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createBaichuan(jumpDetailV2Service.getByTypeCache("baichuan", system), url));
            } catch (BPushTaskException e) {
                logger.error("推送-百川：{}", url, e);
            }
@@ -701,17 +702,8 @@

        logger.debug("新版推送开始：title-{} content-{}", new Object[]{title, content});
        //灰度测试
        if (uidList == null || uidList.size() == 0 || uidList.size() > 1)
            return;
        Set<Long> uidSet = new HashSet<>();
        uidSet.add(6857703L);
        uidSet.add(6845887L);

        if (!uidSet.contains(uidList.get(0))) {
            return;
        }

        logger.debug("新版推送灰度测试开始：title-{} content-{}", new Object[]{title, content});
//        if (uidList == null || uidList.size() == 0 || uidList.size() > 1)
//            return;


        BPushFilter filter = new BPushFilter();