Commit 62d2ef53 authored by AfirSraftGarrier's avatar AfirSraftGarrier

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

parents 1694fe28 e1d56c3f
...@@ -27,7 +27,6 @@ public class TcpServer { ...@@ -27,7 +27,6 @@ public class TcpServer {
EventLoopGroup bossGroup = new NioEventLoopGroup(4); EventLoopGroup bossGroup = new NioEventLoopGroup(4);
EventLoopGroup workerGroup = new NioEventLoopGroup(4); EventLoopGroup workerGroup = new NioEventLoopGroup(4);
log.debug("Tcp服务,开始监听端口:{}",port); log.debug("Tcp服务,开始监听端口:{}",port);
try {
//创建服务端的启动对象,设置参数 //创建服务端的启动对象,设置参数
ServerBootstrap b = new ServerBootstrap(); ServerBootstrap b = new ServerBootstrap();
//设置两个线程组boosGroup和workerGroup //设置两个线程组boosGroup和workerGroup
...@@ -47,9 +46,7 @@ public class TcpServer { ...@@ -47,9 +46,7 @@ public class TcpServer {
} catch (InterruptedException e) { } catch (InterruptedException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
log.error("Tcp服务异常,端口:{}",port); log.error("Tcp服务异常,端口:{}",port);
} }finally {
} finally {
log.debug("Tcp服务,停止退出"); log.debug("Tcp服务,停止退出");
workerGroup.shutdownGracefully(); workerGroup.shutdownGracefully();
bossGroup.shutdownGracefully(); bossGroup.shutdownGracefully();
......
...@@ -22,7 +22,7 @@ public class ResourceManager { ...@@ -22,7 +22,7 @@ public class ResourceManager {
@Autowired @Autowired
ResourceService resourceService; ResourceService resourceService;
public void downloadDeviceInfoExcle(HttpServletResponse response, int userId){ public void downloadDeviceInfoExcle(HttpServletResponse response, int userId) throws IOException {
OutputStream os = null; OutputStream os = null;
HSSFWorkbook wb = null; HSSFWorkbook wb = null;
try { try {
...@@ -115,16 +115,12 @@ public class ResourceManager { ...@@ -115,16 +115,12 @@ public class ResourceManager {
} catch (IOException e) { } catch (IOException e) {
log.error("Excel表格信息下载异常,{}",e.getMessage()); log.error("Excel表格信息下载异常,{}",e.getMessage());
} finally { } finally {
try {
if (os != null) { if (os != null) {
os.close(); os.close();
} }
if (wb != null) { if (wb != null) {
wb.close(); wb.close();
} }
} catch (IOException e) {
log.error("Excel表格信息下载异常,{}",e.getMessage());
}
} }
} }
} }
...@@ -85,11 +85,14 @@ public class CommonUtil { ...@@ -85,11 +85,14 @@ public class CommonUtil {
public static String getLibFilePathByFileName(String fileName) { public static String getLibFilePathByFileName(String fileName) {
String os = System.getProperty("os.name"); String os = System.getProperty("os.name");
String serverParentDirectory = getServerParentDirectory(); String serverParentDirectory = getServerParentDirectory();
if (os != null) {
if (os.toLowerCase(Locale.ENGLISH).startsWith("win")) { if (os.toLowerCase(Locale.ENGLISH).startsWith("win")) {
return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".dll"; return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".dll";
} else { } else {
return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".so"; return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".so";
} }
} }
return "";
}
} }
...@@ -4,13 +4,13 @@ public class HexUtil { ...@@ -4,13 +4,13 @@ public class HexUtil {
public static String bytes2hex(byte[] bytes) { public static String bytes2hex(byte[] bytes) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String tmp; StringBuilder tmp;
sb.append("["); sb.append("[");
for (byte b : bytes) { for (byte b : bytes) {
// 将每个字节与0xFF进行与运算,然后转化为10进制,然后借助于Integer再转化为16进制 // 将每个字节与0xFF进行与运算,然后转化为10进制,然后借助于Integer再转化为16进制
tmp = Integer.toHexString(0xFF & b); tmp = new StringBuilder(Integer.toHexString(0xFF & b));
if (tmp.length() == 1) { if (tmp.length() == 1) {
tmp = "0" + tmp;//只有一位的前面补个0 tmp = tmp.insert(0, '0');//只有一位的前面补个0
} }
sb.append(tmp).append(" ");//每个字节用空格断开 sb.append(tmp).append(" ");//每个字节用空格断开
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment