From fca4c24a8e480b314a93324a50d03cffcfc511ba Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 8 Sep 2022 15:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BD=91=E7=AB=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/setting/impl/SettingWebsiteServiceImpl.java | 7 +++++++ .../java/com/mdd/front/service/impl/IndexServiceImpl.java | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java index ed03e3d0..199b4dc8 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingWebsiteServiceImpl.java @@ -29,6 +29,10 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService { map.put("logo", UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", ""))); map.put("favicon", UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", ""))); map.put("backdrop", UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); + + map.put("shopName", config.getOrDefault("shopName", "")); + map.put("shopLogo", UrlUtil.toAbsoluteUrl(config.getOrDefault("shopLogo", ""))); + return map; } @@ -44,6 +48,9 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService { ConfigUtil.set("website", "logo", UrlUtil.toRelativeUrl(params.getOrDefault("logo", ""))); ConfigUtil.set("website", "favicon", UrlUtil.toRelativeUrl(params.getOrDefault("favicon", ""))); ConfigUtil.set("website", "backdrop", UrlUtil.toRelativeUrl(params.getOrDefault("backdrop", ""))); + + ConfigUtil.set("website", "shopName", params.getOrDefault("shopName", "")); + ConfigUtil.set("website", "shopLogo", UrlUtil.toRelativeUrl(params.getOrDefault("shopLogo", ""))); } } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index 4310299d..d1a79a56 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -136,9 +136,8 @@ public class IndexServiceImpl implements IIndexService { // 网址信息 Map websiteMap = new LinkedHashMap<>(); Map websiteConfig = ConfigUtil.get("website"); - websiteMap.put("name", websiteConfig.getOrDefault("name", "LikeAdmin")); - websiteMap.put("logo", UrlUtil.toAbsoluteUrl(websiteConfig.getOrDefault("logo", ""))); - websiteMap.put("favicon", UrlUtil.toAbsoluteUrl(websiteConfig.getOrDefault("favicon", ""))); + websiteMap.put("name", websiteConfig.getOrDefault("shopName", "LikeAdmin")); + websiteMap.put("logo", UrlUtil.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", ""))); // 响应数据 response.put("domain", UrlUtil.domain());