消息推送

common/common-entity/src/main/java/com/yihu/jw/entity/base/message/MessageDo.java

@@ -1,35 +0,0 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */@Entity
@Table(name = "base_message")
public class MessageDo extends IntegerIdentityEntity {
    private String topic; //消息主题
    private String template; //消息模板
    @Column(name = "topic", nullable = false)
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    @Column(name = "template", nullable = false)
    public String getTemplate() {
        return template;
    }
    public void setTemplate(String template) {
        this.template = template;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/message/MqMessageDO.java

@@ -0,0 +1,62 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.stereotype.Component;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Entity - 基于MQ的消息推送
 * Created by progr1mmer on 2018/8/30.
 */
@Entity
@Table(name = "base_mq_message")
public class MqMessageDO extends UuidIdentityEntity {
    //主题
    private String topic;
    //名称
    private String name;
    //备注
    private String remark;
    //模板
    private String template;
    @Column(name = "topic", nullable = false)
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    @Column(name = "name", nullable = false)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "template")
    public String getTemplate() {
        return template;
    }
    public void setTemplate(String template) {
        this.template = template;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/message/MessageSubscriberDO.java

@@ -1,33 +1,25 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Entity - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_message_subscriber")
public class MessageSubscriberDO extends IntegerIdentityEntity {
@Table(name = "base_mq_message_subscriber")
public class MqMessageSubscriberDO extends UuidIdentityEntity {
    private Integer messageId; //消息ID
    private String saasId; //saas id
    private String topic; //主题
    private String url; //推送地址
    private String remark; //备注
    @Column(name = "message_id")
    public Integer getMessageId() {
        return messageId;
    }
    public void setMessageId(Integer messageId) {
        this.messageId = messageId;
    }
    @Column(name = "saas_id", length = 50)
    @Column(name = "saas_id", nullable = false, length = 50)
    public String getSaasId() {
        return saasId;
    }
@@ -36,7 +28,16 @@ public class MessageSubscriberDO extends IntegerIdentityEntity {
        this.saasId = saasId;
    }
    @Column(name = "url")
    @Column(name = "topic", nullable = false)
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    @Column(name = "url", nullable = false)
    public String getUrl() {
        return url;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/RoleDO.java

@@ -19,7 +19,7 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	//备注
	private String remark;
	//是否系统管理员
	private Boolean isSystem;
	private Boolean system;
	@Column(name = "name", length = 50)
	public String getName() {
@@ -39,12 +39,12 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
		this.remark = remark;
	}
	@Column(name = "is_system")
	@Column(name = "system")
	public Boolean getSystem() {
		return isSystem;
		return system;
	}
	public void setSystem(Boolean system) {
		isSystem = system;
		this.system = system;
	}
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -137,4 +137,18 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/sms_template";
    }
    /**
     * 基于MQ的消息推送
     */
    public static class MqMessage extends Basic {
        public static final String PREFIX  = "/mq_message";
    }
    /**
     * 基于MQ的消息推送订阅者
     */
    public static class MqMessageSubscriber extends Basic {
        public static final String PREFIX  = "/mq_message_subscriber";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/message/MqMessageSubscriberVO.java

@@ -0,0 +1,54 @@
package com.yihu.jw.restmodel.base.message;
import com.yihu.jw.restmodel.UuidIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * VO - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/8/14.
 */
@ApiModel(value = "MqMessageSubscriberVO", description = "基于MQ的消息推送订阅者")
public class MqMessageSubscriberVO extends UuidIdentityVO {
    @ApiModelProperty(value = "SAAS ID", example = "402803ee656498890165649ad2xaaba2")
    private String saasId;
    @ApiModelProperty(value = "主题", example = "dailyReport")
    private String topic;
    @ApiModelProperty(value = "推送地址", example = "http://www.example.com/api")
    private String url;
    @ApiModelProperty(value = "备注", example = "我是备注")
    private String remark;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/message/MqMessageVO.java

@@ -0,0 +1,59 @@
package com.yihu.jw.restmodel.base.message;
import com.yihu.jw.restmodel.UuidIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * VO - 基于MQ的消息推送
 * Created by progr1mmer on 2018/9/3.
 */
@ApiModel(value = "MqMessageVO", description = "基于MQ的消息推送")
public class MqMessageVO extends UuidIdentityVO {
    //主题
    @ApiModelProperty(value = "主题", example = "dailyReport")
    private String topic;
    //名称
    @ApiModelProperty(value = "名称", example = "日常统计数据")
    private String name;
    //备注
    @ApiModelProperty(value = "备注", example = "我是备注")
    private String remark;
    //模板
    @ApiModelProperty(value = "模板")
    private String template;
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getTemplate() {
        return template;
    }
    public void setTemplate(String template) {
        this.template = template;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/role/RoleVO.java

@@ -16,7 +16,7 @@ public class RoleVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "备注", example = "我是备注")
	private String remark;
	@ApiModelProperty(value = "是否系统管理员", example = "1")
	private Boolean isSystem;
	private Boolean system;
	public String getName() {
		return this.name;
@@ -35,10 +35,10 @@ public class RoleVO extends UuidIdentityVOWithOperator {
	}
	public Boolean getSystem() {
		return isSystem;
		return system;
	}
	public void setSystem(Boolean system) {
		isSystem = system;
		this.system = system;
	}
}

svr/svr-base/pom.xml

@@ -58,6 +58,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zipkin</artifactId>
        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-activemq</artifactId>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/ConsumerRunner.java

@@ -0,0 +1,87 @@
package com.yihu.jw.base.activemq;
import com.yihu.utils.context.SpringContext;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.util.Assert;
import org.springframework.web.client.RestTemplate;
import javax.jms.*;
import java.util.Set;
/**
 * Runner - 消息执行者
 * Created by progr1mmer on 2018/8/2.
 */
public class ConsumerRunner implements Runnable, ExceptionListener {
    private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
    private final String topic;
    private Set<String> pushUrl;
    private TopicConnection topicConnection;
    private MessageConsumer consumer;
    private RestTemplate restTemplate;
    public ConsumerRunner(String topic, Set<String> pushUrl) throws Exception {
        Assert.notNull(topic, "Topic cannot be null");
        this.topic = topic;
        this.pushUrl = pushUrl;
        init();
    }
    private void init() throws Exception {
        ActiveMQConnectionFactory connectionFactory = SpringContext.getService(ActiveMQConnectionFactory.class);
        // Create a Connection
        topicConnection = connectionFactory.createTopicConnection();
        topicConnection.start();
        topicConnection.setExceptionListener(this);
        // Create a Session
        Session session = topicConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
        // Create the destination (Topic or Queue)
        Destination destination = session.createTopic(topic);
        // Create a MessageConsumer from the Session to the Topic or Queue
        consumer = session.createConsumer(destination);
        restTemplate = new RestTemplate();
    }
    @Override
    public void run() {
        while (true) {
            try {
                // Wait for a message
                Message message = consumer.receive(1000);
                if (message != null) {
                    if (message instanceof TextMessage) {
                        TextMessage textMessage = (TextMessage) message;
                        String text = textMessage.getText();
                        for (String url : pushUrl) {
                            String result = restTemplate.postForObject(url, new HttpEntity<>(text), String.class);
                            LOGGER.info(result);
                        }
                    } else {
                        for (String url : pushUrl) {
                            String result = restTemplate.postForObject(url, new HttpEntity<>(message), String.class);
                            LOGGER.info(result);
                        }
                    }
                }
            } catch (Exception e) {
                LOGGER.error(e.getMessage(), e);
            }
        }
    }
    @Override
    public void onException(JMSException e) {
        LOGGER.error("Trying to recover from JMS Connection exception: " + e);
        try {
            topicConnection.close();
            topicConnection.start();
        } catch (Exception ex) {
            LOGGER.error("Failed to recover JMS Connection", ex);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/MessageManager.java

@@ -0,0 +1,60 @@
package com.yihu.jw.base.activemq;
import com.yihu.jw.base.service.MqMessageService;
import com.yihu.jw.base.service.MqMessageSubscriberService;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
/**
 * Component - ActiveMQ消息订阅初始化
 * Created by progr1mmer on 2018/8/30.
 */
@Component
public class MessageManager {
    private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
    private static final Pattern PATTERN  = Pattern.compile("^([hH][tT]{2}[pP]:/*|[hH][tT]{2}[pP][sS]:/*|[fF][tT][pP]:/*)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\\\\/])+(\\\\?{0,1}(([A-Za-z0-9-~]+\\\\={0,1})([A-Za-z0-9-~]*)\\\\&{0,1})*)$");
    private ExecutorService executorService;
    @Autowired
    private MqMessageService mqMessageService;
    @Autowired
    private MqMessageSubscriberService mqMessageSubscriberService;
    public void initConsumer() {
        try {
            Map<String, Set<String>> groups = new HashMap<>();
            List<MqMessageDO> mqMessageDos = mqMessageService.search("");
            for (MqMessageDO mqMessageDo : mqMessageDos) {
                List<MqMessageSubscriberDO> mqMessageSubscriberDOS = mqMessageSubscriberService.search("topic=" + mqMessageDo.getTopic());
                Set<String> subUrl = new HashSet<>();
                mqMessageSubscriberDOS.forEach(item -> {
                    if (item.getUrl() != null && PATTERN.matcher(item.getUrl()).find()) {
                        subUrl.add(item.getUrl());
                    } else {
                        LOGGER.error("[Topic: " + item.getTopic() + "] Illegal url: " + item.getUrl() + " of " + item.getSaasId());
                    }
                });
                groups.put(mqMessageDo.getTopic(), subUrl);
            }
            executorService = Executors.newFixedThreadPool(groups.size());
            for (String key : groups.keySet()) {
                executorService.execute(new ConsumerRunner(key, groups.get(key)));
            }
        } catch (Exception e) {
            LOGGER.error(e.getMessage(), e);
            System.exit(-1);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/MessageSubscriberDao.java

@@ -1,11 +0,0 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.message.MessageSubscriberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/20.
 */
public interface MessageSubscriberDao extends PagingAndSortingRepository<MessageSubscriberDO, Integer>, JpaSpecificationExecutor<MessageSubscriberDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/MessageDao.java

@@ -1,11 +1,12 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.message.MessageDo;
import com.yihu.jw.entity.base.message.MqMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Dao - 基于MQ的消息推送
 * Created by progr1mmer on 2018/8/20.
 */
public interface MessageDao extends PagingAndSortingRepository<MessageDo, Integer>, JpaSpecificationExecutor<MessageDo> {
public interface MqMessageDao extends PagingAndSortingRepository<MqMessageDO, String>, JpaSpecificationExecutor<MqMessageDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/MqMessageSubscriberDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Dao - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/8/20.
 */
public interface MqMessageSubscriberDao extends PagingAndSortingRepository<MqMessageSubscriberDO, String>, JpaSpecificationExecutor<MqMessageSubscriberDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Function.PREFIX)
@Api(value = "功能管理", description = "功能管理服务接口", tags = {"wlyy基础服务 - 功能管理服务接口"})
@Api(value = "功能管理", description = "功能管理服务接口", tags = {"模块和功能 - 功能管理服务接口"})
public class FunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageEndpoint.java

@@ -0,0 +1,96 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.MqMessageService;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.jw.restmodel.base.message.MqMessageVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Endpoint - 基于MQ的消息推送
 * Created by progr1mmer on 2018/9/3.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.MqMessage.PREFIX)
@Api(value = "基于MQ的消息推送", description = "基于MQ的消息推送服务接口", tags = {"消息服务 - 基于MQ的消息推送服务接口"})
public class MqMessageEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private MqMessageService mqMessageService;
    @PostMapping(value = BaseRequestMapping.Function.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<MqMessageVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        MqMessageDO mqMessageDO = toEntity(jsonData, MqMessageDO.class);
        mqMessageDO = mqMessageService.save(mqMessageDO);
        return success(mqMessageDO, MqMessageVO.class);
    }
    @PostMapping(value = BaseRequestMapping.Function.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        mqMessageService.delete(ids);
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.Function.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<MqMessageVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        MqMessageDO mqMessageDO = toEntity(jsonData, MqMessageDO.class);
        if (null == mqMessageDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        mqMessageDO = mqMessageService.save(mqMessageDO);
        return success(mqMessageDO, MqMessageVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Function.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<MqMessageVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<MqMessageDO> mqMessageDOS = mqMessageService.search(fields, filters, sorts, page, size);
        int count = (int)mqMessageService.getCount(filters);
        return success(mqMessageDOS, count, page, size, MqMessageVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Function.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MqMessageVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<MqMessageDO> mqMessageDOS = mqMessageService.search(fields, filters, sorts);
        return success(mqMessageDOS, MqMessageVO.class);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageSubscriberEndpoint.java

@@ -0,0 +1,96 @@
package com.yihu.jw.base.endpoint.message;
import com.yihu.jw.base.service.MqMessageSubscriberService;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import com.yihu.jw.restmodel.base.message.MqMessageSubscriberVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Endpoint - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/9/3.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.MqMessageSubscriber.PREFIX)
@Api(value = "基于MQ的消息推送订阅者", description = "基于MQ的消息推送订阅者服务接口", tags = {"消息服务 - 基于MQ的消息推送订阅者服务接口"})
public class MqMessageSubscriberEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private MqMessageSubscriberService mqMessageSubscriberService;
    @PostMapping(value = BaseRequestMapping.Function.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<MqMessageSubscriberVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        MqMessageSubscriberDO mqMessageSubscriberDO = toEntity(jsonData, MqMessageSubscriberDO.class);
        mqMessageSubscriberDO = mqMessageSubscriberService.save(mqMessageSubscriberDO);
        return success(mqMessageSubscriberDO, MqMessageSubscriberVO.class);
    }
    @PostMapping(value = BaseRequestMapping.Function.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        mqMessageSubscriberService.delete(ids);
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.Function.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<MqMessageSubscriberVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        MqMessageSubscriberDO mqMessageSubscriberDO = toEntity(jsonData, MqMessageSubscriberDO.class);
        if (null == mqMessageSubscriberDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        mqMessageSubscriberDO = mqMessageSubscriberService.save(mqMessageSubscriberDO);
        return success(mqMessageSubscriberDO, MqMessageSubscriberVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Function.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<MqMessageSubscriberVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<MqMessageSubscriberDO> mqMessageSubscriberDOS = mqMessageSubscriberService.search(fields, filters, sorts, page, size);
        int count = (int)mqMessageSubscriberService.getCount(filters);
        return success(mqMessageSubscriberDOS, count, page, size, MqMessageSubscriberVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Function.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<MqMessageSubscriberVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<MqMessageSubscriberDO> mqMessageSubscriberDOS = mqMessageSubscriberService.search(fields, filters, sorts);
        return success(mqMessageSubscriberDOS, MqMessageSubscriberVO.class);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/TestEndpoint.java

@@ -0,0 +1,78 @@
//package com.yihu.jw.base.endpoint.message;
//
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiParam;
//import org.apache.activemq.command.ActiveMQTopic;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.http.MediaType;
//import org.springframework.jms.core.JmsMessagingTemplate;
//import org.springframework.web.bind.annotation.*;
//
//import javax.jms.Destination;
//import java.util.ArrayList;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
//
///**
// * Endpoint - 测试接口
// * Created by progr1mmer on 2018/8/16.
// */
//@RestController
//@RequestMapping(value = "/test")
//@Api(value = "测试接口", description = "消息测试接口", tags = {"wlyy基础服务 - 消息测试接口"})
//public class TestEndpoint extends EnvelopRestEndpoint {
//
//    @Autowired
//    private JmsMessagingTemplate jmsMessagingTemplate;
//
//    @PostMapping(value = "/send")
//    @ApiOperation(value = "发送消息")
//    public Envelop send (
//            @ApiParam(name = "topic", value = "主题", required = true)
//            @RequestParam(value = "topic") String topic,
//            @ApiParam(name = "message", value = "消息", required = true)
//            @RequestParam(value = "message") String message) throws Exception {
//        Destination destination = new ActiveMQTopic(topic);
//        jmsMessagingTemplate.convertAndSend(destination, message);
//        return success("success");
//    }
//
//    /*@PostMapping(value = "/es", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @ApiOperation(value = "创建")
//    public Envelop es (
//            @ApiParam(name = "index", value = "索引", required = true)
//            @RequestParam(value = "index") String index,
//            @ApiParam(name = "type", value = "类型", required = true)
//            @RequestParam(value = "type") String type) throws Exception {
//        Map<String, Object> data = new HashMap<>();
//        data.put("sn1212121", "测试");
//        List<Object> dataList = new ArrayList<>();
//        dataList.add(data);
//        elastricSearchHelper.save(index, type, dataList);
//        return success("success");
//    }
//
//    @PostMapping(value = "/sql")
//    @ApiOperation(value = "查询")
//    public List<Map<String, Object>> sql (
//            @ApiParam(name = "query", value = "语句", required = true)
//            @RequestParam(value = "query") String query) throws Exception {
//        List<Map<String, Object>> result = elastricSearchHelper.executeSQL(query);
//        return result;
//    }
//
//    @PostMapping(value = "/sql_count")
//    @ApiOperation(value = "查询")
//    public Integer sqlCount (
//            @ApiParam(name = "query", value = "语句", required = true)
//            @RequestParam(value = "query") String query) throws Exception {
//        Integer result = elastricSearchHelper.executeCountSQL(query);
//        return result;
//    }*/
//
//}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Module.PREFIX)
@Api(value = "模块管理", description = "模块管理服务接口", tags = {"wlyy基础服务 - 模块管理服务接口"})
@Api(value = "模块管理", description = "模块管理服务接口", tags = {"模块和功能 - 模块管理服务接口"})
public class ModuleEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Role.PREFIX)
@Api(value = "角色管理", description = "角色管理服务接口", tags = {"wlyy基础服务 - 角色管理服务接口"})
@Api(value = "角色管理", description = "角色管理服务接口", tags = {"角色 - 角色管理服务接口"})
public class RoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        roleService.delete(ids);
        roleService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasDefaultModuleFunctionEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.PREFIX)
@Api(value = "Saas默认模块功能管理", description = "Saas默认模块功能管理服务接口", tags = {"wlyy基础服务 - Saas默认模块功能管理服务接口"})
@Api(value = "Saas默认模块功能管理", description = "Saas默认模块功能管理服务接口", tags = {"SAAS - Saas默认模块功能管理服务接口"})
public class SaasDefaultModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class SaasDefaultModuleFunctionEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        saasDefaultModuleService.delete(ids);
        saasDefaultModuleService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -25,7 +25,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Saas.PREFIX)
@Api(value = "Saas管理", description = "Saas管理服务接口", tags = {"wlyy基础服务 - Saas管理服务接口"})
@Api(value = "Saas管理", description = "Saas管理服务接口", tags = {"SAAS - Saas管理服务接口"})
public class SaasEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -52,7 +52,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        saasService.delete(ids);
        saasService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleFunctionEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.RoleModuleFunction.PREFIX)
@Api(value = "Saas模块功能管理", description = "Saas模块功能管理服务接口", tags = {"wlyy基础服务 - Saas模块功能管理服务接口"})
@Api(value = "Saas模块功能管理", description = "Saas模块功能管理服务接口", tags = {"SAAS - Saas模块功能管理服务接口"})
public class SaasModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class SaasModuleFunctionEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        saasModuleFunctionService.delete(ids);
        saasModuleFunctionService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsGatewayEndpoint.java

@@ -27,7 +27,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SmsGateway.PREFIX)
@Api(value = "短信网关管理", description = "短信网关管理服务接口", tags = {"wlyy基础服务 - 短信网关管理服务接口"})
@Api(value = "短信网关管理", description = "短信网关管理服务接口", tags = {"短信服务 - 短信网关管理服务接口"})
public class SmsGatewayEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -48,7 +48,7 @@ public class SmsGatewayEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        smsGatewayService.delete(ids);
        smsGatewayService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsTemplateEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SmsTemplate.PREFIX)
@Api(value = "短信模板管理", description = "短信模板管理服务接口", tags = {"wlyy基础服务 - 短信模板管理服务接口"})
@Api(value = "短信模板管理", description = "短信模板管理服务接口", tags = {"短信服务 - 短信模板管理服务接口"})
public class SmsTemplateEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class SmsTemplateEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        smsTemplateService.delete(ids);
        smsTemplateService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SystemDict.PREFIX)
@Api(value = "系统字典", description = "系统字典服务接口", tags = {"wlyy基础服务 - 系统字典服务接口"})
@Api(value = "系统字典", description = "系统字典服务接口", tags = {"系统字典 - 系统字典服务接口"})
public class SystemDictEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
@@ -45,7 +45,7 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        systemDictService.delete(ids);
        systemDictService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEntryEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SystemDictEntry.PREFIX)
@Api(value = "系统字典项", description = "系统字典项服务接口", tags = {"wlyy基础服务 - 系统字典项服务接口"})
@Api(value = "系统字典项", description = "系统字典项服务接口", tags = {"系统字典 - 系统字典项服务接口"})
public class SystemDictEntryEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
@@ -45,7 +45,7 @@ public class SystemDictEntryEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        systemDictEntryService.delete(ids);
        systemDictEntryService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/theme/ThemeEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Theme.PREFIX)
@Api(value = "主题应用", description = "主题应用服务接口", tags = {"wlyy基础服务 - 主题应用服务接口"})
@Api(value = "主题应用", description = "主题应用服务接口", tags = {"主题风格 - 主题应用服务接口"})
public class ThemeEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.User.PREFIX)
@Api(value = "用户管理", description = "用户管理服务接口", tags = {"wlyy基础服务 - 用户管理服务接口"})
@Api(value = "用户管理", description = "用户管理服务接口", tags = {"用户 - 用户管理服务接口"})
public class UserEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        userService.delete(ids);
        userService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserHideModuleFunctionEndpoint.java

@@ -22,7 +22,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserHideModuleFunction.PREFIX)
@Api(value = "用户模块功能管理", description = "用户模块功能管理服务接口", tags = {"wlyy基础服务 - 用户模块功能管理服务接口"})
@Api(value = "用户模块功能管理", description = "用户模块功能管理服务接口", tags = {"用户 - 用户模块功能管理服务接口"})
public class UserHideModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -43,7 +43,7 @@ public class UserHideModuleFunctionEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        userHideModuleFunctionService.delete(ids);
        userHideModuleFunctionService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserRoleEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserRole.PREFIX)
@Api(value = "用户角色管理", description = "用户角色管理服务接口", tags = {"wlyy基础服务 - 用户角色管理服务接口"})
@Api(value = "用户角色管理", description = "用户角色管理服务接口", tags = {"用户 - 用户角色管理服务接口"})
public class UserRoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
@@ -45,7 +45,7 @@ public class UserRoleEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        userRoleService.delete(ids);
        userRoleService.delete(ids.split(","));
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/MessageService.java

@@ -1,13 +0,0 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MessageDao;
import com.yihu.jw.entity.base.message.MessageDo;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MessageService extends BaseJpaService<MessageDo, MessageDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/MessageSubscriberService.java

@@ -1,13 +0,0 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MessageSubscriberDao;
import com.yihu.jw.entity.base.message.MessageSubscriberDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MessageSubscriberService extends BaseJpaService<MessageSubscriberDO, MessageSubscriberDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/MqMessageService.java

@@ -0,0 +1,14 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MqMessageDao;
import com.yihu.jw.entity.base.message.MqMessageDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Service - 基于MQ的消息推送
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MqMessageService extends BaseJpaService<MqMessageDO, MqMessageDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/MqMessageSubscriberService.java

@@ -0,0 +1,14 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MqMessageSubscriberDao;
import com.yihu.jw.entity.base.message.MqMessageSubscriberDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Service - 基于MQ的消息推送订阅者
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MqMessageSubscriberService extends BaseJpaService<MqMessageSubscriberDO, MqMessageSubscriberDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/SmsGatewayService.java

@@ -112,15 +112,4 @@ public class SmsGatewayService extends BaseJpaService<SmsGatewayDO, SmsGatewayDa
        }
    }
    private String randomInt(int length) {
        String str = "0123456789";
        StringBuffer buffer = new StringBuffer();
        Random random = new Random();
        for(int i = 0; i < length; ++i) {
            int pos = random.nextInt(str.length());
            buffer.append(str.charAt(pos));
        }
        return buffer.toString();
    }
}

svr/svr-base/src/main/resources/application.yml

@@ -41,6 +41,10 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
  activemq:
    broker-url: tcp://172.19.103.87:61616
    user: admin
    password: admin
---
spring: