changes

liuhaonan

2022-11-22 ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/NewNovaProgramService.java

@@ -154,8 +154,8 @@
                    throw new BusinessException("不能操作不属于你的节目");
                }
            }
            File file = new File(filePathConfig.getOutPutPath() + "/program" + newNovaProgram.getPid());
            deleteFile(file);
//            File file = new File(filePathConfig.getOutPutPath() + "/program" + newNovaProgram.getPid());
//            deleteFile(file);
        });
        return removeByIds(pids);
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java

@@ -822,6 +822,7 @@
                            System.out.println("\nViplexCore 重启 data:" + data);
                            if (code == 0) {
                                newNova.setStatus(true);
                                loginSn.remove(newNova.getSn());
                            }
                            countDownLatch.countDown();
                        }
@@ -837,7 +838,6 @@
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }

        return param.getNovaList();
    }

@@ -871,7 +871,7 @@
                    "        \"action\":4,\n" +
                    "        \"data\":{\n" +
                    "          \"enable\":" + param.isNtp() + ",\n" +
                    "          \"server\":\"ntp1.aliyun.com\"\n" +
                    "          \"server\":\"http://ntp1.aliyun.com\"\n" +
                    "        }\n" +
                    "      }\n" +
                    "    ]\n" +
@@ -896,7 +896,7 @@
            });
        });
        try {
            countDownLatch.await(20000, TimeUnit.MILLISECONDS);
            countDownLatch.await(30000, TimeUnit.MILLISECONDS);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }