合并getInfo接口

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -149,9 +149,9 @@ public class UserController {
      *
      * @return 用户信息
      */
-    @GetMapping("getUserInfo")
+    @GetMapping("getInfo")
     @ApiOperation("前台个人信息")
-    public AjaxResult getUserInfo(HttpServletRequest request)
+    public AjaxResult getInfo(HttpServletRequest request)
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import com.ruoyi.common.enums.AccessFromType;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.web.service.CommService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +25,8 @@ import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 登录验证
  * 
@@ -47,6 +51,12 @@ public class SysLoginController
     @Autowired
     private CommService commService;
 
+    private final ISysConfigService configService;
+
+    public SysLoginController(ISysConfigService configService) {
+        this.configService = configService;
+    }
+
     /**
      * 登录方法
      * 
@@ -69,7 +79,7 @@ public class SysLoginController
      */
     @GetMapping("getInfo")
     @ApiOperation("个人信息")
-    public AjaxResult getInfo()
+    public AjaxResult getInfo(HttpServletRequest request)
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
@@ -82,9 +92,19 @@ public class SysLoginController
             loginUser.setPermissions(permissions);
             tokenService.refreshToken(loginUser);
         }
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", user);
-        ajax.put("card", loginUser.getCard());
+        AjaxResult ajax;
+        //H5 wechat frontApp均需要菜单
+        String type = request.getHeader("type");
+        if(AccessFromType.isFrontApp(type)||AccessFromType.isH5(type)||AccessFromType.isWechat(type)){
+            ajax = AjaxResult.success(user);
+            ajax.put("card", loginUser.getCard());
+            String appConfig = configService.selectConfigByKey("app.common.config");
+            com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(appConfig);
+            ajax.put("appConfig", json);
+        } else {
+            ajax = AjaxResult.success();
+            ajax.put("user", user);
+        }
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         ajax.put("isDefaultModifyPwd", commService.initPasswordIsModify(user.getPwdUpdateDate()));