pom文件修改

jim-server/pom.xml

@@ -1,52 +1,52 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jim-server</artifactId>
-  <packaging>jar</packaging>
-  <name>jim-server</name>
-  <parent>
-		<groupId>org.j-im</groupId>
-		<artifactId>jim-parent</artifactId>
-		<version>2.6.0.v20190114-RELEASE</version>
-		<relativePath>../jim-parent/pom.xml</relativePath>
-  </parent>
-  <dependencies>
-	  <dependency>
-		    <groupId>org.apache.httpcomponents</groupId>
-		    <artifactId>httpclient</artifactId>
-		    <version>4.0</version>
-	  </dependency>
-  	  <dependency>
-			<groupId>org.j-im</groupId>
-			<artifactId>jim-common</artifactId>
-	  </dependency>
-	  <dependency>
-			<groupId>io.github.lukehutch</groupId>
-			<artifactId>fast-classpath-scanner</artifactId>
-			<version>2.4.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.paranamer</groupId>
-			<artifactId>paranamer</artifactId>
-			<version>2.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-		</dependency>
-  </dependencies>
-  <build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>   
-		        <artifactId>maven-compiler-plugin</artifactId>   
-		        <version>2.3.2</version>   
-		        <configuration>   
-		            <source>${jdk.version}</source>   
-		            <target>${jdk.version}</target>   
-		            <encoding>UTF-8</encoding>   
-		        </configuration> 
-			</plugin>
-		</plugins>
-  </build>
-</project>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jim-server</artifactId>
+    <packaging>jar</packaging>
+    <name>jim-server</name>
+    <parent>
+        <groupId>org.j-im</groupId>
+        <artifactId>jim-parent</artifactId>
+        <version>2.6.0.v20190114-RELEASE</version>
+        <relativePath>../jim-parent/pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.j-im</groupId>
+            <artifactId>jim-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.lukehutch</groupId>
+            <artifactId>fast-classpath-scanner</artifactId>
+            <version>2.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.paranamer</groupId>
+            <artifactId>paranamer</artifactId>
+            <version>2.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

jim-server/src/main/java/org/jim/server/command/handler/LoginReqHandler.java

@@ -1,19 +1,10 @@
 package org.jim.server.command.handler;
 
-import com.sun.org.apache.xml.internal.security.Init;
 import org.apache.commons.collections4.CollectionUtils;
-import org.jim.common.ImConst;
-import org.jim.common.ImAio;
-import org.jim.common.ImPacket;
-import org.jim.common.ImSessionContext;
-import org.jim.common.ImStatus;
+import org.jim.common.*;
 import org.jim.common.cache.redis.JedisTemplate;
 import org.jim.common.message.MessageHelper;
-import org.jim.common.packets.Command;
-import org.jim.common.packets.Group;
-import org.jim.common.packets.LoginReqBody;
-import org.jim.common.packets.LoginRespBody;
-import org.jim.common.packets.User;
+import org.jim.common.packets.*;
 import org.jim.common.protocol.IProtocol;
 import org.jim.common.utils.ImKit;
 import org.jim.common.utils.JsonKit;
@@ -29,7 +20,6 @@ import org.tio.core.Aio;
 import org.tio.core.ChannelContext;
 import org.tio.utils.lock.SetWithLock;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;

server-chat/pom.xml

@@ -71,6 +71,29 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.cn.ServerChatStart</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>