Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-15 16:44:27 +08:00
commit 0d5257c994
1 changed files with 13 additions and 5 deletions

View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.renren.common.domain.Tsingtao_xhaProperties; import io.renren.common.domain.Tsingtao_xhaProperties;
import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService; import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
@ -13,14 +14,22 @@ import org.slf4j.LoggerFactory;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
/** /**
* 青岛西海岸 * 青岛西海岸
*/ */
public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService { public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService {
private static final Integer cpuNUm = Runtime.getRuntime().availableProcessors();
private static Logger logger = LoggerFactory.getLogger(TsingtaoXHAVideoPreviewService.class); private static Logger logger = LoggerFactory.getLogger(TsingtaoXHAVideoPreviewService.class);
Tsingtao_xhaProperties tsingtao_xhaProperties; Tsingtao_xhaProperties tsingtao_xhaProperties;
private static final OkHttpClient client = new OkHttpClient().newBuilder()
.connectTimeout(1, TimeUnit.MINUTES)
.readTimeout(1, TimeUnit.MINUTES)
.connectionPool(new ConnectionPool(cpuNUm * 2, 2, TimeUnit.MINUTES))
.retryOnConnectionFailure(false)
.build();
public TsingtaoXHAVideoPreviewService(Tsingtao_xhaProperties tsingtao_xhaProperties) { public TsingtaoXHAVideoPreviewService(Tsingtao_xhaProperties tsingtao_xhaProperties) {
this.tsingtao_xhaProperties = tsingtao_xhaProperties; this.tsingtao_xhaProperties = tsingtao_xhaProperties;
@ -35,9 +44,8 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService
@Override @Override
public String getHls(String key) { public String getHls(String key) {
List<String> result = new CopyOnWriteArrayList<>(); List<String> result = new CopyOnWriteArrayList<>();
String url = String.format(tsingtao_xhaProperties.getCloudhls(), key);
OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder().url(url).build();
Request request = new Request.Builder().url(String.format(tsingtao_xhaProperties.getCloudhls(), key)).build();
try (Response response = client.newCall(request).execute()) { try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject jsonObject = JSON.parseObject(response.body().string()); JSONObject jsonObject = JSON.parseObject(response.body().string());
@ -45,10 +53,10 @@ public class TsingtaoXHAVideoPreviewService extends AbstractVideoPreviewService
result.add(jsonObject.getString("data")); result.add(jsonObject.getString("data"));
} }
} else { } else {
logger.error("西海岸预览地址获取失败"); logger.error("西海岸预览地址获取失败:{}", url);
} }
} catch (Exception exception) { } catch (Exception exception) {
logger.error("西海岸预览地址获取失败", exception); logger.error("西海岸预览地址获取失败:", url, exception);
} }
return result.stream().filter(index -> StringUtils.isNotEmpty(index)).findAny().orElse(null); return result.stream().filter(index -> StringUtils.isNotEmpty(index)).findAny().orElse(null);
} }