Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	web_src/config/index.js
This commit is contained in:
648540858
2023-07-02 12:42:05 +08:00
7 changed files with 59 additions and 16 deletions

View File

@@ -195,10 +195,10 @@ public class ZLMRESTfulUtils {
} else {
logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message()));
}
Objects.requireNonNull(response.body()).close();
} else {
logger.error(String.format("[ %s ]请求失败: %s %s", url, response.code(), response.message()));
}
Objects.requireNonNull(response.body()).close();
} catch (ConnectException e) {
logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage()));
logger.info("请检查media配置并确认ZLM已启动...");