兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子Li
2024-06-19 7c82b4c370aa63c630e7b0cbbef5d2757d46089d 
 ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java


@@ -1,6 +1,7 @@


package org.dromara.web.controller;




import cn.dev33.satoken.annotation.SaIgnore;


import cn.hutool.core.codec.Base64;


import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.util.ObjectUtil;


import jakarta.servlet.http.HttpServletRequest;


@@ -23,9 +24,10 @@


import org.dromara.common.social.config.properties.SocialProperties;


import org.dromara.common.social.utils.SocialUtils;


import org.dromara.common.tenant.helper.TenantHelper;


import org.dromara.common.websocket.dto.WebSocketMessageDto;


import org.dromara.common.websocket.utils.WebSocketUtils;


import org.dromara.system.domain.SysClient;


import org.dromara.system.domain.bo.SysTenantBo;


import org.dromara.system.domain.vo.SysClientVo;


import org.dromara.system.domain.vo.SysTenantVo;


import org.dromara.system.service.ISysClientService;


import org.dromara.system.service.ISysConfigService;


@@ -41,7 +43,10 @@


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




import java.net.URL;


import java.nio.charset.StandardCharsets;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.concurrent.ScheduledExecutorService;


import java.util.concurrent.TimeUnit;




@@ -52,7 +57,6 @@


 */


@Slf4j


@SaIgnore


@Validated


@RequiredArgsConstructor


@RestController


@RequestMapping("/auth")


@@ -74,15 +78,15 @@


     * @param body 登录信息


     * @return 结果


     */


    @ApiEncrypt(response = false)


    @ApiEncrypt


    @PostMapping("/login")


    public R<LoginVo> login(@Validated @RequestBody String body) {


    public R<LoginVo> login(@RequestBody String body) {


        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);


        ValidatorUtils.validate(loginBody);


        // 授权类型和客户端id


        String clientId = loginBody.getClientId();


        String grantType = loginBody.getGrantType();


        SysClient client = clientService.queryByClientId(clientId);


        SysClientVo client = clientService.queryByClientId(clientId);


        // 查询不到 client 或 client 内不包含 grantType


        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {


            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);


@@ -97,7 +101,10 @@




        Long userId = LoginHelper.getUserId();


        scheduledExecutorService.schedule(() -> {


            WebSocketUtils.sendMessage(userId, "欢迎登录RuoYi-Vue-Plus后台管理系统");


            WebSocketMessageDto dto = new WebSocketMessageDto();


            dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");


            dto.setSessionKeys(List.of(userId));


            WebSocketUtils.publishMessage(dto);


        }, 3, TimeUnit.SECONDS);


        return R.ok(loginVo);


    }


@@ -109,13 +116,18 @@


     * @return 结果


     */


    @GetMapping("/binding/{source}")


    public R<String> authBinding(@PathVariable("source") String source) {


    public R<String> authBinding(@PathVariable("source") String source,


                                 @RequestParam String tenantId, @RequestParam String domain) {


        SocialLoginConfigProperties obj = socialProperties.getType().get(source);


        if (ObjectUtil.isNull(obj)) {


            return R.fail(source + "平台账号暂不支持");


        }


        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);


        String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());


        Map<String, String> map = new HashMap<>();


        map.put("tenantId", tenantId);


        map.put("domain", domain);


        map.put("state", AuthStateUtils.createState());


        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));


        return R.ok("操作成功", authorizeUrl);


    }




@@ -165,6 +177,7 @@


    /**


     * 用户注册


     */


    @ApiEncrypt


    @PostMapping("/register")


    public R<Void> register(@Validated @RequestBody RegisterBody user) {


        if (!configService.selectRegisterEnabled(user.getTenantId())) {