Merge branch 'feature/bussiness-msg-push-20220914' into 'master'

Feature/bussiness msg push 20220914

See merge request head_group/websocketserver!2

src/main/java/com/netty/server/Controller/SendSocketMessageController.java → src/main/java/cn/quantgroup/Controller/SendSocketMessageController.java

-package com.netty.server.Controller;
+package cn.quantgroup.Controller;
 
-import com.netty.server.handler.ChannelHandlerPool;
-import com.netty.server.model.MsgAgreement;
-import com.netty.server.server.CacheService;
-import com.netty.server.utils.CacheUtil;
+import cn.quantgroup.model.MsgAgreement;
+import cn.quantgroup.handler.ChannelHandlerPool;
+import cn.quantgroup.server.CacheService;
+import cn.quantgroup.utils.CacheUtil;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.util.AttributeKey;

src/main/java/com/netty/server/NettyServerApplication.java → src/main/java/cn/quantgroup/NettyServerApplication.java

-package com.netty.server;
+package cn.quantgroup;
 
 
 import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
-import com.netty.server.server.TcpServer;
+import cn.quantgroup.server.TcpServer;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -14,10 +14,9 @@ import org.springframework.context.annotation.ComponentScan;
 
 
 /**
- * @author qiding
  */
-@ComponentScan(basePackages = {"com.netty.server.*"})
-@EnableFeignClients(basePackages = {"com.netty.*"})
+@ComponentScan(basePackages = { "cn.quantgroup.*"})
+@EnableFeignClients(basePackages = {"cn.quantgroup.*"})
 @SpringBootApplication
 @RequiredArgsConstructor
 @EnableApolloConfig

src/main/java/com/netty/server/channel/ChannelInit.java → src/main/java/cn/quantgroup/channel/ChannelInit.java

-package com.netty.server.channel;
+package cn.quantgroup.channel;
 
-import com.netty.server.handler.MessageHandler;
-import com.netty.server.handler.WebsocketMessageHandler;
-import com.netty.server.server.CacheService;
-import com.netty.server.server.IStmsServer;
+import cn.quantgroup.server.IStmsServer;
+import cn.quantgroup.handler.MessageHandler;
+import cn.quantgroup.handler.WebsocketMessageHandler;
+import cn.quantgroup.server.CacheService;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;

src/main/java/com/netty/server/config/FeignConfig.java → src/main/java/cn/quantgroup/config/FeignConfig.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import com.google.common.collect.Lists;
 import feign.Contract;

src/main/java/com/netty/server/config/MessageConverter.java → src/main/java/cn/quantgroup/config/MessageConverter.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;

src/main/java/com/netty/server/config/MsgPub.java → src/main/java/cn/quantgroup/config/MsgPub.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
-import com.netty.server.model.MsgAgreement;
-import com.netty.server.utils.MsgUtil;
+import cn.quantgroup.model.MsgAgreement;
+import cn.quantgroup.utils.MsgUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;

src/main/java/com/netty/server/config/MsgReceiver.java → src/main/java/cn/quantgroup/config/MsgReceiver.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
+import cn.quantgroup.model.MsgAgreement;
+import cn.quantgroup.server.CacheService;
 import com.alibaba.fastjson.JSON;
-import com.netty.server.model.MsgAgreement;
-import com.netty.server.server.CacheService;
-import com.netty.server.utils.CacheUtil;
-import com.netty.server.utils.MsgUtil;
+import cn.quantgroup.utils.CacheUtil;
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/netty/server/config/MyEncoder.java → src/main/java/cn/quantgroup/config/MyEncoder.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import com.alibaba.fastjson.JSONObject;
 import feign.RequestTemplate;

src/main/java/com/netty/server/config/RedisConfig.java → src/main/java/cn/quantgroup/config/RedisConfig.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer;
 import org.springframework.context.annotation.Bean;

src/main/java/com/netty/server/config/ResTemplateConfig.java → src/main/java/cn/quantgroup/config/ResTemplateConfig.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;

src/main/java/com/netty/server/config/ServerProperties.java → src/main/java/cn/quantgroup/config/ServerProperties.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/netty/server/config/SubConfig.java → src/main/java/cn/quantgroup/config/SubConfig.java

-package com.netty.server.config;
+package cn.quantgroup.config;
 
-import com.netty.server.utils.NetWorkUtils;
+import cn.quantgroup.utils.NetWorkUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/netty/server/handler/ChannelHandlerPool.java → src/main/java/cn/quantgroup/handler/ChannelHandlerPool.java

-package com.netty.server.handler;
+package cn.quantgroup.handler;
 
 import io.netty.channel.Channel;
 

src/main/java/com/netty/server/handler/MessageHandler.java → src/main/java/cn/quantgroup/handler/MessageHandler.java

-package com.netty.server.handler;
+package cn.quantgroup.handler;
 
-import com.netty.server.server.CacheService;
-import com.netty.server.server.IStmsServer;
-import com.netty.server.store.ChannelStore;
-import com.netty.server.store.WebSocketSession;
-import com.netty.server.utils.CacheUtil;
+import cn.quantgroup.server.IStmsServer;
+import cn.quantgroup.server.CacheService;
+import cn.quantgroup.store.ChannelStore;
+import cn.quantgroup.store.WebSocketSession;
+import cn.quantgroup.utils.CacheUtil;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;

src/main/java/com/netty/server/handler/WebsocketMessageHandler.java → src/main/java/cn/quantgroup/handler/WebsocketMessageHandler.java

-package com.netty.server.handler;
+package cn.quantgroup.handler;
 
+import cn.quantgroup.model.MsgAgreement;
+import cn.quantgroup.server.IStmsServer;
+import cn.quantgroup.utils.Md5Utils;
 import com.alibaba.fastjson.JSON;
-import com.netty.server.model.DeviceChannelInfo;
-import com.netty.server.model.MsgAgreement;
-import com.netty.server.server.CacheService;
-import com.netty.server.server.IStmsServer;
-import com.netty.server.store.WebSocketSession;
-import com.netty.server.utils.CacheUtil;
-import com.netty.server.utils.Md5Utils;
-import com.netty.server.utils.NetWorkUtils;
+import cn.quantgroup.model.DeviceChannelInfo;
+import cn.quantgroup.server.CacheService;
+import cn.quantgroup.store.WebSocketSession;
+import cn.quantgroup.utils.CacheUtil;
+import cn.quantgroup.utils.NetWorkUtils;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -66,8 +66,8 @@ public class WebsocketMessageHandler {
             this.sendResponse(ctx, request, new DefaultFullHttpResponse(request.protocolVersion(), HttpResponseStatus.BAD_REQUEST, ctx.alloc().buffer()));
             ctx.close();
         }
-//        String supplierCode = stmsServer.getStmsTokenInfo(paramMap.get("token"));
-        String supplierCode = "100";
+        String supplierCode = stmsServer.getStmsTokenInfo(paramMap.get("token"));
+//        String supplierCode = "100";
         if (null == supplierCode) {
             this.sendResponse(ctx, request, new DefaultFullHttpResponse(request.protocolVersion(), HttpResponseStatus.FORBIDDEN, ctx.alloc().buffer()));
             ctx.close();

src/main/java/com/netty/server/model/DeviceChannelInfo.java → src/main/java/cn/quantgroup/model/DeviceChannelInfo.java

-package com.netty.server.model;
+package cn.quantgroup.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/netty/server/model/MsgAgreement.java → src/main/java/cn/quantgroup/model/MsgAgreement.java

-package com.netty.server.model;
+package cn.quantgroup.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/netty/server/model/ServerInfo.java → src/main/java/cn/quantgroup/model/ServerInfo.java

-package com.netty.server.model;
+package cn.quantgroup.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/netty/server/model/StmsRe.java → src/main/java/cn/quantgroup/model/StmsRe.java

-package com.netty.server.model;
+package cn.quantgroup.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/netty/server/response/Result.java → src/main/java/cn/quantgroup/response/Result.java

-package com.netty.server.response;
+package cn.quantgroup.response;
 
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/netty/server/response/ResultCode.java → src/main/java/cn/quantgroup/response/ResultCode.java

-package com.netty.server.response;
+package cn.quantgroup.response;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/netty/server/server/CacheService.java → src/main/java/cn/quantgroup/server/CacheService.java

-package com.netty.server.server;
+package cn.quantgroup.server;
 
 
-import com.netty.server.config.MsgPub;
-import com.netty.server.model.DeviceChannelInfo;
-import com.netty.server.model.MsgAgreement;
-import com.netty.server.utils.RedisUtil;
+import cn.quantgroup.config.MsgPub;
+import cn.quantgroup.model.MsgAgreement;
+import cn.quantgroup.model.DeviceChannelInfo;
+import cn.quantgroup.utils.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 

src/main/java/com/netty/server/server/IStmsServer.java → src/main/java/cn/quantgroup/server/IStmsServer.java

-package com.netty.server.server;
+package cn.quantgroup.server;
 
 
 /**

src/main/java/com/netty/server/server/ITcpServer.java → src/main/java/cn/quantgroup/server/ITcpServer.java

-package com.netty.server.server;
+package cn.quantgroup.server;
 
 import javax.annotation.PreDestroy;
 

src/main/java/com/netty/server/server/StmsRemoteService.java → src/main/java/cn/quantgroup/server/StmsRemoteService.java

-package com.netty.server.server;
+package cn.quantgroup.server;
 
+import cn.quantgroup.response.Result;
 import feign.Headers;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
-import com.netty.server.response.Result;
 
 @FeignClient(name = "stmsRemoteService", url = "${stms.http}")
 public interface StmsRemoteService {

src/main/java/com/netty/server/server/TcpServer.java → src/main/java/cn/quantgroup/server/TcpServer.java

-package com.netty.server.server;
+package cn.quantgroup.server;
 
 
 import com.alibaba.fastjson.JSON;
-import com.netty.server.channel.ChannelInit;
-import com.netty.server.config.ServerProperties;
-import com.netty.server.handler.WebsocketMessageHandler;
-import com.netty.server.model.ServerInfo;
-import com.netty.server.utils.CacheUtil;
+import cn.quantgroup.channel.ChannelInit;
+import cn.quantgroup.config.ServerProperties;
+import cn.quantgroup.handler.WebsocketMessageHandler;
+import cn.quantgroup.model.ServerInfo;
+import cn.quantgroup.utils.CacheUtil;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

src/main/java/com/netty/server/server/impl/StmsServerImpl.java → src/main/java/cn/quantgroup/server/impl/StmsServerImpl.java

-package com.netty.server.server.impl;
+package cn.quantgroup.server.impl;
 
+import cn.quantgroup.response.Result;
 import com.alibaba.fastjson.JSONObject;
-import com.netty.server.response.Result;
-import com.netty.server.server.IStmsServer;
-import com.netty.server.server.StmsRemoteService;
+import cn.quantgroup.server.IStmsServer;
+import cn.quantgroup.server.StmsRemoteService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/com/netty/server/store/ChannelStore.java → src/main/java/cn/quantgroup/store/ChannelStore.java

-package com.netty.server.store;
+package cn.quantgroup.store;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;

src/main/java/com/netty/server/store/WebSocketSession.java → src/main/java/cn/quantgroup/store/WebSocketSession.java

-package com.netty.server.store;
+package cn.quantgroup.store;
 
 import io.netty.channel.ChannelId;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;

src/main/java/com/netty/server/utils/CacheUtil.java → src/main/java/cn/quantgroup/utils/CacheUtil.java

-package com.netty.server.utils;
+package cn.quantgroup.utils;
 
 import io.netty.channel.Channel;
 

src/main/java/com/netty/server/utils/Md5Utils.java → src/main/java/cn/quantgroup/utils/Md5Utils.java

-package com.netty.server.utils;
+package cn.quantgroup.utils;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/netty/server/utils/MsgUtil.java → src/main/java/cn/quantgroup/utils/MsgUtil.java

-package com.netty.server.utils;
+package cn.quantgroup.utils;
 
 
 import com.alibaba.fastjson.JSON;
-import com.netty.server.model.MsgAgreement;
+import cn.quantgroup.model.MsgAgreement;
 
 
 /**

src/main/java/com/netty/server/utils/NetWorkUtils.java → src/main/java/cn/quantgroup/utils/NetWorkUtils.java

-package com.netty.server.utils;
+package cn.quantgroup.utils;
 
 import java.io.IOException;
 import java.net.InetAddress;

src/main/java/com/netty/server/utils/RedisUtil.java → src/main/java/cn/quantgroup/utils/RedisUtil.java

-package com.netty.server.utils;
+package cn.quantgroup.utils;
 
+import cn.quantgroup.model.DeviceChannelInfo;
 import com.alibaba.fastjson.JSON;
-import com.netty.server.model.DeviceChannelInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;