wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-28 20:06:48 +08:00
parent e1a16425b0 baab5ac0b3
commit e0d48f1f3d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -544,14 +544,14 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Long> result_ = new CopyOnWriteArrayList<>();
CompletableFuture cloud =
CompletableFuture.runAsync(() -> { // 云脑专网
String url = String.format(tsingtao_xhaProperties.getCloudcam(), "", 1, 10);
String url = tsingtao_xhaProperties.getCloudcam();
logger.info(url);
Request request = new Request.Builder().url(url).build();
try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) {
JSONObject jsonObject = JSON.parseObject(response.body().string());
if (jsonObject.containsKey("data")) {
result_.add(jsonObject.getJSONObject("data").getLongValue("total"));
if (jsonObject.containsKey("errorNo") && jsonObject.getLongValue("errorNo") == 200) {
result_.add(jsonObject.getLongValue("body"));
}
} else {
logger.error("青岛西海岸获取失败");
@ -562,14 +562,17 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}, executor);
CompletableFuture local =
CompletableFuture.runAsync(() -> { // 金宏网
String url = String.format(tsingtao_xhaProperties.getLocalcam(), "", 1, 10);
String url = tsingtao_xhaProperties.getLocalcam();
logger.info(url);
Request request = new Request.Builder().url(url).build();
try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) {
JSONObject jsonObject = JSON.parseObject(response.body().string());
if (jsonObject.containsKey("data")) {
result_.add(jsonObject.getJSONObject("data").getLongValue("total"));
//if (jsonObject.containsKey("data")) {
// result_.add(jsonObject.getJSONObject("data").getLongValue("total"));
//}
if (jsonObject.containsKey("errorNo") && jsonObject.getLongValue("errorNo") == 200) {
result_.add(jsonObject.getLongValue("body"));
}
} else {
logger.error("青岛西海岸获取失败");

4
renren-admin/src/main/resources/domain/tsingtao-xha.properties
View File

@ -1,7 +1,7 @@
tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.cloudcam=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraListByName?name=%s&pageNo=%d&pageSize=%d
tsingtao-xha.localcam=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=%s&pageNo=%d&pageSize=%d
tsingtao-xha.cloudcam=http://10.10.30.9:8001/data_service/getCamera/getCameraCount
tsingtao-xha.localcam=http://10.134.135.9:8001/data_service/getCamera/getCameraCount
tsingtao-xha.resourcecount=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=&type=&orderField=requestNum&orderType=desc&pageNum=1&pageSize=10&serviceType=data&rq=1655106309671.43
tsingtao-xha.resourceapplyinfo=http://10.10.30.24:30058/share-portal/platform/index/abilityMarket/count
tsingtao-xha.sjzy=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=%s&type=&orderField=%s&orderType=%s&pageNum=%s&pageSize=%s&serviceType=data&rq=1655106309671.43