merge changelog

This commit is contained in:
bwcx_jzy 2021-07-21 19:30:31 +08:00
parent 92a1fc3874
commit baf99045d3

View File

@ -1,7 +1,7 @@
package io.jpom.controller.system;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.StrSpliter;
import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.system.SystemUtil;
@ -321,7 +321,7 @@ public class NginxController extends BaseAgentController {
checkResult = CommandUtil.execSystemCommand(StrUtil.format("{} -t", name));
} else if (SystemUtil.getOsInfo().isWindows()) {
checkResult = CommandUtil.execSystemCommand("sc qc " + name);
List<String> strings = StrSpliter.splitTrim(checkResult, "\n", true);
List<String> strings = StrSplitter.splitTrim(checkResult, "\n", true);
//服务路径
File file = null;
for (String str : strings) {