Skip to content

W
wecloud_im_server
Commit 22fbc783 by hweeeeeei
Options

修改模块名: common为core

parent 69e690d1
Showing with 28 additions and 87 deletions
bootstrap/pom.xml
......@@ -29,7 +29,7 @@
<dependency>
<groupId>io.geekidea.springbootplus</groupId>
<artifactId>common</artifactId>
<artifactId>core</artifactId>
</dependency>
</dependencies>
......
common/src/main/resources/mapper/ImInboxMapper.xml deleted 100644 → 0
<?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.wecloud.im.mapper.ImInboxMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id
, create_time, update_time, read_time, receiver_time, fk_appid, receiver, fk_msg_id, read_msg_status, receiver_msg_status, fk_conversation_id
</sql>
<update id="updateImMsgReceivedByIds">
UPDATE im_inbox
SET `im_inbox`.`update_time` = NOW(),
`im_inbox`.`receiver_msg_status` = 1,
`im_inbox`.`receiver_time` = NOW()
WHERE
im_inbox.receiver = #{clientId}
AND im_inbox.fk_msg_id IN
<foreach collection="msgIds" item="deptId" index="i" open="(" close=")" separator=",">
#{deptId}
</foreach>
</update>
<update id="updateImMsgReadByIds">
UPDATE im_inbox
SET `im_inbox`.`update_time` = NOW(),
`im_inbox`.`read_msg_status` = 1,
`im_inbox`.`receiver_time` = NOW(),
`im_inbox`.`read_time` = NOW()
WHERE
im_inbox.receiver = #{clientId}
AND im_inbox.fk_msg_id IN
<foreach collection="msgIds" item="deptId" index="i" open="(" close=")" separator=",">
#{deptId}
</foreach>
</update>
<select id="getImInboxById" resultType="com.wecloud.im.param.ImInboxQueryVo">
select
<include refid="Base_Column_List"/>
from im_Inbox where id = #{id}
</select>
<select id="getImInboxPageList" parameterType="com.wecloud.im.param.ImInboxPageParam"
resultType="com.wecloud.im.param.ImInboxQueryVo">
select
<include refid="Base_Column_List"/>
from im_Inbox
</select>
<select id="countMyNotReadCount" resultType="java.lang.Integer">
SELECT COUNT(id)
FROM im_inbox
WHERE receiver = #{clientId}
AND receiver_msg_status = 0
</select>
</mapper>
config/src/main/resources/config/logback.xml
......@@ -149,7 +149,7 @@
<logger name="org.apache.catalina.connector.CoyoteAdapter" level="OFF"/>
<root level="INFO">
<appender-ref ref="ELASTIC"/>
<!-- <appender-ref ref="ELASTIC"/>-->
<appender-ref ref="CONSOLE"/>
<appender-ref ref="ASYNC_FILE"/>
<appender-ref ref="ASYNC_ERROR_FILE"/>
......
common/pom.xml → core/pom.xml
......@@ -11,8 +11,8 @@
<version>2.0</version>
</parent>
<artifactId>common</artifactId>
<name>common</name>
<artifactId>core</artifactId>
<name>core</name>
<description>应用服务模块</description>
<dependencies>
......@@ -68,8 +68,6 @@
<!-- netty-->
<!-- fastbootWeixin的核心依赖 -->
<dependency>
<groupId>com.mxixm</groupId>
......
common/src/main/java/com/wecloud/im/campusstore/ArrayJsonHandler.java → core/src/main/java/com/wecloud/im/campusstore/ArrayJsonHandler.java
......@@ -12,7 +12,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
/**
*
* @description 用以mysql中json格式的字段，进行转换的自定义转换器，转换为实体类的JSONArray属性
* MappedTypes注解中的类代表此转换器可以自动转换为的java对象
* MappedJdbcTypes注解中设置的是对应的jdbctype
......@@ -25,20 +24,22 @@ public class ArrayJsonHandler extends BaseTypeHandler<JSONArray> {
public void setNonNullParameter(PreparedStatement ps, int i, JSONArray parameter, JdbcType jdbcType) throws SQLException {
ps.setString(i, String.valueOf(parameter.toJSONString()));
}
//根据列名，获取可以为空的结果
@Override
public JSONArray getNullableResult(ResultSet rs, String columnName) throws SQLException {
String sqlJson = rs.getString(columnName);
if (null != sqlJson){
if (null != sqlJson) {
return JSONArray.parseArray(sqlJson);
}
return null;
}
//根据列索引，获取可以为空的结果
@Override
public JSONArray getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
String sqlJson = rs.getString(columnIndex);
if (null != sqlJson){
if (null != sqlJson) {
return JSONArray.parseArray(sqlJson);
}
return null;
......@@ -47,7 +48,7 @@ public class ArrayJsonHandler extends BaseTypeHandler<JSONArray> {
@Override
public JSONArray getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
String sqlJson = cs.getString(columnIndex);
if (null != sqlJson){
if (null != sqlJson) {
return JSONArray.parseArray(sqlJson);
}
return null;
......
common/src/main/java/com/wecloud/im/campusstore/ObjectJsonHandler.java → core/src/main/java/com/wecloud/im/campusstore/ObjectJsonHandler.java
......@@ -12,7 +12,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
/**
*
* @description 用以mysql中json格式的字段，进行转换的自定义转换器，转换为实体类的JSONObject属性
* MappedTypes注解中的类代表此转换器可以自动转换为的java对象
* MappedJdbcTypes注解中设置的是对应的jdbctype
......@@ -20,27 +19,29 @@ import java.sql.SQLException;
@MappedTypes(JSONObject.class)
@MappedJdbcTypes(JdbcType.VARCHAR)
public class ObjectJsonHandler extends BaseTypeHandler<JSONObject>{
public class ObjectJsonHandler extends BaseTypeHandler<JSONObject> {
//设置非空参数
@Override
public void setNonNullParameter(PreparedStatement ps, int i, JSONObject parameter, JdbcType jdbcType) throws SQLException {
ps.setString(i, String.valueOf(parameter.toJSONString()));
}
//根据列名，获取可以为空的结果
@Override
public JSONObject getNullableResult(ResultSet rs, String columnName) throws SQLException {
String sqlJson = rs.getString(columnName);
if (null != sqlJson){
if (null != sqlJson) {
return JSONObject.parseObject(sqlJson);
}
return null;
}
//根据列索引，获取可以为空的结果
@Override
public JSONObject getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
String sqlJson = rs.getString(columnIndex);
if (null != sqlJson){
if (null != sqlJson) {
return JSONObject.parseObject(sqlJson);
}
return null;
......@@ -49,7 +50,7 @@ public class ObjectJsonHandler extends BaseTypeHandler<JSONObject>{
@Override
public JSONObject getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
String sqlJson = cs.getString(columnIndex);
if (null != sqlJson){
if (null != sqlJson) {
return JSONObject.parseObject(sqlJson);
}
return null;
......
common/src/main/java/com/wecloud/im/netty/core/NettyStart.java → core/src/main/java/com/wecloud/im/netty/core/NettyStart.java
......@@ -13,7 +13,6 @@ import org.springframework.stereotype.Component;
@Component
@Slf4j
public class NettyStart {
private final NettyChannelInitializer nettyChannelInitializer;
private static final EventLoopGroup BOSS = new NioEventLoopGroup(1);
private static final EventLoopGroup WORK = new NioEventLoopGroup();
private static final ServerBootstrap SERVER_BOOTSTRAP = new ServerBootstrap();
......@@ -43,6 +42,8 @@ public class NettyStart {
}
private final NettyChannelInitializer nettyChannelInitializer;
public NettyStart(NettyChannelInitializer nettyChannelInitializer) {
this.nettyChannelInitializer = nettyChannelInitializer;
}
......@@ -54,7 +55,7 @@ public class NettyStart {
**/
public void run(int port) {
log.info( "启动netty");
log.info("启动netty");
try {
//设置过滤器
......
common/src/main/java/com/wecloud/im/netty/core/WsReadHandler.java → core/src/main/java/com/wecloud/im/netty/core/WsReadHandler.java
......@@ -34,16 +34,6 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
private static final String PING = "ping";
private static final String PONG = "pong";
@Resource
private ReadWsData readWsData;
@Autowired
private RtcService rtcService;
@Resource
private MangerChannelService mangerChannelService;
private final static ThreadFactory NAMED_THREAD_FACTORY = new ThreadFactoryBuilder()
.setNamePrefix("WS-business-").build();
/**
......@@ -55,6 +45,12 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
new ThreadPoolExecutor(WsConstants.CPU_PROCESSORS * 5, WsConstants.CPU_PROCESSORS * 10,
10L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(10), NAMED_THREAD_FACTORY, new ThreadPoolExecutor.CallerRunsPolicy());
@Resource
private ReadWsData readWsData;
@Autowired
private RtcService rtcService;
@Resource
private MangerChannelService mangerChannelService;
@Override
protected void channelRead0(ChannelHandlerContext ctx, TextWebSocketFrame msg) {
......
common/src/main/java/com/wecloud/im/param/ImApplicationPageParam.java → core/src/main/java/com/wecloud/im/param/ImApplicationPageParam.java
......@@ -20,6 +20,6 @@ import lombok.experimental.Accessors;
@ApiModel(value = "第三方应用表分页参数")
public class ImApplicationPageParam extends BasePageOrderParam {
private String pwd;
private static final long serialVersionUID = 1L;
private String pwd;
}
common/src/main/java/com/wecloud/im/param/ImClientBlacklistPageParam.java → core/src/main/java/com/wecloud/im/param/ImClientBlacklistPageParam.java
......@@ -19,5 +19,5 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "黑名单分页参数")
public class ImClientBlacklistPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/wecloud/im/param/ImMessagePageParam.java → core/src/main/java/com/wecloud/im/param/ImMessagePageParam.java
......@@ -18,6 +18,6 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "消息存储表分页参数")
public class ImMessagePageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
public class ImMessagePageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment