Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java

@@ -3,15 +3,20 @@
import com.sinata.common.constant.Constants;
import com.sinata.common.core.domain.AjaxResult;
import com.sinata.common.core.domain.entity.SysMenu;
import com.sinata.common.core.domain.entity.SysRole;
import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.core.domain.model.LoginBody;
import com.sinata.common.core.domain.model.LoginUser;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.framework.web.service.SysLoginService;
import com.sinata.framework.web.service.SysPermissionService;
import com.sinata.framework.web.service.TokenService;
import com.sinata.system.service.ISysMenuService;
import com.sinata.system.service.ISysRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +45,12 @@
    @Autowired
    private SysPermissionService permissionService;

    @Autowired
    private TokenService tokenService;

    @Autowired
    private ISysRoleService roleService;

    /**
     * 登录方法
     * 
@@ -52,9 +63,18 @@
    {
        AjaxResult ajax = AjaxResult.success();
        // 生成令牌
        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
        LoginUser loginUser = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                loginBody.getUuid());
        ajax.put(Constants.TOKEN, token);
        ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
        List<SysRole> roles = loginUser.getUser().getRoles();
        if (CollectionUtils.isEmpty(roles)) {
            return AjaxResult.error("请关联角色!");
        }

        List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());

        ajax.put("menus", menus);
        ajax.put("userInfo", loginUser);
        return ajax;
    }