diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java index e825384..a880499 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java @@ -27,6 +27,7 @@ import xyz.playedu.common.constant.SystemConstant; import xyz.playedu.common.domain.AppConfig; import xyz.playedu.common.service.AppConfigService; import xyz.playedu.common.types.JsonResponse; +import xyz.playedu.common.util.StringUtil; import java.util.ArrayList; import java.util.HashMap; @@ -45,7 +46,7 @@ public class AppConfigController { List configs = configService.allShow(); List data = new ArrayList<>(); for (AppConfig item : configs) { - if (item.getIsPrivate() == 1) { + if (item.getIsPrivate() == 1 && StringUtil.isNotEmpty(item.getKeyValue())) { item.setKeyValue(SystemConstant.CONFIG_MASK); } data.add(item); diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java index eeaae2b..90b5efc 100644 --- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java +++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java @@ -44,7 +44,7 @@ public class SystemController { Map configData = BCtx.getConfig(); String apiUrl = configData.get(ConfigConstant.SYSTEM_API_URL); - if (apiUrl == null || apiUrl.trim().length() == 0) { + if (apiUrl == null || apiUrl.trim().isEmpty()) { apiUrl = RequestUtil.uriWithProtocol(); } else { if (apiUrl.endsWith("/")) { @@ -62,7 +62,7 @@ public class SystemController { // 学员的默认头像 String memberDefaultAvatar = configData.get(ConfigConstant.MEMBER_DEFAULT_AVATAR); - if (memberDefaultAvatar == null || memberDefaultAvatar.trim().length() == 0) { + if (memberDefaultAvatar == null || memberDefaultAvatar.trim().isEmpty()) { data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, apiUrl + "/images/default_avatar.png"); } else { data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, memberDefaultAvatar);