Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-01 9088fae65c0e433b21fd56351d0e1dc8e76debeb

 ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java

@@ -26,8 +26,8 @@
@Service
@Slf4j(topic = "uav")
public class UavService {
    public static final String USERNAME = "ardbailu";//用户名
    public static final String PASSWORD = "ardkj12345";//密码
    public static final String USERNAME = "kaifabailu";//用户名
    public static final String PASSWORD = "ardkj@2014";//密码
    public static final String SALT = "0123456789012345";//盐

    private Map uavUser;//登录的用户信息
@@ -103,13 +103,9 @@
            }
        } catch (ForestRuntimeException e) {
            log.error("无人机连接超时" + e.getMessage());
            e.printStackTrace();
        } catch (JsonMappingException e) {
            e.printStackTrace();
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }