diff --git a/hs-im-server/im-codec/im-codec.iml b/hs-im-server/im-codec/im-codec.iml deleted file mode 100644 index 1be3c97..0000000 --- a/hs-im-server/im-codec/im-codec.iml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hs-im-server/im-codec/pom.xml b/hs-im-server/im-codec/pom.xml index 7160237..c8a56d3 100644 --- a/hs-im-server/im-codec/pom.xml +++ b/hs-im-server/im-codec/pom.xml @@ -37,7 +37,7 @@ com.lld - common + im-common 1.0.0-SNAPSHOT diff --git a/hs-im-server/im-common/pom.xml b/hs-im-server/im-common/pom.xml index 03e7dea..2615314 100644 --- a/hs-im-server/im-common/pom.xml +++ b/hs-im-server/im-common/pom.xml @@ -37,10 +37,8 @@ org.apache.commons commons-lang3 - - diff --git a/hs-im-server/im-message-store/pom.xml b/hs-im-server/im-message-store/pom.xml index 0dc2a56..46e286f 100644 --- a/hs-im-server/im-message-store/pom.xml +++ b/hs-im-server/im-message-store/pom.xml @@ -10,6 +10,7 @@ im-message-store + jar 8 @@ -55,7 +56,7 @@ com.lld - common + im-common 1.0.0-SNAPSHOT diff --git a/hs-im-server/im-service/im-service.iml b/hs-im-server/im-service/im-service.iml deleted file mode 100644 index e69de29..0000000 diff --git a/hs-im-server/im-service/pom.xml b/hs-im-server/im-service/pom.xml index d2bc5d9..96387aa 100644 --- a/hs-im-server/im-service/pom.xml +++ b/hs-im-server/im-service/pom.xml @@ -13,6 +13,7 @@ 1.8 + jar im-service diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/config/BeanConfig.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/config/BeanConfig.java index 2e671a5..7dfb22a 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/config/BeanConfig.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/config/BeanConfig.java @@ -5,10 +5,6 @@ import com.lld.im.common.enums.ImUrlRouteWayEnum; import com.lld.im.common.enums.RouteHashMethodEnum; import com.lld.im.common.route.RouteHandle; import com.lld.im.common.route.algorithm.consistenthash.AbstractConsistentHash; -import com.lld.im.common.route.algorithm.consistenthash.ConsistentHashHandle; -import com.lld.im.common.route.algorithm.consistenthash.TreeMapConsistentHash; -import com.lld.im.common.route.algorithm.loop.LoopHandle; -import com.lld.im.common.route.algorithm.random.RandomHandle; import com.lld.im.service.utils.SnowflakeIdWorker; import org.I0Itec.zkclient.ZkClient; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +40,7 @@ public class BeanConfig { routWay = handler.getClazz(); RouteHandle routeHandle = (RouteHandle) Class.forName(routWay).newInstance(); + if(handler == ImUrlRouteWayEnum.HASH){ Method setHash = Class.forName(routWay).getMethod("setHash", AbstractConsistentHash.class); diff --git a/hs-im-server/im-tcp/pom.xml b/hs-im-server/im-tcp/pom.xml index 2449368..a5d33a1 100644 --- a/hs-im-server/im-tcp/pom.xml +++ b/hs-im-server/im-tcp/pom.xml @@ -10,6 +10,10 @@ 4.0.0 im-tcp + + jar + + 1.8 3.3.0 diff --git a/hs-im-server/im-tcp/src/main/resources/config.yml b/hs-im-server/im-tcp/src/main/resources/config.yml index fe650ec..011b68d 100644 --- a/hs-im-server/im-tcp/src/main/resources/config.yml +++ b/hs-im-server/im-tcp/src/main/resources/config.yml @@ -6,7 +6,7 @@ lim: heartBeatTime: 20000 #心跳超时时间 单位毫秒 brokerId: 1000 loginModel: 3 - logicUrl: http://127.0.0.1:28000/v1 + logicUrl: http://192.168.2.180:28000/v1 # * 多端同步模式:1 只允许一端在线,手机/电脑/web 踢掉除了本client+imel的设备 # * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备 # * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备 diff --git a/hs-im-server/im-tcp/src/main/resources/config2.yml b/hs-im-server/im-tcp/src/main/resources/config2.yml index c13e4e2..6aae627 100644 --- a/hs-im-server/im-tcp/src/main/resources/config2.yml +++ b/hs-im-server/im-tcp/src/main/resources/config2.yml @@ -6,7 +6,7 @@ lim: heartBeatTime: 20000 #心跳超时时间 单位毫秒 brokerId: 1001 loginModel: 3 - logicUrl: http://127.0.0.1:28000/v1 + logicUrl: http://192.168.2.180:28000/v1 # * 多端同步模式:1 只允许一端在线,手机/电脑/web 踢掉除了本client+imel的设备 # * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备 # * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备 diff --git a/hs-im-server/im-tcp/tcp.iml b/hs-im-server/im-tcp/tcp.iml deleted file mode 100644 index 1daccae..0000000 --- a/hs-im-server/im-tcp/tcp.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file