diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/MyApiHelper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/MyApiHelper.java index 797ac4f3..69d837e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/MyApiHelper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/MyApiHelper.java @@ -4,6 +4,7 @@ import com.getui.push.v2.sdk.ApiHelper; import com.getui.push.v2.sdk.GtApiConfiguration; import com.getui.push.v2.sdk.api.PushApi; import lombok.Data; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -23,11 +24,14 @@ public class MyApiHelper { private String url; + private boolean enabled; + /** * 个推接口实例化 * @return */ @Bean(name = "onlyPushApi") + @ConditionalOnProperty(prefix = "getui.app", name = "enabled", havingValue = "true") public PushApi pushApi() { GtApiConfiguration apiConfiguration = new GtApiConfiguration(); //填写应用配置，参数在“Uni Push”下的“应用配置”页面中获取 @@ -40,5 +44,4 @@ public class MyApiHelper { PushApi pushApi = apiHelper.creatApi(PushApi.class); return pushApi; } - } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/AppMessageServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/AppMessageServiceImpl.java index 27439781..7ab903d7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/AppMessageServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/service/impl/AppMessageServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.message.service.impl; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.jeecg.common.api.dto.message.MessageDTO; +import org.jeecg.config.init.MyApiHelper; import org.jeecg.modules.message.mapper.AppMessageMapper; import org.jeecg.modules.message.service.IAppMessageService; import org.jeecg.modules.message.util.PushAppUtil; @@ -18,19 +19,23 @@ public class AppMessageServiceImpl implements IAppMessageService { private PushAppUtil pushAppUtil; @Autowired private AppMessageMapper appMessageMapper; - + @Autowired + private MyApiHelper myApiHelper; @Override public void sendToSingle(MessageDTO messageDTO, String groupId) { - //根据分组id查询出关联的用户id - List groupUserIds = appMessageMapper.findGroupUserIds(groupId); - if (CollectionUtils.isNotEmpty(groupUserIds)) { - //根据用户id查询出用户关联的app客户端id - List userClientId = appMessageMapper.findUserClientId(groupUserIds); - if (CollectionUtils.isNotEmpty(userClientId)) { - userClientId = userClientId.stream().distinct().collect(Collectors.toList()); - //调用app推送方法 - pushAppUtil.pushToList(messageDTO, userClientId); + //个推启用才推送消息到app + if (myApiHelper.isEnabled()){ + //根据分组id查询出关联的用户id + List groupUserIds = appMessageMapper.findGroupUserIds(groupId); + if (CollectionUtils.isNotEmpty(groupUserIds)) { + //根据用户id查询出用户关联的app客户端id + List userClientId = appMessageMapper.findUserClientId(groupUserIds); + if (CollectionUtils.isNotEmpty(userClientId)) { + userClientId = userClientId.stream().distinct().collect(Collectors.toList()); + //调用app推送方法 + pushAppUtil.pushToList(messageDTO, userClientId); + } } } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushAppUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushAppUtil.java index e33f4182..dc571bb4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushAppUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/util/PushAppUtil.java @@ -17,6 +17,7 @@ import com.getui.push.v2.sdk.dto.res.TaskIdDTO; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.modules.message.mapper.AppMessageMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -29,7 +30,8 @@ public class PushAppUtil { @Autowired private AppMessageMapper appMessageMapper; - @Resource(name = "onlyPushApi") + @Autowired(required = false) + @Qualifier("onlyPushApi") private PushApi pushApi; /** diff --git a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml index bda10130..a9b3f5fa 100644 --- a/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-cloud-gateway/src/main/resources/logback-spring.xml @@ -1,8 +1,8 @@ - - + + diff --git a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml index 9e62f4ae..b4e1bed5 100644 --- a/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml +++ b/jeecg-server-cloud/armd-cloud-nacos/src/main/resources/application.yml @@ -17,7 +17,6 @@ db: '0': ${POSTGRESQL-PWD:postgres} url: '0': jdbc:postgresql://${POSTGRESQL-HOST:127.0.0.1}:${POSTGRESQL-PORT:5432}/${POSTGRESQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java - #'0': jdbc:postgresql://${MYSQL-HOST:172.21.50.118}:${MYSQL-PORT:5432}/${MYSQL-DB:nacos}?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos_java user: '0': ${POSTGRESQL-USER:postgres} pool: