Merge remote-tracking branch 'origin/master'

xuhy

2024-10-29 e5773b55b0d952f81dcc3dff4a372a0d40028efe

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java

@@ -4,7 +4,6 @@

package com.ruoyi.account.util.carBrand;

import okhttp3.OkHttpClient;
import org.apache.http.client.HttpClient;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -15,6 +14,7 @@
import org.openeuler.BGMProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import shade.okhttp3.OkHttpClient;

import javax.net.ssl.*;
import java.net.HttpURLConnection;