diff --git a/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java b/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java index f17b2ae..9b9fb47 100644 --- a/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java +++ b/src/main/java/xyz/playedu/api/checks/AppConfigCheck.java @@ -27,11 +27,6 @@ import xyz.playedu.api.service.AppConfigService; import java.util.*; -/** - * @Author 杭州白书科技有限公司 - * - * @create 2023/3/9 13:29 - */ @Component public class AppConfigCheck implements ApplicationRunner { @@ -196,6 +191,7 @@ public class AppConfigCheck implements ApplicationRunner { setFieldType(BackendConstant.APP_CONFIG_FIELD_TYPE_TEXT); setKeyName(CConfig.MINIO_SECRET_KEY); setKeyValue(""); + setIsPrivate(1); } }, new AppConfig() { diff --git a/src/main/java/xyz/playedu/api/constant/SystemConstant.java b/src/main/java/xyz/playedu/api/constant/SystemConstant.java index fcf00b5..ddbc73c 100644 --- a/src/main/java/xyz/playedu/api/constant/SystemConstant.java +++ b/src/main/java/xyz/playedu/api/constant/SystemConstant.java @@ -30,4 +30,6 @@ public class SystemConstant { public static final String INTERNAL_IP = "127.0.0.1"; public static final String INTERNAL_IP_AREA = "内网"; + + public static final String CONFIG_MASK = "********"; } diff --git a/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java b/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java index bac6ca6..d48076f 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java @@ -19,12 +19,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import xyz.playedu.api.constant.BPermissionConstant; +import xyz.playedu.api.constant.SystemConstant; import xyz.playedu.api.domain.AppConfig; import xyz.playedu.api.middleware.BackendPermissionMiddleware; import xyz.playedu.api.request.backend.AppConfigRequest; import xyz.playedu.api.service.AppConfigService; import xyz.playedu.api.types.JsonResponse; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -42,13 +45,29 @@ public class AppConfigController { @GetMapping("") public JsonResponse index() { List configs = configService.allShow(); - return JsonResponse.data(configs); + List data = new ArrayList<>(); + for (AppConfig item : configs) { + if (item.getIsPrivate() == 1) { + item.setKeyValue(SystemConstant.CONFIG_MASK); + } + data.add(item); + } + return JsonResponse.data(data); } @BackendPermissionMiddleware(slug = BPermissionConstant.SYSTEM_CONFIG) @PutMapping("") public JsonResponse save(@RequestBody AppConfigRequest req) { - configService.saveFromMap(req.getData()); + HashMap data = new HashMap<>(); + req.getData() + .forEach( + (key, value) -> { + if (SystemConstant.CONFIG_MASK.equals(value)) { + return; + } + data.put(key, value); + }); + configService.saveFromMap(data); return JsonResponse.data(null); } }