添加消息推送的服务

cloud-bus/src/main/java/cn/gygxzc/tina/cloud/bus/RabbitConfiguration.java → cloud-bus/src/main/java/cn/gygxzc/envir/RabbitConfiguration.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.tina.cloud.bus;
+package cn.gygxzc.envir;
 
 import cn.gygxzc.tina.cloud.bus.constant.QueueName;
 import org.springframework.amqp.core.Queue;
@@ -27,9 +27,9 @@ public class RabbitConfiguration {
         return new Queue(QueueName.Framework);
     }
 
-    @Bean
-    public Queue logQueue(){
-        return  new Queue(QueueName.LOG);
-    }
+//    @Bean
+//    public Queue logQueue(){
+//        return  new Queue(QueueName.LOG);
+//    }
 
 }

cloud-bus/src/main/java/cn/gygxzc/envir/entity/PushModel.java

@@ -0,0 +1,76 @@
+package cn.gygxzc.envir.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by niantuo on 2018/12/17.
+ * 消息推送的模型
+ */
+
+public class PushModel {
+
+    private String content;
+    private String type;
+    private String contentType;
+    private String urls;
+    private String title;
+    private String remark;
+    private List<Long> toUserIds = new ArrayList<>();
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getUrls() {
+        return urls;
+    }
+
+    public void setUrls(String urls) {
+        this.urls = urls;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public List<Long> getToUserIds() {
+        return toUserIds;
+    }
+
+    public void setToUserIds(List<Long> toUserIds) {
+        this.toUserIds = toUserIds;
+    }
+}

cloud-bus/src/main/java/cn/gygxzc/envir/sender/IMessagePusher.java

@@ -0,0 +1,17 @@
+package cn.gygxzc.envir.sender;
+
+import cn.gygxzc.envir.entity.PushModel;
+
+import java.util.List;
+
+/**
+ * Created by niantuo on 2018/12/17.
+ */
+
+public interface IMessagePusher {
+
+    void pushTo(List<Long> userIds, PushModel model);
+
+
+
+}

cloud-bus/src/main/java/cn/gygxzc/envir/sender/impl/MessagePusher.java

@@ -0,0 +1,32 @@
+package cn.gygxzc.envir.sender.impl;
+
+import cn.gygxzc.envir.entity.PushModel;
+import cn.gygxzc.envir.sender.IMessagePusher;
+import cn.gygxzc.tina.cloud.bus.constant.QueueName;
+import cn.gygxzc.tina.cloud.bus.utils.GsonUtils;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by niantuo on 2018/12/17.
+ * 消息推送的服务
+ */
+@Service
+public class MessagePusher implements IMessagePusher {
+
+    private final AmqpTemplate amqpTemplate;
+
+    @Autowired
+    public MessagePusher(AmqpTemplate amqpTemplate) {
+        this.amqpTemplate = amqpTemplate;
+    }
+
+    @Override
+    public void pushTo(List<Long> userIds, PushModel model) {
+        model.setToUserIds(userIds);
+        amqpTemplate.convertAndSend(QueueName.PUSHER, GsonUtils.toJson(model));
+    }
+}

cloud-bus/src/main/java/cn/gygxzc/tina/cloud/bus/EnableRabbitMessage.java

@@ -1,21 +0,0 @@
-package cn.gygxzc.tina.cloud.bus;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Created by niantuo on 2018/10/27.
- * 启用rabbitmq 服务线消息中间件
- */
-
-@Configuration
-@Documented
-@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target({java.lang.annotation.ElementType.TYPE})
-@Import(RabbitConfiguration.class)
-public @interface EnableRabbitMessage {
-}

cloud-bus/src/main/java/cn/gygxzc/tina/cloud/bus/constant/QueueName.java

@@ -6,7 +6,8 @@ package cn.gygxzc.tina.cloud.bus.constant;
  */
 
 public interface QueueName {
-    public final String Messager = "Messager";
+    String Messager = "Messager";
+    String PUSHER = "PUSHER";//消息推送服务
     String Framework = "Framework";
     String LOG = "LOG";
 }

cloud-bus/src/main/java/cn/gygxzc/tina/cloud/bus/messager/sender/IMessagerSender.java

@@ -10,7 +10,7 @@ import cn.gygxzc.tina.cloud.bus.messager.bean.MessageBean;
 
 public interface IMessagerSender {
 
-    public void send(MessageBean message);
+    void send(MessageBean message);
 
     void send(LogMessage message);
 }

zen-web/src/main/kotlin/cn/gygxzc/envir/MainApplication.kt

@@ -2,7 +2,6 @@ package cn.gygxzc.envir
 
 import cn.gygxzc.cloud.tina.auth.EnableTinaAuth
 import cn.gygxzc.cloud.tina.fastdfs.client.EnableFastDFSClient
-import cn.gygxzc.tina.cloud.bus.EnableRabbitMessage
 import cn.gygxzc.tina.cloud.jwt.session.EnableJwtRedisSession
 import org.mybatis.spring.annotation.MapperScan
 import org.springframework.boot.SpringApplication