Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

昨天 1724f77c35022b643c28dd3e5547679a5edc2d49

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java

@@ -33,8 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;

@@ -80,6 +80,7 @@
                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
        userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, user.getTenantId(), null, request);
        Tenant tenant = tenantService.getById(user.getTenantId());
        user = userService.fillRoleIdsForResponse(user);
        return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
    }

@@ -251,3 +252,4 @@
    }

}