diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index c779cde5..7ea62c8b 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -6,6 +6,7 @@ import com.mdd.front.service.IUserService; import com.mdd.front.vo.user.UserCenterVo; import com.mdd.front.vo.user.UserInfoVo; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -43,13 +44,24 @@ public class UserController { } /** - * 政策协议 + * 绑定手机号 * * @author fzr * @return Object */ - @GetMapping("/agreement") - public Object agreement() { + @PostMapping("/bindMobile") + public Object bindMobile() { + return AjaxResult.success(); + } + + /** + * 微信手机号 + * + * @author fzr + * @return Object + */ + @PostMapping("/mnpMobile") + public Object mnpMobile() { return AjaxResult.success(); } 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 6e4e4f65..a73b9025 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 @@ -8,6 +8,7 @@ import com.mdd.common.entity.setting.HotSearch; import com.mdd.common.mapper.decorate.DecoratePageMapper; import com.mdd.common.mapper.decorate.DecorateTabbarMapper; import com.mdd.common.mapper.setting.HotSearchMapper; +import com.mdd.common.utils.ArrayUtil; import com.mdd.common.utils.ConfigUtil; import com.mdd.common.utils.ToolsUtil; import com.mdd.common.utils.UrlUtil; @@ -84,6 +85,7 @@ public class IndexServiceImpl implements IIndexService { public Map config() { Map response = new LinkedHashMap<>(); + // 底部导航 List> tabs = new LinkedList<>(); List decorateTabbars = decorateTabbarMapper.selectList(new QueryWrapper().orderByAsc("id")); for (DecorateTabbar tab: decorateTabbars) { @@ -95,10 +97,31 @@ public class IndexServiceImpl implements IIndexService { tabs.add(map); } + // 导航颜色 String tabbarStyle = ConfigUtil.get("tabbar", "style", "{}"); + + // 登录配置 + Map loginMap = new LinkedHashMap<>(); + Map loginConfig = ConfigUtil.get("login"); + loginMap.put("loginWay", ArrayUtil.stringToListAsInt(loginConfig.getOrDefault("loginWay", ""), ",")); + loginMap.put("forceBindMobile", Integer.parseInt(loginConfig.getOrDefault("forceBindMobile", "0"))); + loginMap.put("openAgreement", Integer.parseInt(loginConfig.getOrDefault("openAgreement", "0"))); + loginMap.put("openOtherAuth", Integer.parseInt(loginConfig.getOrDefault("openOtherAuth", "0"))); + loginMap.put("autoLoginAuth", ArrayUtil.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ",")); + + // 网址信息 + 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", ""))); + + // 响应数据 response.put("domain", UrlUtil.domain()); response.put("style", ToolsUtil.jsonToMap(tabbarStyle)); response.put("tabbar", tabs); + response.put("login", loginMap); + response.put("website", websiteMap); return response; }