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

# Conflicts:
#	server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java

server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java

@@ -29,7 +29,9 @@ public class FrontConfig {
             "/api/article/detail",
             "/api/article/list",
 
-            "/api/login/getScanCode"
+            "/api/pc/getConfig",
+            "/api/login/getScanCode",
+
     };
 
 }

server/like-front/src/main/java/com/mdd/front/controller/PcController.java

@@ -0,0 +1,33 @@
+package com.mdd.front.controller;
+
+import com.mdd.common.core.AjaxResult;
+import com.mdd.front.service.IPcService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * pc端接口
+ */
+@RestController
+@RequestMapping("/api/pc")
+public class PcController {
+
+    @Resource
+    IPcService iPcService;
+
+    /**
+     * 配置
+     * @author cjh
+     * @return AjaxResult<Map<String, Object>>
+     */
+    @GetMapping("/getConfig")
+    public AjaxResult<Map<String, Object>> getConfig() {
+        Map<String, Object> config = iPcService.getConfig();
+        return AjaxResult.success(config);
+    }
+
+}

server/like-front/src/main/java/com/mdd/front/service/IPcService.java

@@ -0,0 +1,13 @@
+package com.mdd.front.service;
+
+import java.util.Map;
+
+public interface IPcService {
+
+    /**
+     * 配置
+     * @author cjh
+     * @return Map<String, Object>
+     */
+    Map<String, Object> getConfig();
+}

server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java

@@ -0,0 +1,56 @@
+package com.mdd.front.service.impl;
+
+import com.mdd.common.config.GlobalConfig;
+import com.mdd.common.util.ArrayUtils;
+import com.mdd.common.util.ConfigUtils;
+import com.mdd.common.util.UrlUtils;
+import com.mdd.front.service.IPcService;
+import org.springframework.stereotype.Service;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Service
+public class PcServiceImpI implements IPcService {
+
+
+    @Override
+    public Map<String, Object> getConfig() {
+        Map<String, Object> config = new LinkedHashMap<>();
+        // 登录配置
+        Map<String, Object> loginMap = new LinkedHashMap<>();
+        Map<String, String> loginConfig = ConfigUtils.get("login");
+        loginMap.put("loginWay", ArrayUtils.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", ArrayUtils.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ","));
+
+        // 网址信息
+        Map<String, Object> websiteMap = new LinkedHashMap<>();
+        Map<String, String> websiteConfig = ConfigUtils.get("website");
+        String copyright = websiteConfig.getOrDefault("copyright", "[]");
+        Map<String, String> copyrightMap = ArrayUtils.stringToListAsMapStr(copyright).get(0);
+
+        websiteMap.put("shopName", websiteConfig.getOrDefault("shopName", "LikeAdmin"));
+        websiteMap.put("shopLogo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", "")));
+        websiteMap.put("pcDesc", websiteConfig.getOrDefault("pcDesc", ""));
+        websiteMap.put("pcIco", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("pcIco", "")));
+        websiteMap.put("pcKeywords", websiteConfig.getOrDefault("pcKeywords", ""));
+        websiteMap.put("pcLogo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("pcLogo", "")));
+        websiteMap.put("pcTitle", websiteConfig.getOrDefault("pcTitle", ""));
+
+        //演示公众号和小程序二维码
+        Map<String,String> qrCodeMap = new LinkedHashMap<>();
+        qrCodeMap.put("mnp",UrlUtils.toAbsoluteUrl(ConfigUtils.get("mp_channel","qrCode")));
+        qrCodeMap.put("oa",UrlUtils.toAbsoluteUrl(ConfigUtils.get("oa_channel","qrCode")));
+
+        // 返回数据
+        config.put("version", GlobalConfig.version);
+        config.put("domain", UrlUtils.domain());
+        config.put("login", loginMap);
+        config.put("website", websiteMap);
+        config.put("copyright",copyrightMap);
+        config.put("qrcode",qrCodeMap);
+        return config;
+    }
+}