Merge remote-tracking branch 'origin/master'

Administrator

2023-08-10 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed

Merge remote-tracking branch 'origin/master'

 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

File was renamed from 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);
            }
        }
    }
}

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -591,8 +591,12 @@
    @Override
    public Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser){
        String carId = map.get("carId");
        String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
        String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
        //String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
        //String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
        String time = map.get("time");
        time = time.replace("-", "");
        String startTime = time + "000000";
        String endTime = time +"235959";
        String maxSpeed = map.get("maxSpeed");
        //31用户名密码
        String username31 = ardSyUser.getUserId();
@@ -639,8 +643,10 @@
        String[] sgnTypes = {"近光灯信号","远光灯信号","右转向灯信号","左转向灯信号","制动信号","倒档信号","雾灯信号","示廓灯","喇叭信号","空调状态",
                "空挡信号","缓速器工作","ABS 工作","加热器工作","离合器状态","保留","保留","保留","保留","保留","保留","保留","保留","保留","保留","保留",
                "保留","保留","保留","保留","保留","保留"};
        Integer sttsHex = Integer.parseInt(stts, 16);
        String sttsBin = Integer.toBinaryString(sttsHex);
        //Integer sttsHex = Integer.parseInt(stts, 16);
        Long sttsHex = Long.parseLong(stts, 16);
        //String sttsBin = Integer.toBinaryString(sttsHex);
        String sttsBin = Long.toBinaryString(sttsHex);
        if(sttsBin.length() < 32){
            while(sttsBin.length() < 32){
                sttsBin = "0" + sttsBin;

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

@@ -24,14 +24,13 @@

/**
 * 登录验证
 * 
 *
 * @author ruoyi
 */
@RestController
@Api(tags = "登录验证接口")
@Anonymous
public class SysLoginController
{
public class SysLoginController {
    @Autowired
    private SysLoginService loginService;

@@ -43,32 +42,36 @@

    /**
     * 登录方法
     * 
     *
     * @param loginBody 登录信息
     * @return 结果
     */
    @PostMapping("/login")
    @ApiOperation(value = "登录")
    public AjaxResult login(@RequestBody LoginBody loginBody)
    {
    public AjaxResult login(@RequestBody LoginBody loginBody) {
        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;
    }

    /**
     * 获取用户信息
     * 
     *
     * @return 用户信息
     */
    @GetMapping("getInfo")
    @ApiOperation(value = "获取用户信息")
    public AjaxResult getInfo()
    {
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        // 赋值融云token到用户信息
        String rongCloudToken = SecurityUtils.getLoginUser().getRongCloudToken();
        if (rongCloudToken != null) {
            user.setRongCloudToken(rongCloudToken);
        }

        // 角色集合
        Set<String> roles = permissionService.getRolePermission(user);
        // 权限集合
@@ -82,12 +85,11 @@

    /**
     * 获取路由信息
     * 
     *
     * @return 路由信息
     */
    @GetMapping("getRouters")
    public AjaxResult getRouters()
    {
    public AjaxResult getRouters() {
        String userId = SecurityUtils.getUserId();
        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
        return AjaxResult.success(menuService.buildMenus(menus));

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

@@ -27,19 +27,6 @@
     */
    private String uuid;

    /**
     * 是否APP用户
     */
    private Boolean isApp;


    public Boolean getApp() {
        return isApp;
    }

    public void setApp(Boolean app) {
        isApp = app;
    }

    public String getUsername()
    {

 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

@@ -50,6 +50,7 @@

    @Autowired
    private ISysConfigService configService;

    @Resource
    RongCloudService rongCloudService;

@@ -63,6 +64,8 @@
     * @return 结果
     */
    public String login(String username, String password, String code, String uuid) {


        boolean captchaEnabled = configService.selectCaptchaEnabled();
        // 验证码开关
        if (captchaEnabled) {
@@ -89,47 +92,10 @@
        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
        recordLoginInfo(loginUser.getUserId());

        getRongCloudToken(loginUser);
        // 生成token
        String token = tokenService.createToken(loginUser);
        //获取融云token
        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;
    }
    /**
@@ -171,15 +137,17 @@
     *
     * @param loginUser 登录用户
     */
    public void getRongCloudToken(LoginUser loginUser) {
    public String getRongCloudToken(LoginUser loginUser) {
        try {
            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);
            userService.updateUserProfile(sysUser);
            return token;
        } catch (Exception ex) {
            throw ex;
        }

 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缓存

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -13,6 +13,7 @@
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;