From 68ffc0ec3041576aacb9e67fc493c8c5239b7bb4 Mon Sep 17 00:00:00 2001 From: Wang Chen Chen <932560435@qq.com> Date: Thu, 28 Dec 2023 16:09:49 +0800 Subject: [PATCH] =?UTF-8?q?1.ConfigNameConst=E4=BD=BF=E7=94=A8KeyValue?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3=E3=80=82=E6=B7=BB=E5=8A=A0=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xaaef/molly/common/consts/ConfigNameConst.java | 14 ++++++++------ .../corems/api/impl/ApiCmsProjectServiceImpl.java | 4 ++-- .../corems/service/impl/CmsProjectServiceImpl.java | 4 ++-- .../perms/api/impl/ApiPmsUserServiceImpl.java | 4 ++-- .../perms/service/impl/PmsUserServiceImpl.java | 4 ++-- .../com/xaaef/molly/MollyApplicationTests.java | 2 +- .../test/java/com/xaaef/molly/NoSpringTests.java | 8 ++++---- .../system/service/impl/SysTenantServiceImpl.java | 12 ++++++------ 8 files changed, 27 insertions(+), 25 deletions(-) diff --git a/server/common/src/main/java/com/xaaef/molly/common/consts/ConfigNameConst.java b/server/common/src/main/java/com/xaaef/molly/common/consts/ConfigNameConst.java index a29039c..c91fa7a 100644 --- a/server/common/src/main/java/com/xaaef/molly/common/consts/ConfigNameConst.java +++ b/server/common/src/main/java/com/xaaef/molly/common/consts/ConfigNameConst.java @@ -1,5 +1,8 @@ package com.xaaef.molly.common.consts; +import org.apache.commons.collections4.KeyValue; +import org.apache.commons.collections4.keyvalue.DefaultKeyValue; + /** *

* 全局配置文件 key @@ -21,32 +24,31 @@ public class ConfigNameConst { /** * 用户默认密码 */ - public static final String USER_DEFAULT_PASSWORD = "default_user_password"; + public static final KeyValue USER_DEFAULT_PASSWORD = new DefaultKeyValue<>("default_user_password", "1234546"); /** * 项目默认密码 */ - public static final String PROJECT_DEFAULT_PASSWORD = "default_project_password"; + public static final KeyValue PROJECT_DEFAULT_PASSWORD = new DefaultKeyValue<>("default_project_password", "1234546"); /** * 租户默认logo */ - public static final String TENANT_DEFAULT_LOGO = "default_tenant_logo"; + public static final KeyValue TENANT_DEFAULT_LOGO = new DefaultKeyValue<>("default_tenant_logo", "https://images.xaaef.com/molly_master_logo.png"); /** * 租户默认角色名称 */ - public static final String TENANT_DEFAULT_ROLE_NAME = "default_role_name"; + public static final KeyValue TENANT_DEFAULT_ROLE_NAME = new DefaultKeyValue<>("default_role_name", "操作员"); /** * 获取法定节假日的接口 */ - public static final String GET_HOLIDAY_URL = "get_holiday_url"; - + public static final KeyValue GET_HOLIDAY_URL = new DefaultKeyValue<>("get_holiday_url", "https://timor.tech/api/holiday/year/%s?type=N&week=Y"); } diff --git a/server/molly-cms/src/main/java/com/xaaef/molly/corems/api/impl/ApiCmsProjectServiceImpl.java b/server/molly-cms/src/main/java/com/xaaef/molly/corems/api/impl/ApiCmsProjectServiceImpl.java index 51f33a4..7a5df8a 100644 --- a/server/molly-cms/src/main/java/com/xaaef/molly/corems/api/impl/ApiCmsProjectServiceImpl.java +++ b/server/molly-cms/src/main/java/com/xaaef/molly/corems/api/impl/ApiCmsProjectServiceImpl.java @@ -79,8 +79,8 @@ public class ApiCmsProjectServiceImpl implements ApiCmsProjectService { @Transactional(rollbackFor = Exception.class) @Override public void initProject(SysTenantDTO po) { - var password = Optional.ofNullable(configService.getValueByKey(PROJECT_DEFAULT_PASSWORD)) - .orElse("123456"); + var password = Optional.ofNullable(configService.getValueByKey(PROJECT_DEFAULT_PASSWORD.getKey())) + .orElse(PROJECT_DEFAULT_PASSWORD.getValue()); // 委托，新的租户id。执行初始化数据 delegate(po.getTenantId(), () -> { var project = new CmsProject() diff --git a/server/molly-cms/src/main/java/com/xaaef/molly/corems/service/impl/CmsProjectServiceImpl.java b/server/molly-cms/src/main/java/com/xaaef/molly/corems/service/impl/CmsProjectServiceImpl.java index 8b10533..085698c 100644 --- a/server/molly-cms/src/main/java/com/xaaef/molly/corems/service/impl/CmsProjectServiceImpl.java +++ b/server/molly-cms/src/main/java/com/xaaef/molly/corems/service/impl/CmsProjectServiceImpl.java @@ -94,8 +94,8 @@ public class CmsProjectServiceImpl extends BaseServiceImpl { diff --git a/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java b/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java index 95a4ad6..e9466cd 100644 --- a/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java +++ b/server/molly-pms/src/main/java/com/xaaef/molly/perms/service/impl/PmsUserServiceImpl.java @@ -137,8 +137,8 @@ public class PmsUserServiceImpl extends BaseServiceImpl } // 如果用户密码为空 if (StringUtils.isBlank(entity.getPassword())) { - var userDefaultPassword = Optional.ofNullable(configService.getValueByKey(USER_DEFAULT_PASSWORD)) - .orElse("123456"); + var userDefaultPassword = Optional.ofNullable(configService.getValueByKey(USER_DEFAULT_PASSWORD.getKey())) + .orElse(USER_DEFAULT_PASSWORD.getValue()); entity.setPassword(userDefaultPassword); } diff --git a/server/molly-service/src/test/java/com/xaaef/molly/MollyApplicationTests.java b/server/molly-service/src/test/java/com/xaaef/molly/MollyApplicationTests.java index 8ec480f..2eb95dc 100644 --- a/server/molly-service/src/test/java/com/xaaef/molly/MollyApplicationTests.java +++ b/server/molly-service/src/test/java/com/xaaef/molly/MollyApplicationTests.java @@ -107,7 +107,7 @@ public class MollyApplicationTests { @Test public void test2() throws Exception { TenantUtils.setTenantId("master"); - var valueByKey = configService.getValueByKey(ConfigNameConst.USER_DEFAULT_PASSWORD); + var valueByKey = configService.getValueByKey(ConfigNameConst.USER_DEFAULT_PASSWORD.getKey()); System.out.println(valueByKey); } diff --git a/server/molly-service/src/test/java/com/xaaef/molly/NoSpringTests.java b/server/molly-service/src/test/java/com/xaaef/molly/NoSpringTests.java index 37a66e3..702ab16 100644 --- a/server/molly-service/src/test/java/com/xaaef/molly/NoSpringTests.java +++ b/server/molly-service/src/test/java/com/xaaef/molly/NoSpringTests.java @@ -223,10 +223,10 @@ public class NoSpringTests { FORCED_OFFLINE_KEY, TenantUtils.X_TENANT_ID, ConfigNameConst.REDIS_CACHE_KEY, - ConfigNameConst.USER_DEFAULT_PASSWORD, - ConfigNameConst.TENANT_DEFAULT_LOGO, - ConfigNameConst.TENANT_DEFAULT_ROLE_NAME, - ConfigNameConst.GET_HOLIDAY_URL + ConfigNameConst.USER_DEFAULT_PASSWORD.getKey(), + ConfigNameConst.TENANT_DEFAULT_LOGO.getKey(), + ConfigNameConst.TENANT_DEFAULT_ROLE_NAME.getKey(), + ConfigNameConst.GET_HOLIDAY_URL.getKey() ); var str = "waeq" + IdUtil.nanoId(); boolean b1 = ignoreContainsKeys.stream().noneMatch(s -> StrUtil.contains(str, s)); diff --git a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java index 8e4fae6..bfdac0f 100644 --- a/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java +++ b/server/molly-sys/src/main/java/com/xaaef/molly/system/service/impl/SysTenantServiceImpl.java @@ -197,8 +197,8 @@ public class SysTenantServiceImpl extends BaseServiceImpl