|
@@ -54,7 +54,7 @@ public class LogService {
|
|
|
*/
|
|
|
public static void addLog(Integer aid,Integer jid,String stype,String log){
|
|
|
if(log.indexOf("求解")>=0&&log.indexOf("成功")>=0) {
|
|
|
- savelog(aid, jid, stype, "Calculating................................100%");
|
|
|
+// savelog(aid, jid, stype, "Calculating................................100%");
|
|
|
savelog(aid, jid, stype, log);
|
|
|
}else{
|
|
|
if(stype.equals("gass")){//排除其他日志
|
|
@@ -71,11 +71,7 @@ public class LogService {
|
|
|
|
|
|
}
|
|
|
}else if(log.indexOf("Calculating")>=0){
|
|
|
- try{
|
|
|
- savelog(aid, jid, stype, log);
|
|
|
- }catch (Exception e){
|
|
|
-
|
|
|
- }
|
|
|
+ savelog(aid, jid, stype, log);
|
|
|
}
|
|
|
}else{
|
|
|
savelog(aid, jid, stype, log);
|
|
@@ -113,9 +109,9 @@ public class LogService {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
|
|
|
- WebsocketEndPoint webs = (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
|
|
|
- webs.sendMessageToUser(String.valueOf(aid), log);
|
|
|
- return null;
|
|
|
+ WebsocketEndPoint webs = (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
|
|
|
+ webs.sendMessageToUser(String.valueOf(aid), log);
|
|
|
+ return null;
|
|
|
});
|
|
|
}
|
|
|
|