Merge remote-tracking branch 'origin/master'

k94314517

2024-10-16 29152ca8fbdd2cce99c7c8739bf5ae590ea2837e

 server/system_service/src/main/java/com/doumee/api/system/SystemController.java

@@ -16,9 +16,10 @@
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

import org.springframework.web.bind.annotation.*;

/**
 * @author Eva.Caesar Liu
@@ -41,6 +42,7 @@
    @ApiOperation("登录")
    @PostMapping("/login")
    public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
        dto.setCheckCode(true);
        return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
    }

@@ -56,7 +58,7 @@
    @ApiOperation("修改当前用户密码")
    @PostMapping("/updatePwd")
    public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
        dto.setUserId(this.getLoginUser().getId());
        dto.setUserId(this.getLoginUser(null).getId());
        systemUserBiz.updatePwd(dto);
        return ApiResponse.success(null);
    }
@@ -64,6 +66,6 @@
    @ApiOperation("获取当前登录的用户信息")
    @GetMapping("/getUserInfo")
    public ApiResponse<LoginUserInfo> getUserInfo () {
        return ApiResponse.success(this.getLoginUser());
        return ApiResponse.success(this.getLoginUser(null));
    }
}