diff --git a/src/main/java/org/aohe/control/Operational.java b/src/main/java/org/aohe/control/Operational.java index 22d4e16..6532f84 100644 --- a/src/main/java/org/aohe/control/Operational.java +++ b/src/main/java/org/aohe/control/Operational.java @@ -79,7 +79,7 @@ public class Operational { WebCamUtils.setViewSizes(param.getInteger("width"), param.getInteger("height")); r = R.ok(); }else if("002007".equals(function)){ - //打开摄像头传输流 + //关闭摄像头传输流 WebCamUtils.closeWebcamTransfer(); } diff --git a/src/main/java/org/aohe/result/R.java b/src/main/java/org/aohe/result/R.java index 3621a17..fdf409f 100644 --- a/src/main/java/org/aohe/result/R.java +++ b/src/main/java/org/aohe/result/R.java @@ -32,6 +32,10 @@ public class R { public static R fail(String msg) { return new R<>("500", msg, null, false); } + + public static R noMean(){ + return new R<>("201", "没有找到对应的方法", null, true); + } public String toJsonStr() { return JSONUtil.toJsonStr(this); diff --git a/src/main/java/org/aohe/variable/TwainContainer.java b/src/main/java/org/aohe/variable/TwainContainer.java index 27614f8..3fe67b0 100644 --- a/src/main/java/org/aohe/variable/TwainContainer.java +++ b/src/main/java/org/aohe/variable/TwainContainer.java @@ -54,6 +54,10 @@ public abstract class TwainContainer { } private int intValue(Object obj) throws TwainException { + if(obj == null){ + return 0; + } + if (obj instanceof Number) { return ((Number) obj).intValue(); } else if (obj instanceof Boolean) { diff --git a/src/main/java/org/aohe/web/SocketServer.java b/src/main/java/org/aohe/web/SocketServer.java index c27e338..00fcabd 100644 --- a/src/main/java/org/aohe/web/SocketServer.java +++ b/src/main/java/org/aohe/web/SocketServer.java @@ -43,7 +43,7 @@ public class SocketServer extends WebSocketServer { public void onMessage(WebSocket conn, String message) { JSONObject json = SocketUtils.isNoPingMessage(message); if (json == null){ - conn.send(R.ok().toJsonStr()); + conn.send(R.noMean().toJsonStr()); }else{ conn.send(selectOperational(json)); } diff --git a/src/main/java/org/aohe/web/SocketUtils.java b/src/main/java/org/aohe/web/SocketUtils.java index bdda5b4..f0775bb 100644 --- a/src/main/java/org/aohe/web/SocketUtils.java +++ b/src/main/java/org/aohe/web/SocketUtils.java @@ -77,11 +77,16 @@ public class SocketUtils { * @return */ public static JSONObject isNoPingMessage(String message){ - JSONObject json = JSONObject.parse(message); - String type = json.getString("type"); - if("ping".equals(type)){ - return json; + try{ + JSONObject json = JSONObject.parse(message); + String type = json.getString("type"); + if("ping".equals(type)){ + return json; + } + return null; + }catch (Exception e){ + return null; } - return null; + } } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 8f31338..b3f0230 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/ScanService.%d{yyyy-MM-dd}.log 60 - 200M + 200MB ${log.pattern}