diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index 62a15dff..e39cc0f5 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -16,7 +16,8 @@ public class AdminConfig { // 免登录验证 public static String[] notLoginUri = new String[]{ - "/api/system/login" + "/api/system/login", + "/api/index/config", }; // 免权限验证 diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java index 5ee9f711..564565a8 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java @@ -33,4 +33,16 @@ public class IndexController { return AjaxResult.success(map); } + /** + * 公共配置 + * + * @author fzr + * @return Object + */ + @GetMapping("/config") + public Object config() { + Map map = iIndexService.config(); + return AjaxResult.success(map); + } + } diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java index 03a4705e..eebf56db 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java @@ -15,4 +15,9 @@ public interface IIndexService { */ Map console(); + /** + * 公共配置 + */ + Map config(); + } diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java index d8102911..7ce3b126 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java @@ -27,6 +27,7 @@ public class BasicsServiceImpl implements IBasicsService { Map map = new LinkedHashMap<>(); map.put("name", config.getOrDefault("name", "")); map.put("logo", UrlUtil.toAbsoluteUrl(config.getOrDefault("logo", ""))); + map.put("favicon", UrlUtil.toAbsoluteUrl(config.getOrDefault("favicon", ""))); map.put("backdrop", UrlUtil.toAbsoluteUrl(config.getOrDefault("backdrop", ""))); return map; } @@ -43,10 +44,10 @@ public class BasicsServiceImpl implements IBasicsService { Map map = new LinkedHashMap<>(); map.put("privilege", config.getOrDefault("privilege", "")); - map.put("icp_number", UrlUtil.toAbsoluteUrl(config.getOrDefault("icp_number", ""))); - map.put("icp_link", UrlUtil.toAbsoluteUrl(config.getOrDefault("icp_link", ""))); - map.put("ga_number", UrlUtil.toAbsoluteUrl(config.getOrDefault("ga_number", ""))); - map.put("ga_link", UrlUtil.toAbsoluteUrl(config.getOrDefault("ga_link", ""))); + map.put("icp_number", UrlUtil.toAbsoluteUrl(config.getOrDefault("icpNumber", ""))); + map.put("icp_link", UrlUtil.toAbsoluteUrl(config.getOrDefault("icpLink", ""))); + map.put("ga_number", UrlUtil.toAbsoluteUrl(config.getOrDefault("gaNumber", ""))); + map.put("ga_link", UrlUtil.toAbsoluteUrl(config.getOrDefault("gaLink", ""))); return map; } @@ -60,6 +61,7 @@ public class BasicsServiceImpl implements IBasicsService { public void setWebsite(Map params) { ConfigUtil.set("website", "name", params.getOrDefault("name", "")); 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", ""))); } @@ -72,10 +74,10 @@ public class BasicsServiceImpl implements IBasicsService { @Override public void setCopyright(Map params) { ConfigUtil.set("copyright", "privilege", params.getOrDefault("privilege", "")); - ConfigUtil.set("copyright", "icp_number", params.getOrDefault("icp_number", "")); - ConfigUtil.set("copyright", "icp_link", params.getOrDefault("icp_link", "")); - ConfigUtil.set("copyright", "ga_number", params.getOrDefault("ga_number", "")); - ConfigUtil.set("copyright", "ga_link", params.getOrDefault("ga_link", "")); + ConfigUtil.set("copyright", "icpNumber", params.getOrDefault("icpNumber", "")); + ConfigUtil.set("copyright", "icpLink", params.getOrDefault("icpLink", "")); + ConfigUtil.set("copyright", "gaNumber", params.getOrDefault("gaNumber", "")); + ConfigUtil.set("copyright", "gaLink", params.getOrDefault("gaLink", "")); } } diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java index efa99885..df61873e 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hxkj.admin.service.IIndexService; import com.hxkj.common.entity.Article; import com.hxkj.common.mapper.ArticleMapper; +import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -62,4 +64,32 @@ public class IndexServiceImpl implements IIndexService { return console; } + /** + * 公共配置 + * + * @author fzr + * @return Map + */ + @Override + public Map config() { + Map website = ConfigUtil.get("website"); + Map copyright = ConfigUtil.get("copyright"); + + Map map = new LinkedHashMap<>(); + map.put("lawPrivilege", copyright.getOrDefault("privilege", "")); + map.put("lawIcpNumber", copyright.getOrDefault("icpNumber", "")); + map.put("lawIcpLink", copyright.getOrDefault("icpLink", "")); + map.put("lawGaNumber", copyright.getOrDefault("gaNumber", "")); + map.put("lawGaLink", copyright.getOrDefault("gaLink", "")); + + map.put("webName", website.getOrDefault("name", "")); + map.put("webLogo", UrlUtil.toAbsoluteUrl(website.getOrDefault("logo", ""))); + map.put("webFavicon", UrlUtil.toAbsoluteUrl(website.getOrDefault("favicon", ""))); + map.put("webBackdrop", UrlUtil.toAbsoluteUrl(website.getOrDefault("backdrop", ""))); + + map.put("ossDomain", UrlUtil.domain()); + + return map; + } + } diff --git a/like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java index 86eb43b2..d62df634 100644 --- a/like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java +++ b/like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java @@ -60,4 +60,20 @@ public class UrlUtil { return url.replace(config.get("domain") + "/" + uploadPrefix + "/", ""); } + /** + * 获取存储域名 + * + * @author fzr + * @return String + */ + public static String domain() { + String engine = ConfigUtil.get("storage", "default", "local"); + if (engine.equals("local")) { + return HttpUtil.domain() + "/"; + } + + Map config = ConfigUtil.getMap("storage", engine); + return config.get("domain") + "/"; + } + }