增加app-config配置返回个人信息中

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

@@ -6,12 +6,14 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.AccessFromType;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.dz.domain.DzControl;
 import com.ruoyi.dz.service.IDzControlService;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.web.service.CommService;
 import com.ruoyi.web.service.SysLoginService;
 import io.swagger.annotations.Api;
@@ -21,6 +23,7 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -34,13 +37,15 @@ public class UserController {
     private final SysPermissionService permissionService;
     private final TokenService tokenService;
     private final CommService commService;
+    private final ISysConfigService configService;
 
-    public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService) {
+    public UserController(IDzControlService dzControlService, SysLoginService loginService, SysPermissionService permissionService, TokenService tokenService, CommService commService, ISysConfigService configService) {
         this.dzControlService = dzControlService;
         this.loginService = loginService;
         this.permissionService = permissionService;
         this.tokenService = tokenService;
         this.commService = commService;
+        this.configService = configService;
     }
 
     @GetMapping(value = "provinces")
@@ -146,7 +151,7 @@ public class UserController {
      */
     @GetMapping("getUserInfo")
     @ApiOperation("前台个人信息")
-    public AjaxResult getUserInfo()
+    public AjaxResult getUserInfo(HttpServletRequest request)
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
@@ -165,6 +170,15 @@ public class UserController {
         ajax.put("permissions", permissions);
         ajax.put("isDefaultModifyPwd", commService.initPasswordIsModify(user.getPwdUpdateDate()));
         ajax.put("isPasswordExpired", commService.passwordIsExpiration(user.getPwdUpdateDate()));
+
+        //获取app的配置文件
+        String type = request.getHeader("type");
+        //H5 wechat frontApp均需要菜单
+        if(AccessFromType.isFrontApp(type)||AccessFromType.isH5(type)||AccessFromType.isWechat(type)){
+            String appConfig = configService.selectConfigByKey("app.common.config");
+            com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(appConfig);
+            ajax.put("appConfig", json);
+        }
         return ajax;
     }
 }