修改模块名: common为core

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

-<?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/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;
 }

common/src/main/java/com/wecloud/im/register/GetIpUtils.java → core/src/main/java/com/wecloud/im/register/GetIpUtils.java

@@ -39,42 +39,6 @@ public class GetIpUtils {
     @Value("${load-blance.server-type}")
     private String SERVER_TYPE;
 
-
-    /**
-     * 内网ip
-     *
-     * @return
-     */
-    public String getlanIp() {
-
-        if (lAN_IP == null) {
-            lAN_IP = getLocalIpAddress();
-        }
-
-        return lAN_IP;
-    }
-
-    /**
-     * 公网ip
-     */
-    public String getPublicIp() {
-
-        if (PUBLIC_IP == null) {
-            switch (SERVER_TYPE) {
-                case LOCAL:
-                    PUBLIC_IP = getlanIp();
-                    break;
-                case AWS:
-                    PUBLIC_IP = HttpUtil.get("http://instance-data/latest/meta-data/public-ipv4", 30);
-                    break;
-                case HUAWEI_CLOUD:
-                    PUBLIC_IP = HttpUtil.get("http://169.254.169.254/latest/meta-data/public-ipv4", 30);
-                    break;
-            }
-        }
-        return PUBLIC_IP;
-    }
-
     /**
      * 判断是否为虚拟mac地址
      *
@@ -149,4 +113,39 @@ public class GetIpUtils {
         return StringUtils.EMPTY;
     }
 
+    /**
+     * 内网ip
+     *
+     * @return
+     */
+    public String getlanIp() {
+
+        if (lAN_IP == null) {
+            lAN_IP = getLocalIpAddress();
+        }
+
+        return lAN_IP;
+    }
+
+    /**
+     * 公网ip
+     */
+    public String getPublicIp() {
+
+        if (PUBLIC_IP == null) {
+            switch (SERVER_TYPE) {
+                case LOCAL:
+                    PUBLIC_IP = getlanIp();
+                    break;
+                case AWS:
+                    PUBLIC_IP = HttpUtil.get("http://instance-data/latest/meta-data/public-ipv4", 30);
+                    break;
+                case HUAWEI_CLOUD:
+                    PUBLIC_IP = HttpUtil.get("http://169.254.169.254/latest/meta-data/public-ipv4", 30);
+                    break;
+            }
+        }
+        return PUBLIC_IP;
+    }
+
 }

common/src/main/java/com/wecloud/im/service/impl/ImClientLoginServiceImpl.java → core/src/main/java/com/wecloud/im/service/impl/ImClientLoginServiceImpl.java

@@ -35,15 +35,13 @@ public class ImClientLoginServiceImpl implements ImClientLoginService {
 //    @Autowired
 //    private StringRedisTemplate redisTemplate;
 
+    private static JwtProperties jwtProperties;
     @Autowired
     private ImApplicationService imApplicationService;
-
     @Autowired
     private ImClientService imClientService;
     @Autowired
     private WsInstance wsInstance;
-
-    private static JwtProperties jwtProperties;
     @Autowired
     private AppLoginRedisService appLoginRedisService;
 

common/src/main/java/com/wecloud/im/ws/enums/WsRequestCmdEnum.java → core/src/main/java/com/wecloud/im/ws/enums/WsRequestCmdEnum.java

@@ -29,10 +29,6 @@ public enum WsRequestCmdEnum {
         this.cmdCode = uriCode;
     }
 
-    public int getCmdCode() {
-        return cmdCode;
-    }
-
     /**
      * 根据uriCode获取
      *
@@ -47,4 +43,8 @@ public enum WsRequestCmdEnum {
         }
         return null;
     }
+
+    public int getCmdCode() {
+        return cmdCode;
+    }
 }

common/src/main/java/com/wecloud/im/ws/model/WsConstants.java → core/src/main/java/com/wecloud/im/ws/model/WsConstants.java

@@ -17,19 +17,17 @@ public class WsConstants {
      * 当前服务器cpu核心数量（）
      */
     public static final Integer CPU_PROCESSORS = Runtime.getRuntime().availableProcessors();
-
-    static {
-        log.info("CPU_PROCESSORS:" + CPU_PROCESSORS);
-    }
-
     /**
      * 长连接url
      */
     public static final String WS_URL = "/ws";
-
     /**
      * token
      */
     public static final String TOKEN = "token";
 
+    static {
+        log.info("CPU_PROCESSORS:" + CPU_PROCESSORS);
+    }
+
 }

common/src/main/java/com/wecloud/im/ws/sender/PushTask.java → core/src/main/java/com/wecloud/im/ws/sender/PushTask.java

@@ -33,31 +33,24 @@ import java.util.Map;
 @Slf4j
 public class PushTask {
 
-    @Autowired
-    private ImIosApnsService imIosApnsService;
-
-
-    @Autowired
-    private ImInboxService imInboxService;
-
     /**
      * 谷歌推送地址
      */
     private static final String API_URL_FCM = "https://fcm.googleapis.com/fcm/send";
-
     /**
      * 您收到一条新消息
      */
     private static final String PUSH_TITLE = "You have received a new message";
-
     /**
      * 点击查看
      */
     private static final String PUSH_BODY = "Click to view";
-
     private static final String title = "title";
     private static final String subTitle = "subTitle";
-
+    @Autowired
+    private ImIosApnsService imIosApnsService;
+    @Autowired
+    private ImInboxService imInboxService;
 
     /**
      * 异步系统推送

common/src/main/java/com/wecloud/im/ws/strategy/concrete/ImChatConcrete.java → core/src/main/java/com/wecloud/im/ws/strategy/concrete/ImChatConcrete.java

@@ -45,10 +45,9 @@ import java.util.List;
 @Slf4j
 public class ImChatConcrete extends ImCmdAbstract {
 
-    private static final String TO_CONVERSATION_KEY = "toConversation";
     public static final String PUSH_KEY = "push";
     public static final String MSG_ID = "msgId";
-
+    private static final String TO_CONVERSATION_KEY = "toConversation";
     private static final JsonMapper JSON_MAPPER = new JsonMapper();
 
     @Autowired

common/src/main/java/com/wecloud/im/ws/utils/EncrypDES.java → core/src/main/java/com/wecloud/im/ws/utils/EncrypDES.java

@@ -86,6 +86,13 @@ public class EncrypDES {
         return arrOut;
     }
 
+    public static void main(String[] args) throws Exception {
+        String code = "427d68ae59e577f7b87f05d43670df58";
+        EncrypDES encrypDES = new EncrypDES();
+        //System.out.println(encrypDES.decrypt(code));
+        System.out.println(encrypDES.encrypt("18011953567"));
+    }
+
     /**
      * 加密字节数组
      *
@@ -144,13 +151,6 @@ public class EncrypDES {
         return key;
     }
 
-    public static void main(String[] args) throws Exception {
-        String code = "427d68ae59e577f7b87f05d43670df58";
-        EncrypDES encrypDES = new EncrypDES();
-        //System.out.println(encrypDES.decrypt(code));
-        System.out.println(encrypDES.encrypt("18011953567"));
-    }
-
     /*public static void main(String[] args) {
         try {
             *//*String msg1 = "1";

common/src/main/java/com/wecloud/im/ws/utils/SpringBeanUtils.java → core/src/main/java/com/wecloud/im/ws/utils/SpringBeanUtils.java

@@ -15,6 +15,14 @@ public class SpringBeanUtils implements ApplicationContextAware {
 
     private static ApplicationContext applicationContext;
 
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+
     @Override
     public void setApplicationContext(ApplicationContext context) throws BeansException {
 
@@ -23,12 +31,4 @@ public class SpringBeanUtils implements ApplicationContextAware {
         }
 
     }
-
-    public static Object getBean(String name) {
-        return applicationContext.getBean(name);
-    }
-
-    public static <T> T getBean(Class<T> clazz) {
-        return applicationContext.getBean(clazz);
-    }
 }

core/src/main/resources/mapper/ImInboxMapper.xml

+<?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>

pom.xml

@@ -65,7 +65,7 @@
         <module>config</module>
         <module>framework</module>
         <module>generator</module>
-        <module>common</module>
+        <module>core</module>
 <!--        <module>api-app</module>-->
         <!--        <module>distribution</module>-->
         <!--        <module>admin</module>-->
@@ -291,7 +291,7 @@
             </dependency>
             <dependency>
                 <groupId>io.geekidea.springbootplus</groupId>
-                <artifactId>common</artifactId>
+                <artifactId>core</artifactId>
                 <version>${project.version}</version>
             </dependency>