修改首次用户登录获取不到融云token的bug

‘liusuyi’

2023-08-10 d954874fad36cb31a910a3bbce8bda04cb6e8be7

修改首次用户登录获取不到融云token的bug

 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java

@@ -71,10 +71,12 @@

    @PreDestroy
    public void destroyMediaMtx() {
        log.info("销毁mediaMtx");
        if (CmdUtils.isProcessRunning(processName)) {
            // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
            CmdUtils.stopProcess(processName);
        if (mediamtxEnabled) {
            log.info("销毁mediaMtx");
            if (CmdUtils.isProcessRunning(processName)) {
                // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
                CmdUtils.stopProcess(processName);
            }
        }
    }


 ard-work/src/main/java/com/ruoyi/media/service/impl/WebrtcService.java

@@ -55,10 +55,12 @@

    @PreDestroy
    public void destroyMediaMtx() {
        log.info("销毁webrtc-streamer");
        if (CmdUtils.isProcessRunning(processName)) {
            // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
            CmdUtils.stopProcess(processName);
        if (webrtcEnabled) {
            log.info("销毁webrtc-streamer");
            if (CmdUtils.isProcessRunning(processName)) {
                // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
                CmdUtils.stopProcess(processName);
            }
        }
    }
}

 ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioService.java

ÎļþÃû´Ó ard-work/src/main/java/com/ruoyi/media/service/impl/MinioService.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.media.service.impl;
package com.ruoyi.storage.minio.utils;

import com.ruoyi.utils.tools.CmdUtils;
import com.sun.jna.Platform;
@@ -61,10 +61,12 @@

    @PreDestroy
    public void destroyMediaMtx() {
        log.info("销毁minio");
        if (CmdUtils.isProcessRunning(processName)) {
            // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
            CmdUtils.stopProcess(processName);
        if (minioEnabled) {
            log.info("销毁minio");
            if (CmdUtils.isProcessRunning(processName)) {
                // è¿›ç¨‹å·²ç»åœ¨è¿è¡Œï¼Œç»“束该进程
                CmdUtils.stopProcess(processName);
            }
        }
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -54,7 +54,7 @@
        AjaxResult ajax = AjaxResult.success();
        // ç”Ÿæˆä»¤ç‰Œ
        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                loginBody.getUuid(),loginBody.getApp());
                loginBody.getUuid());
        ajax.put(Constants.TOKEN, token);
        return ajax;
    }

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -30,7 +30,10 @@
     * ç”¨æˆ·å”¯ä¸€æ ‡è¯†
     */
    private String token;

    /**
     * èžäº‘token
     */
    private String rongCloudToken;
    /**
     * ç™»å½•æ—¶é—´
     */
@@ -71,17 +74,13 @@
     */
    private SysUser user;

    /**
     *  æ˜¯å¦app用户
     */
    private Boolean isApp;

    public Boolean getIsApp() {
        return isApp;
    public String getRongCloudToken() {
        return rongCloudToken;
    }

    public void setIsApp(Boolean isApp) {
        this.isApp = isApp;
    public void setRongCloudToken(String rongCloudToken) {
        this.rongCloudToken = rongCloudToken;
    }

    public String getUserId()

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -95,43 +95,6 @@
        getRongCloudToken(loginUser);
        return token;
    }
    public String login(String username, String password, String code, String uuid,Boolean isApp) {
        boolean captchaEnabled = configService.selectCaptchaEnabled();
        // éªŒè¯ç å¼€å…³
        if (captchaEnabled) {
            validateCaptcha(username, code, uuid);
        }
        // ç”¨æˆ·éªŒè¯
        Authentication authentication = null;
        try {
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
            AuthenticationContextHolder.setContext(authenticationToken);
            // è¯¥æ–¹æ³•ä¼šåŽ»è°ƒç”¨UserDetailsServiceImpl.loadUserByUsername
            authentication = authenticationManager.authenticate(authenticationToken);
        } catch (Exception e) {
            if (e instanceof BadCredentialsException) {
                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
                throw new UserPasswordNotMatchException();
            } else {
                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
                throw new ServiceException(e.getMessage());
            }
        } finally {
            AuthenticationContextHolder.clearContext();
        }
        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
        recordLoginInfo(loginUser.getUserId());
        // ç”Ÿæˆtoken
        if(StringUtils.isNotNull(isApp))
        {
            loginUser.setIsApp(isApp);
        }
        String token = tokenService.createToken(loginUser);
        //获取融云token
        getRongCloudToken(loginUser);
        return token;
    }
    /**
     * æ ¡éªŒéªŒè¯ç 
     *
@@ -176,6 +139,7 @@
            String userId = loginUser.getUserId();
            String nickName = loginUser.getUser().getNickName();
            String token = rongCloudService.getToken(userId, nickName);
            loginUser.setRongCloudToken(token);
            SysUser sysUser = new SysUser();
            sysUser.setUserId(userId);
            sysUser.setRongCloudToken(token);

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -142,7 +142,8 @@
    public void refreshToken(LoginUser loginUser)
    {
        loginUser.setLoginTime(System.currentTimeMillis());
        if(StringUtils.isNull(loginUser.getIsApp()))
        String appUserType = loginUser.getUser().getAppUserType();
        if(StringUtils.isNull(appUserType))
        {
            loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
            // æ ¹æ®uuid将loginUser缓存