yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-20 19:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed: 系统private配置为空也返回*

Browse Source
This commit is contained in:
xxx 2023-09-05 20:16:01 +08:00
parent 657d418e7a
commit 46b0bb7555
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java
View File

@ -27,6 +27,7 @@ import xyz.playedu.common.constant.SystemConstant;
import xyz.playedu.common.domain.AppConfig; import xyz.playedu.common.domain.AppConfig;
import xyz.playedu.common.service.AppConfigService; import xyz.playedu.common.service.AppConfigService;
import xyz.playedu.common.types.JsonResponse; import xyz.playedu.common.types.JsonResponse;
import xyz.playedu.common.util.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -45,7 +46,7 @@ public class AppConfigController {
List<AppConfig> configs = configService.allShow(); List<AppConfig> configs = configService.allShow();
List<AppConfig> data = new ArrayList<>(); List<AppConfig> data = new ArrayList<>();
for (AppConfig item : configs) { for (AppConfig item : configs) {
if (item.getIsPrivate() == 1) { if (item.getIsPrivate() == 1 && StringUtil.isNotEmpty(item.getKeyValue())) {
item.setKeyValue(SystemConstant.CONFIG_MASK); item.setKeyValue(SystemConstant.CONFIG_MASK);
} }
data.add(item); data.add(item);

4
playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java
View File

@ -44,7 +44,7 @@ public class SystemController {
Map<String, String> configData = BCtx.getConfig(); Map<String, String> configData = BCtx.getConfig();
String apiUrl = configData.get(ConfigConstant.SYSTEM_API_URL); String apiUrl = configData.get(ConfigConstant.SYSTEM_API_URL);
if (apiUrl == null || apiUrl.trim().length() == 0) { if (apiUrl == null || apiUrl.trim().isEmpty()) {
apiUrl = RequestUtil.uriWithProtocol(); apiUrl = RequestUtil.uriWithProtocol();
} else { } else {
if (apiUrl.endsWith("/")) { if (apiUrl.endsWith("/")) {
@ -62,7 +62,7 @@ public class SystemController {
// 学员的默认头像 // 学员的默认头像
String memberDefaultAvatar = configData.get(ConfigConstant.MEMBER_DEFAULT_AVATAR); 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"); data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, apiUrl + "/images/default_avatar.png");
} else { } else {
data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, memberDefaultAvatar); data.put(ConfigConstant.MEMBER_DEFAULT_AVATAR, memberDefaultAvatar);