Merge remote-tracking branch 'origin/master'

liujie

2023-07-26 d9d3e4edf8515d250337598c7d5b155ca7afb9c9

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java

@@ -82,17 +82,7 @@
        Integer language = UserExt.getLanguage();
        List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
        List<MenuNode> titles = MenuNode.buildTitle(menus);
        if(language==1 || language==null){

        }else if(language==2){
            for (MenuNode menu : menus) {
                menu.setName(menu.getEname());
            }
        }else if(language==3){
            for (MenuNode menu : menus) {
                menu.setName(menu.getBname());
            }
        }



@@ -109,10 +99,6 @@

            model.addAttribute("tips", a);
            return "/login.html";
        }
        //设置上级ID
        if (SinataUtil.isNotEmpty(user.getObjectId())){
//            ShiroKit.getUser().setObjectId(user.getObjectId());
        }
        //设置角色
//        ShiroKit.getUser().setRoleType(user.getRoleType());
@@ -135,10 +121,10 @@
        model.addAttribute("avatar", avatar);
        model.addAttribute("userName", user.getName());
        model.addAttribute("type", 0);
        model.addAttribute("passwordHint",
                null == user.getPassWordUpdate()
                        || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
                        ? a: "");
//        model.addAttribute("passwordHint",
//                null == user.getPassWordUpdate()
//                        || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
//                        ? a: "");
        return "/index.html";
    }