diff --git a/modules/common/src/main/resources/lib/core-1.0.0.jar b/modules/common/src/main/resources/lib/core-1.0.0.jar new file mode 100644 index 0000000..1b0adc4 Binary files /dev/null and b/modules/common/src/main/resources/lib/core-1.0.0.jar differ diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java index d4b381a..307609d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/InitService.java +++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java @@ -110,6 +110,7 @@ public class InitService implements ApplicationRunner { ksecNettyClient.createClient(ksec); }catch (Exception e){ log.error("kesc connect error,url:{},port:{}",ksec.getIp(),ksec.getPort()); + ksecNettyClient.reconnect(1); } }else { log.error("ksec no config"); diff --git a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java index 4f46a5d..5688618 100644 --- a/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java +++ b/web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java @@ -88,29 +88,32 @@ public class SickSocket { private static String read(InputStream inStream,String ip) throws IOException { BufferedReader bd = new BufferedReader(new InputStreamReader(inStream)); - StringBuilder stringBuilder = new StringBuilder(); - FutureTask future = new FutureTask <>(()->{ - StringBuilder bdString = new StringBuilder(); + StringBuffer stringBuilder = new StringBuffer(); + FutureTask future = new FutureTask <>(()->{ while (true) { try { - bdString.append((char) bd.read()); + stringBuilder.append((char) bd.read()); } catch (IOException exc) { throw new RuntimeException(exc); } - if (bdString.toString().contains("\\n") || bdString.toString().contains("\n")) { + if (stringBuilder.toString().contains("\\n") || stringBuilder.toString().contains("\n")) { break; } } - return bdString; + return stringBuilder; }); try { new Thread(future).start(); - stringBuilder = future.get(1000, TimeUnit.MILLISECONDS); + future.get(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - tcpLogger.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e); - log.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e); - throw new RuntimeException(e); + if("".equals(stringBuilder.toString())){ + tcpLogger.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e); + log.error("sick 可以连接但发送返回存在问题,ip:{},info:{}", ip, e); + throw new RuntimeException(e); + }else { + return stringBuilder.toString(); + } } return stringBuilder.toString(); }