Merge remote-tracking branch 'origin/m33' into for-yx

license/src/main/java/iot/sixiang/license/net/TcpServer.java

@@ -27,29 +27,26 @@ public class TcpServer {
 				EventLoopGroup bossGroup = new NioEventLoopGroup(4);
 				EventLoopGroup workerGroup = new NioEventLoopGroup(4);
 				log.debug("Tcp服务，开始监听端口:{}",port);
+				//创建服务端的启动对象，设置参数
+				ServerBootstrap b = new ServerBootstrap();
+				//设置两个线程组boosGroup和workerGroup
+				b.group(bossGroup, workerGroup)
+						//设置服务端通道实现类型
+						.channel(NioServerSocketChannel.class)
+//						.handler(new LoggingHandler(LogLevel.INFO))
+						.childHandler(channelInitializer)
+						// 设置tcp缓冲区
+						.option(ChannelOption.SO_BACKLOG, 1024)
+						//设置保持活动连接状态
+						.childOption(ChannelOption.SO_KEEPALIVE, true);
+				ChannelFuture f;
 				try {
-					//创建服务端的启动对象，设置参数
-					ServerBootstrap b = new ServerBootstrap();
-					//设置两个线程组boosGroup和workerGroup
-					b.group(bossGroup, workerGroup)
-							//设置服务端通道实现类型
-							.channel(NioServerSocketChannel.class)
-//							.handler(new LoggingHandler(LogLevel.INFO))
-							.childHandler(channelInitializer)
-							// 设置tcp缓冲区
-							.option(ChannelOption.SO_BACKLOG, 1024)
-							//设置保持活动连接状态
-							.childOption(ChannelOption.SO_KEEPALIVE, true);
-					ChannelFuture f;
-					try {
-						f = b.bind(port).sync();
-						f.channel().closeFuture().sync();
-					} catch (InterruptedException e) {
-						// TODO Auto-generated catch block
-						log.error("Tcp服务异常，端口:{}",port);
-					}
-
-				} finally {
+					f = b.bind(port).sync();
+					f.channel().closeFuture().sync();
+				} catch (InterruptedException e) {
+					// TODO Auto-generated catch block
+					log.error("Tcp服务异常，端口:{}",port);
+				}finally {
 					log.debug("Tcp服务，停止退出");
 					workerGroup.shutdownGracefully();
 					bossGroup.shutdownGracefully();

license/src/main/java/iot/sixiang/license/resource/ResourceManager.java

@@ -22,7 +22,7 @@ public class ResourceManager {
     @Autowired
     ResourceService resourceService;
 
-    public void downloadDeviceInfoExcle(HttpServletResponse response, int userId){
+    public void downloadDeviceInfoExcle(HttpServletResponse response, int userId) throws IOException {
         OutputStream os = null;
         HSSFWorkbook wb = null;
         try {
@@ -115,15 +115,11 @@ public class ResourceManager {
         } catch (IOException e) {
             log.error("Excel表格信息下载异常,{}",e.getMessage());
         } finally {
-            try {
-                if (os != null) {
-                    os.close();
-                }
-                if (wb != null) {
-                    wb.close();
-                }
-            } catch (IOException e) {
-                log.error("Excel表格信息下载异常,{}",e.getMessage());
+            if (os != null) {
+                os.close();
+            }
+            if (wb != null) {
+                wb.close();
             }
         }
     }

license/src/main/java/iot/sixiang/license/util/CommonUtil.java

@@ -85,11 +85,14 @@ public class CommonUtil {
 	public static String getLibFilePathByFileName(String fileName) {
 		String os = System.getProperty("os.name");
 		String serverParentDirectory = getServerParentDirectory();
-		if (os.toLowerCase(Locale.ENGLISH).startsWith("win")) {
-			return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".dll";
-		} else {
-			return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".so";
+		if (os != null) {
+			if (os.toLowerCase(Locale.ENGLISH).startsWith("win")) {
+				return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".dll";
+			} else {
+				return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".so";
+			}
 		}
+		return "";
 	}
 
 }

license/src/main/java/iot/sixiang/license/util/HexUtil.java

@@ -4,13 +4,13 @@ public class HexUtil {
 
     public static String bytes2hex(byte[] bytes) {
         StringBuilder sb = new StringBuilder();
-        String tmp;
+        StringBuilder tmp;
         sb.append("[");
         for (byte b : bytes) {
             // 将每个字节与0xFF进行与运算，然后转化为10进制，然后借助于Integer再转化为16进制
-            tmp = Integer.toHexString(0xFF & b);
+            tmp = new StringBuilder(Integer.toHexString(0xFF & b));
             if (tmp.length() == 1) {
-                tmp = "0" + tmp;//只有一位的前面补个0
+                tmp = tmp.insert(0, '0');//只有一位的前面补个0
             }
             sb.append(tmp).append(" ");//每个字节用空格断开
         }
@@ -18,4 +18,4 @@ public class HexUtil {
         sb.append("]");
         return sb.toString();
     }
-}
+}
\ No newline at end of file