mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

This commit is contained in:
TinyAnts 2022-12-20 17:33:08 +08:00
parent 670ac0208c 869c444fa5
commit 919cdc243c
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingWebsiteServiceImpl.java
View File

@ -24,7 +24,7 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService {
@Override @Override
public SettingWebsiteVo detail() { public SettingWebsiteVo detail() {
Map<String, String> config = ConfigUtils.get("website"); Map<String, String> config = ConfigUtils.get("website");
System.out.println(config);
SettingWebsiteVo vo = new SettingWebsiteVo(); SettingWebsiteVo vo = new SettingWebsiteVo();
vo.setName(config.getOrDefault("name", "")); vo.setName(config.getOrDefault("name", ""));
vo.setLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("logo", ""))); vo.setLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("logo", "")));
@ -32,6 +32,11 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService {
vo.setBackdrop(UrlUtils.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); vo.setBackdrop(UrlUtils.toAbsoluteUrl(config.getOrDefault("backdrop", "")));
vo.setShopName(config.getOrDefault("shopName", "")); vo.setShopName(config.getOrDefault("shopName", ""));
vo.setShopLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("shopLogo", ""))); vo.setShopLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("shopLogo", "")));
vo.setPcLogo(UrlUtils.toAbsoluteUrl(config.getOrDefault("pcLogo", "")));
vo.setPcTitle(config.getOrDefault("pcTitle", ""));
vo.setPcIco(config.getOrDefault("pcIco", ""));
vo.setPcDesc(config.getOrDefault("pcDesc", ""));
vo.setPcKeywords(config.getOrDefault("pcKeywords", ""));
return vo; return vo;
} }
@ -49,6 +54,11 @@ public class SettingWebsiteServiceImpl implements ISettingWebsiteService {
ConfigUtils.set("website", "backdrop", UrlUtils.toRelativeUrl(websiteValidate.getBackdrop())); ConfigUtils.set("website", "backdrop", UrlUtils.toRelativeUrl(websiteValidate.getBackdrop()));
ConfigUtils.set("website", "shopName", websiteValidate.getShopName()); ConfigUtils.set("website", "shopName", websiteValidate.getShopName());
ConfigUtils.set("website", "shopLogo", UrlUtils.toRelativeUrl(websiteValidate.getShopLogo())); ConfigUtils.set("website", "shopLogo", UrlUtils.toRelativeUrl(websiteValidate.getShopLogo()));
ConfigUtils.set("website", "pcLogo", UrlUtils.toRelativeUrl(websiteValidate.getPcLogo()));
ConfigUtils.set("website", "pcTitle", websiteValidate.getShopLogo());
ConfigUtils.set("website", "pcIco", websiteValidate.getPcIco());
ConfigUtils.set("website", "pcDesc", websiteValidate.getPcDesc());
ConfigUtils.set("website", "pcKeywords", websiteValidate.getPcKeywords());
} }
} }

6
server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingWebsiteValidate.java
View File

@ -19,4 +19,10 @@ public class SettingWebsiteValidate implements Serializable {
private String shopName = ""; private String shopName = "";
private String shopLogo = ""; private String shopLogo = "";
private String pcLogo = "";
private String pcTitle = "";
private String pcIco = "";
private String pcDesc = "";
private String pcKeywords = "";
} }

6
server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingWebsiteVo.java
View File

@ -19,4 +19,10 @@ public class SettingWebsiteVo implements Serializable {
private String shopName; private String shopName;
private String shopLogo; private String shopLogo;
private String pcLogo;
private String pcTitle;
private String pcIco;
private String pcDesc;
private String pcKeywords;
} }