From 58b16f5371262dfc63f856bbcd06a893556037f0 Mon Sep 17 00:00:00 2001 From: wuzongchen Date: Mon, 5 Dec 2022 00:15:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:nginxDir=E7=A9=BA=E6=8C=87=E9=92=88=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B:nginx=20-c=20/home/nginxWebUI/nginx.confnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/service/SettingService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cym/service/SettingService.java b/src/main/java/com/cym/service/SettingService.java index 518fc9ed..b9c105bf 100644 --- a/src/main/java/com/cym/service/SettingService.java +++ b/src/main/java/com/cym/service/SettingService.java @@ -1,5 +1,6 @@ package com.cym.service; +import cn.hutool.core.util.StrUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -28,7 +29,7 @@ public class SettingService { Setting setting = sqlHelper.findOneByQuery(new ConditionAndWrapper().eq("key", key), Setting.class); if (setting == null) { - return null; + return StrUtil.EMPTY; } else { return setting.getValue(); } -- Gitee From b963696c9266aaccf755228b53ffe28ed7253f84 Mon Sep 17 00:00:00 2001 From: wuzongchen Date: Mon, 5 Dec 2022 00:16:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"fix:nginxDir=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=20=E7=A4=BA=E4=BE=8B:nginx=20-c=20/home/nginxWebUI/ng?= =?UTF-8?q?inx.confnull"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 58b16f5371262dfc63f856bbcd06a893556037f0. --- src/main/java/com/cym/service/SettingService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/cym/service/SettingService.java b/src/main/java/com/cym/service/SettingService.java index b9c105bf..518fc9ed 100644 --- a/src/main/java/com/cym/service/SettingService.java +++ b/src/main/java/com/cym/service/SettingService.java @@ -1,6 +1,5 @@ package com.cym.service; -import cn.hutool.core.util.StrUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -29,7 +28,7 @@ public class SettingService { Setting setting = sqlHelper.findOneByQuery(new ConditionAndWrapper().eq("key", key), Setting.class); if (setting == null) { - return StrUtil.EMPTY; + return null; } else { return setting.getValue(); } -- Gitee From 880f516f88fc5ebcf1c7246a398864f4581f4e75 Mon Sep 17 00:00:00 2001 From: wuzongchen Date: Mon, 5 Dec 2022 00:19:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:nginxDir=E7=A9=BA=E6=8C=87=E9=92=88=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B:nginx=20-c=20/home/nginxWebUI/nginx.confnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/service/SettingService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cym/service/SettingService.java b/src/main/java/com/cym/service/SettingService.java index 518fc9ed..06b663ad 100644 --- a/src/main/java/com/cym/service/SettingService.java +++ b/src/main/java/com/cym/service/SettingService.java @@ -1,5 +1,6 @@ package com.cym.service; +import cn.hutool.core.util.StrUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -30,7 +31,7 @@ public class SettingService { if (setting == null) { return null; } else { - return setting.getValue(); + return StrUtil.nullToEmpty(setting.getValue()); } } -- Gitee From fb06674525ae136a2daf1a264adb062fa02065ed Mon Sep 17 00:00:00 2001 From: wuzongchen Date: Mon, 5 Dec 2022 01:01:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:nginxDir=E7=A9=BA=E6=8C=87=E9=92=88=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B:nginx=20-c=20/home/nginxWebUI/nginx.confnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cym/controller/api/NginxApiController.java | 10 +++++----- src/main/java/com/cym/service/SettingService.java | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cym/controller/api/NginxApiController.java b/src/main/java/com/cym/controller/api/NginxApiController.java index 7b0b7695..d70e470f 100644 --- a/src/main/java/com/cym/controller/api/NginxApiController.java +++ b/src/main/java/com/cym/controller/api/NginxApiController.java @@ -90,9 +90,9 @@ public class NginxApiController extends BaseController { */ @Mapping("getNginxStartCmd") public JsonResult> getNginxStartCmd() { - String nginxExe = settingService.get("nginxExe"); - String nginxPath = settingService.get("nginxPath"); - String nginxDir = settingService.get("nginxDir"); + String nginxExe = StrUtil.nullToEmpty(settingService.get("nginxExe")); + String nginxPath = StrUtil.nullToEmpty(settingService.get("nginxPath")); + String nginxDir = StrUtil.nullToEmpty(settingService.get("nginxDir")); if (StrUtil.isNotEmpty(nginxDir)) { nginxDir = " -p " + nginxDir; @@ -112,8 +112,8 @@ public class NginxApiController extends BaseController { */ @Mapping("getNginxStopCmd") public JsonResult> getNginxStopCmd() { - String nginxExe = settingService.get("nginxExe"); - String nginxDir = settingService.get("nginxDir"); + String nginxExe = StrUtil.nullToEmpty(settingService.get("nginxExe")); + String nginxDir = StrUtil.nullToEmpty(settingService.get("nginxDir")); if (StrUtil.isNotEmpty(nginxDir)) { nginxDir = " -p " + nginxDir; diff --git a/src/main/java/com/cym/service/SettingService.java b/src/main/java/com/cym/service/SettingService.java index 06b663ad..518fc9ed 100644 --- a/src/main/java/com/cym/service/SettingService.java +++ b/src/main/java/com/cym/service/SettingService.java @@ -1,6 +1,5 @@ package com.cym.service; -import cn.hutool.core.util.StrUtil; import org.noear.solon.annotation.Inject; import org.noear.solon.aspect.annotation.Service; @@ -31,7 +30,7 @@ public class SettingService { if (setting == null) { return null; } else { - return StrUtil.nullToEmpty(setting.getValue()); + return setting.getValue(); } } -- Gitee