message_bus / message_bus_service · 提交

转到一个项目

作者 王勇
提交 24d065dc26cd419e3955c87d0570dec8d0a68c5d 1 个父辈 5d70766c

简单调整代码格式

内嵌 并排对比
正在显示 6 个修改的文件 包含 107 行增加 和 98 行删除
... ... @@ -6,22 +6,32 @@
<!--@mbg.generated-->
<!--@Table bus_queue-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="durability" jdbcType="BOOLEAN" property="durability"/>
<result column="auto_delete" jdbcType="BOOLEAN" property="autoDelete"/>
<result column="arguments" jdbcType="VARCHAR" property="arguments"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="durability" jdbcType="BOOLEAN" property="durability"/>
<result column="auto_delete" jdbcType="BOOLEAN" property="autoDelete"/>
<result column="arguments" jdbcType="VARCHAR" property="arguments"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
</resultMap>
<!-- 该Mapper映射关系的作用，是队列与虚拟主机的1:1的关系映射 -->
<resultMap extends="BaseResultMap" id="QueueAndHostMap" type="com.sunyo.wlpt.message.bus.service.domain.BusQueue">
<association javaType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="virtualHost">
<id column="id" property="id"/>
<result column="virtual_host_name" property="virtualHostName"/>
</association>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, queue_name, user_id, username, virtual_host_id, durability, auto_delete, arguments,
description, gmt_create, gmt_modified
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
... ... @@ -189,13 +199,6 @@
where id = #{id,jdbcType=VARCHAR}
</update>
<!-- 该Mapper映射关系的作用，是队列与虚拟主机的1:1的关系映射 -->
<resultMap extends="BaseResultMap" id="QueueAndHostMap" type="com.sunyo.wlpt.message.bus.service.domain.BusQueue">
<association javaType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="virtualHost">
<id column="id" property="id"/>
<result column="virtual_host_name" property="virtualHostName"/>
</association>
</resultMap>
<!-- 获取消息队列，列表 -->
<select id="selectBusQueueList" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusQueue"
resultMap="QueueAndHostMap">
... ... @@ -229,6 +232,7 @@
and v.id = q.virtual_host_id
</where>
</select>
<!-- 校验消息队列是否已存在-->
<select id="validateBusQueue" parameterType="com.sunyo.wlpt.message.bus.service.domain.BusQueue"
resultMap="BaseResultMap">
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sunyo.wlpt.message.bus.service.mapper.BusServerMapper">
<cache-ref namespace="com.sunyo.wlpt.message.bus.service.mapper.VirtualHostMapper"/>
<resultMap id="BaseResultMap" type="com.sunyo.wlpt.message.bus.service.domain.BusServer">
<!--@mbg.generated-->
<!--@Table bus_server-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="server_name" jdbcType="VARCHAR" property="aliasName"/>
<result column="server_ip" jdbcType="VARCHAR" property="serverIp"/>
<result column="server_port" jdbcType="INTEGER" property="serverPort"/>
<result column="client_port" jdbcType="INTEGER" property="clientPort"/>
<result column="super_username" jdbcType="VARCHAR" property="superUsername"/>
<result column="super_password" jdbcType="VARCHAR" property="superPassword"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="server_name" jdbcType="VARCHAR" property="aliasName"/>
<result column="server_ip" jdbcType="VARCHAR" property="serverIp"/>
<result column="server_port" jdbcType="INTEGER" property="serverPort"/>
<result column="client_port" jdbcType="INTEGER" property="clientPort"/>
<result column="super_username" jdbcType="VARCHAR" property="superUsername"/>
<result column="super_password" jdbcType="VARCHAR" property="superPassword"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
</resultMap>
<!-- 该Mapper映射关系的作用，是服务器与虚拟主机的1:n的关系映射 -->
<resultMap extends="BaseResultMap" id="ServerAndVirtualHostMap"
type="com.sunyo.wlpt.message.bus.service.domain.BusServer">
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="aliasList">
<id column="vid" jdbcType="VARCHAR" property="id"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
</collection>
</resultMap>
<!-- 该Mapper映射关系的作用，服务器:虚拟主机—&gt;1:n ; 虚拟主机:交换机—&gt;1:n 的关系映射 -->
<resultMap extends="BaseResultMap" id="ServerAndHostAndExchangeMap"
type="com.sunyo.wlpt.message.bus.service.domain.BusServer">
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="aliasList">
<id column="vid" jdbcType="VARCHAR" property="id"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/>
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.BusExchange" property="aliasList">
<id column="eid" jdbcType="VARCHAR" property="id"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="exchange_name" jdbcType="VARCHAR" property="aliasName"/>
</collection>
</collection>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `server_name`, server_ip, server_port, client_port, super_username, super_password,
... ... @@ -161,31 +188,6 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
<cache-ref namespace="com.sunyo.wlpt.message.bus.service.mapper.VirtualHostMapper"/>
<!-- 该Mapper映射关系的作用，是服务器与虚拟主机的1:n的关系映射 -->
<resultMap extends="BaseResultMap" id="ServerAndVirtualHostMap"
type="com.sunyo.wlpt.message.bus.service.domain.BusServer">
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="aliasList">
<id column="vid" jdbcType="VARCHAR" property="id"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
</collection>
</resultMap>
<!-- 该Mapper映射关系的作用，服务器:虚拟主机—&gt;1:n ; 虚拟主机:交换机—&gt;1:n 的关系映射 -->
<resultMap extends="BaseResultMap" id="ServerAndHostAndExchangeMap"
type="com.sunyo.wlpt.message.bus.service.domain.BusServer">
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.VirtualHost" property="aliasList">
<id column="vid" jdbcType="VARCHAR" property="id"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="aliasName"/>
<collection ofType="com.sunyo.wlpt.message.bus.service.domain.BusExchange" property="aliasList">
<id column="eid" jdbcType="VARCHAR" property="id"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="exchange_name" jdbcType="VARCHAR" property="aliasName"/>
</collection>
</collection>
</resultMap>
<!-- 获取服务器列表，可能要级联或者懒加载 -->
<select id="getServerList" resultMap="BaseResultMap">
... ...
... ... @@ -5,31 +5,33 @@
<!--@mbg.generated-->
<!--@Table message_note-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="exchange_id" jdbcType="VARCHAR" property="exchangeId"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="queue_id" jdbcType="VARCHAR" property="queueId"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="routing_key_id" jdbcType="VARCHAR" property="routingKeyId"/>
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName"/>
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime"/>
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime"/>
<result column="send_content" jdbcType="BLOB" property="sendContent"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="exchange_id" jdbcType="VARCHAR" property="exchangeId"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="queue_id" jdbcType="VARCHAR" property="queueId"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="routing_key_id" jdbcType="VARCHAR" property="routingKeyId"/>
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName"/>
<result column="send_time" jdbcType="TIMESTAMP" property="sendTime"/>
<result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime"/>
<result column="send_content" jdbcType="BLOB" property="sendContent"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, user_id, username, server_id, `server_name`, virtual_host_id, virtual_host_name,
exchange_id, exchange_name, queue_id, queue_name, routing_key_id, routing_key_name,
send_time, receive_time, send_content, description, gmt_create, gmt_modified
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sunyo.wlpt.message.bus.service.mapper.UserInfoMapper">
<cache-ref namespace="com.sunyo.wlpt.message.bus.service.mapper.VirtualHostMapper"/>
<cache type="com.sunyo.wlpt.message.bus.service.cache.RedisCache"/>
<resultMap id="BaseResultMap" type="com.sunyo.wlpt.message.bus.service.domain.UserInfo">
<!--@mbg.generated-->
<!--@Table user_info-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="password" jdbcType="VARCHAR" property="password"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="real_name" jdbcType="VARCHAR" property="realName"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="password" jdbcType="VARCHAR" property="password"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="real_name" jdbcType="VARCHAR" property="realName"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
... ...
... ... @@ -5,28 +5,30 @@
<resultMap id="BaseResultMap" type="com.sunyo.wlpt.message.bus.service.domain.UserMessageBinding">
<!--@mbg.generated--><!--@Table user_message_binding-->
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="exchange_id" jdbcType="VARCHAR" property="exchangeId"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="queue_id" jdbcType="VARCHAR" property="queueId"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="routing_key_id" jdbcType="VARCHAR" property="routingKeyId"/>
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName"/>
<result column="subscriber" jdbcType="VARCHAR" property="subscriber"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
<result column="user_id" jdbcType="VARCHAR" property="userId"/>
<result column="username" jdbcType="VARCHAR" property="username"/>
<result column="server_id" jdbcType="VARCHAR" property="serverId"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="virtual_host_id" jdbcType="VARCHAR" property="virtualHostId"/>
<result column="virtual_host_name" jdbcType="VARCHAR" property="virtualHostName"/>
<result column="exchange_id" jdbcType="VARCHAR" property="exchangeId"/>
<result column="exchange_name" jdbcType="VARCHAR" property="exchangeName"/>
<result column="queue_id" jdbcType="VARCHAR" property="queueId"/>
<result column="queue_name" jdbcType="VARCHAR" property="queueName"/>
<result column="routing_key_id" jdbcType="VARCHAR" property="routingKeyId"/>
<result column="routing_key_name" jdbcType="VARCHAR" property="routingKeyName"/>
<result column="subscriber" jdbcType="VARCHAR" property="subscriber"/>
<result column="description" jdbcType="VARCHAR" property="description"/>
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->id, user_id, username, server_id, `server_name`, virtual_host_id, virtual_host_name,
exchange_id, exchange_name, queue_id, queue_name, routing_key_id, routing_key_name,
subscriber, description, gmt_create, gmt_modified
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
... ...
... ... @@ -21,7 +21,6 @@
</association>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, virtual_host_name, server_id, description, gmt_create, gmt_modified
... ...