upgrade dom4j

Author: Evan Hu

pom.xml

@@ -132,9 +132,9 @@
             <version>4.5.13</version>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
+            <version>2.1.3</version>
         </dependency>
     </dependencies>
 

src/main/java/info/xiaomo/core/config/util/ExcelUtils.java

@@ -56,7 +56,7 @@ public static String getCellStringValue(Cell cell) {
 		}
 		String retValue = null;
 		switch (cell.getCellType()) {
-			case Cell.CELL_TYPE_NUMERIC:
+			case NUMERIC:
 				if (DateUtil.isCellDateFormatted(cell)) {
 					Date date = cell.getDateCellValue();
 					if (date != null) {
@@ -71,10 +71,10 @@ public static String getCellStringValue(Cell cell) {
 					return String.valueOf(value);
 				}
 				break;
-			case Cell.CELL_TYPE_STRING:
+			case STRING:
 				retValue = cell.getRichStringCellValue().getString();
 				break;
-			case Cell.CELL_TYPE_FORMULA:
+			case FORMULA:
 				try {
 					// 先按照字符串格式获取 如果是生成的是数字 会抛出异常
 					retValue = cell.getStringCellValue();
@@ -93,11 +93,11 @@ public static String getCellStringValue(Cell cell) {
 					}
 				}
 				break;
-			case Cell.CELL_TYPE_BOOLEAN:
+			case BOOLEAN:
 				retValue = String.valueOf(cell.getBooleanCellValue());
 				break;
-			case Cell.CELL_TYPE_BLANK:
-			case Cell.CELL_TYPE_ERROR:
+			case BLANK:
+			case ERROR:
 			default:
 				retValue = null;
 				break;

src/main/java/info/xiaomo/core/network/mina/handler/ClientProtocolHandler.java

@@ -11,6 +11,7 @@
 import info.xiaomo.core.server.BaseServerConfig;
 import info.xiaomo.core.server.Service;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.FilterEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,10 +65,8 @@ public void messageReceived(IoSession session, Object obj) throws Exception {
 					Message message = MsgUtil.buildMessage(handlerEntity.msg(), bytes, messageHeaderLength,
 							bytes.length - messageHeaderLength);
 					TcpHandler handler = (TcpHandler) handlerClass.newInstance();
-					if (handler != null) {
-						messageHandler(session, handlerEntity, message, handler);
-						return;
-					}
+					messageHandler(session, handlerEntity, message, handler);
+					return;
 				}
 			}
 			forward(session, mid, bytes);
@@ -77,6 +76,11 @@ public void messageReceived(IoSession session, Object obj) throws Exception {
 		}
 	}
 
+	@Override
+	public void event(IoSession ioSession, FilterEvent filterEvent) throws Exception {
+
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

src/main/java/info/xiaomo/core/network/mina/handler/DefaultClientProtocolHandler.java

@@ -3,6 +3,7 @@
 import info.xiaomo.core.common.utils.IntUtil;
 import info.xiaomo.core.network.mina.service.MinaClientService;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.FilterEvent;
 
 /**
  * 默认内部客户端消息处理器
@@ -69,4 +70,9 @@ public void sessionClosed(IoSession session) {
 		getService().onIoSessionClosed(session);
 	}
 
+	@Override
+	public void event(IoSession ioSession, FilterEvent filterEvent) throws Exception {
+
+	}
+
 }

src/main/java/info/xiaomo/core/network/mina/service/GameHttpSevice.java

@@ -5,6 +5,8 @@
 import info.xiaomo.core.network.mina.handler.HttpServerIoHandler;
 import info.xiaomo.core.server.Service;
 import info.xiaomo.core.thread.ThreadPoolExecutorConfig;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.FilterEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,4 +97,9 @@ public GameHttpServerHandler(Service<MinaServerConfig> service) {
 	protected Service<MinaServerConfig> getService() {
 		return service;
 	}
+
+	@Override
+	public void event(IoSession ioSession, FilterEvent filterEvent) throws Exception {
+
+	}
 }