1.登录权限问题修改

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java

@@ -267,27 +267,21 @@ public class Micron20031Api {
      * //Output: Username, Role, MaterialType, Message, Status
      * //Output: Username, Role, MaterialType, Message, Status
      * @param username
      * @param username
      */
      */
-    public static boolean checkUserRights(String username) throws ApiException {
+    public static List<String> checkUserRights(String username) throws ApiException {
         String checkUserRightsUrl = getUrl(api_CheckUserRights);
         String checkUserRightsUrl = getUrl(api_CheckUserRights);
         Map<String, Object> dataMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("Username", username);
         dataMap.put("Username", username);
         dataMap.put("MaterialType", "SOLDER_PASTE");
         dataMap.put("MaterialType", "SOLDER_PASTE");
         log.info("调用MES接口 checkUserRights,参数:" + JsonUtil.toJsonStr(dataMap));
         log.info("调用MES接口 checkUserRights,参数:" + JsonUtil.toJsonStr(dataMap));
-        String resultStr = HttpHelper.postJson(checkUserRightsUrl, dataMap);
-
-        //如果包含userName
-        Map<String, Object> map = JsonUtil.toMap(resultStr);
-        if (map.containsKey("Username")) {
-            return true;
-        }
-
+        String resultStr = HttpHelper.postJsonWithAuth(checkUserRightsUrl, dataMap,getAuthToken());
         log.info("调用MES接口 checkUserRights 返回:" + resultStr);
         log.info("调用MES接口 checkUserRights 返回:" + resultStr);
-        String returnData = getResult(resultStr, "Username");
-        if (ObjectUtil.isNotEmpty(returnData)) {
-            return true;
-        }else{
-            throw new ValidateException("smfcore.mesApi.loginCheck.ng","NG: "+resultStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        String userName = jsonObject.getString("username");
+        if (StringUtils.isBlank(userName)) {
+            throw new ValidateException("smfcore.mesApi.loginCheck.ng", "NG: " + resultStr);
         }
         }
+        List roleList = jsonObject.getObject("role", List.class);
+        return roleList;
     }
     }
 
 
     /**
     /**

src/main/java/com/neotel/smfcore/custom/micron20031/login/api/bean/MicronUserInfo.java

@@ -71,6 +71,6 @@ public class MicronUserInfo {
 
 
     private String ver;
     private String ver;
 
 
-    private List<String> role;
+    //private List<String> role;
 }
 }
 
 

src/main/java/com/neotel/smfcore/custom/micron20031/login/controller/MicronLoginController.java

@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.micron20031.login.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.common.utils.*;
+import com.neotel.smfcore.custom.micron20031.Micron20031Api;
 import com.neotel.smfcore.custom.micron20031.login.api.MicronLoginApi;
 import com.neotel.smfcore.custom.micron20031.login.api.MicronLoginApi;
 import com.neotel.smfcore.custom.micron20031.login.api.bean.MicronUserInfo;
 import com.neotel.smfcore.custom.micron20031.login.api.bean.MicronUserInfo;
 import com.neotel.smfcore.custom.micron20031.login.config.MicronLoginConfig;
 import com.neotel.smfcore.custom.micron20031.login.config.MicronLoginConfig;
@@ -133,7 +134,7 @@ public class MicronLoginController {
                 user.setShowList(new ArrayList<>());
                 user.setShowList(new ArrayList<>());
 
 
                 //设置用户的菜单信息
                 //设置用户的菜单信息
-                List<String> roleList = userInfo.getRole();
+                List<String> roleList = Micron20031Api.checkUserRights(user.getUsername());
                 if (roleList != null && !roleList.isEmpty()) {
                 if (roleList != null && !roleList.isEmpty()) {
                     List<String> showList = new ArrayList<>();
                     List<String> showList = new ArrayList<>();
                     for (String role : roleList) {
                     for (String role : roleList) {

src/main/java/com/neotel/smfcore/security/rest/MenuController.java

@@ -116,11 +116,11 @@ public class MenuController {
             return new ResponseEntity<>(vos, HttpStatus.OK);
             return new ResponseEntity<>(vos, HttpStatus.OK);
         }
         }
 
 
-        List<Menu> menuList = menuManager.findByUserId(userId);
+       /* List<Menu> menuList = menuManager.findByUserId(userId);
         List<Menu> buildMenuList=menuManager.buildTree(menuList);
         List<Menu> buildMenuList=menuManager.buildTree(menuList);
 //        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
 //        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.buildTree(menuList));
-        List<MenuVo> vos = menuManager.buildMenus(buildMenuList,servletRequest.getLocale());
-        return new ResponseEntity<>(vos, HttpStatus.OK);
+        List<MenuVo> vos = menuManager.buildMenus(buildMenuList,servletRequest.getLocale());*/
+        return new ResponseEntity<>(new ArrayList<MenuVo>(), HttpStatus.OK);
     }
     }
 
 
     @ApiOperation("导出菜单数据")
     @ApiOperation("导出菜单数据")