diff --git a/pom.xml b/pom.xml index 3df5400be..d1af7e9da 100644 --- a/pom.xml +++ b/pom.xml @@ -755,6 +755,22 @@ restful-sdk 1.0.0.6 + + + com.glodon.cloudt.rest.client + cloudt-rest-client + 2.8.0 + system + ${basedir}/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar + + + com.glodon.gys.rest.client + gys-rest-client + 5.0.3 + system + ${basedir}/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar + + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java index d6b20679a..b7d773632 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java @@ -53,9 +53,21 @@ public class BigDeviceVideo implements Serializable { */ @Excel(name = "videoItemId", width = 15) @ApiModelProperty(value = "视频ID") - private java.lang.Long videoItemId; + @TableField(exist = false) + @ApiModelProperty(value = "萤石云设备通道号") + private java.lang.String verificationCode; + @TableField(exist = false) + @ApiModelProperty(value = "视频类型，1萤石云，3ISC") + private java.lang.Integer videoType; + @TableField(exist = false) + @ApiModelProperty(value = "token") + private java.lang.String token; + @TableField(exist = false) + @ApiModelProperty(value = "url") + private java.lang.String url; + @TableField(exist = false) @ApiModelProperty(value = "视频名称") private String videoName; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java index 05ccc5fa4..197b82b1e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Lifter.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -279,6 +280,9 @@ public class Lifter implements Serializable { private java.lang.Integer generalContractorsId; @ApiModelProperty(value = "品牌") private java.lang.String brand; + @TableField(exist = false) + @ApiModelProperty(value = "视频配置") + private ProjectVideoConfig projectVideoConfig; @TableField(exist = false) @ApiModelProperty(value = "设置是否在线，1在线，0离线") diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java index be69e1ee7..c0b9cea15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -443,6 +444,10 @@ public class Tower implements Serializable { @ApiModelProperty(value = "钢丝绳设备id") private java.lang.Long tckwWireRopeId; + @TableField(exist = false) + @ApiModelProperty(value = "视频配置") + private ProjectVideoConfig projectVideoConfig; + @TableField(exist = false) @ApiModelProperty(value = "总承包单位企业名称") private java.lang.String generalContractorsName; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDeviceVideoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDeviceVideoMapper.xml index 77ebad69e..47588b0ce 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDeviceVideoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDeviceVideoMapper.xml @@ -49,7 +49,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java index 849565563..6ee120caf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java @@ -21,9 +21,12 @@ import com.zhgd.xmgl.modules.bigdevice.entity.dto.LifterDto; import com.zhgd.xmgl.modules.bigdevice.entity.vo.*; import com.zhgd.xmgl.modules.bigdevice.mapper.*; import com.zhgd.xmgl.modules.bigdevice.service.ILifterService; +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; +import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService; import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.TimeUtil; +import com.zhgd.xmgl.util.YsVideoUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,10 +36,7 @@ import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -71,6 +71,8 @@ public class LifterServiceImpl extends ServiceImpl impleme private ISystemUserService systemUserService; @Autowired private RedisRepository redisRepository; + @Autowired + private IProjectVideoConfigService projectVideoConfigService; @Override @@ -181,6 +183,23 @@ public class LifterServiceImpl extends ServiceImpl impleme .eq(bdv + RefUtil.fieldNameUlc(BigDeviceVideo::getType), 2); List videoList = bigDeviceVideoMapper.selectListExt(queryWrapper2); lifter.setVideoList(videoList); + HashMap pm = new HashMap<>(); + pm.put("projectSn", lifter.getProjectSn()); + ProjectVideoConfig useProjectVideoConfig = projectVideoConfigService.getUseProjectVideoConfig(pm); + lifter.setProjectVideoConfig(useProjectVideoConfig); + try { + if (CollUtil.isNotEmpty(videoList) && Objects.equals(1, useProjectVideoConfig.getVideoType())) { + String token = YsVideoUtil.getToken(useProjectVideoConfig.getAppId(), useProjectVideoConfig.getAppSecret()); + for (BigDeviceVideo deviceVideo : videoList) { + deviceVideo.setToken(token); + deviceVideo.setUrl("ezopen://open.ys7.com/" + deviceVideo.getSerialNumber() + "/" + + deviceVideo.getVerificationCode() + ".hd.live"); + deviceVideo.setVideoType(useProjectVideoConfig.getVideoType()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } return lifter; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java index e01650f1d..d6c0f712a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java @@ -22,10 +22,13 @@ import com.zhgd.xmgl.modules.bigdevice.entity.vo.*; import com.zhgd.xmgl.modules.bigdevice.mapper.*; import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; import com.zhgd.xmgl.modules.bigdevice.service.ITowerVisualizeService; +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import com.zhgd.xmgl.modules.project.mapper.ProjectDevStatisticsMapper; +import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService; import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.TimeUtil; +import com.zhgd.xmgl.util.YsVideoUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -77,6 +80,8 @@ public class TowerServiceImpl extends ServiceImpl implements private IMqttSender mqttSender; @Autowired private TowerViolationMapper towerViolationMapper; + @Autowired + private IProjectVideoConfigService projectVideoConfigService; @Autowired @@ -218,6 +223,23 @@ public class TowerServiceImpl extends ServiceImpl implements .eq(bdv + RefUtil.fieldNameUlc(BigDeviceVideo::getType), 1); List videoList = bigDeviceVideoMapper.selectListExt(queryWrapper2); tower.setVideoList(videoList); + HashMap pm = new HashMap<>(); + pm.put("projectSn", tower.getProjectSn()); + ProjectVideoConfig useProjectVideoConfig = projectVideoConfigService.getUseProjectVideoConfig(pm); + tower.setProjectVideoConfig(useProjectVideoConfig); + try { + if (CollUtil.isNotEmpty(videoList) && Objects.equals(1, useProjectVideoConfig.getVideoType())) { + String token = YsVideoUtil.getToken(useProjectVideoConfig.getAppId(), useProjectVideoConfig.getAppSecret()); + for (BigDeviceVideo deviceVideo : videoList) { + deviceVideo.setToken(token); + deviceVideo.setUrl("ezopen://open.ys7.com/" + deviceVideo.getSerialNumber() + "/" + + deviceVideo.getVerificationCode() + ".hd.live"); + deviceVideo.setVideoType(useProjectVideoConfig.getVideoType()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.lambda().eq(TowerVisualize::getTowerSn, tower.getDevSn()) .eq(TowerVisualize::getProjectSn, tower.getProjectSn()); diff --git a/src/main/java/com/zhgd/xmgl/modules/bimface/client/BimClient.java b/src/main/java/com/zhgd/xmgl/modules/bimface/client/BimClient.java index 9fa24e571..240f6a46f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bimface/client/BimClient.java +++ b/src/main/java/com/zhgd/xmgl/modules/bimface/client/BimClient.java @@ -77,7 +77,7 @@ public class BimClient { String u = String.format(uploadURL, name, url); ResponseEntity responseEntity = restTemplate.exchange(u, HttpMethod.PUT, requestEntity, JSONObject.class); JSONObject body = responseEntity.getBody(); - log.error("上传文件失败：uploadFile err:{}", JSON.toJSONString(body)); + log.error("上传文件：uploadFile:{}", JSON.toJSONString(body)); if (responseEntity.getStatusCodeValue() != 200 || body == null || !"success".equals(body.getString("code"))) { log.error("上传文件失败！项目sn为：{}，名称为：{}，url为：{}", projectSn, name, u); throw new RuntimeException("上传文件失败！名称可能重复或其他原因！"); diff --git a/src/main/java/com/zhgd/xmgl/modules/bimface/mapper/xml/ProjectBimfaceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bimface/mapper/xml/ProjectBimfaceMapper.xml index 5b4158489..97ce16b53 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bimface/mapper/xml/ProjectBimfaceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bimface/mapper/xml/ProjectBimfaceMapper.xml @@ -29,7 +29,7 @@ AND pb1.version = pb2.version and pb1.update_date = pb2.update_date and project_sn = #{projectSn} - ORDER BY pb1.update_date DESC + ORDER BY pb1.id DESC LIMIT #{index},#{pageSize}; - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/bimface/service/impl/ProjectBimfaceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bimface/service/impl/ProjectBimfaceServiceImpl.java index 19f69e977..6b5308bc6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bimface/service/impl/ProjectBimfaceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bimface/service/impl/ProjectBimfaceServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bimface.api.bean.response.FileTranslateBean; import com.bimface.api.enums.TranslateStatus; import com.bimface.exception.BimfaceException; import com.bimface.sdk.BimfaceClient; @@ -199,4 +200,19 @@ public class ProjectBimfaceServiceImpl extends ServiceImpl projects = projectMapper.selectList(new LambdaQueryWrapper() + .isNotNull(Project::getGldProjectId) + .ne(Project::getGldProjectId, "") + ); + for (Project project : projects) { + sendHttp(project); + } + } + + private void sendHttp(Project project) { + try { + /**----------------准备 -------------------*/ + //第1步：下载授权文件 + //第2步：获取SDK + /** ------------ 授权认证 --------------*/ + + //第3步：创建客户端实例 + RestServiceClient serviceClient = HmacRestServiceClient.getInstance(); + //第4步：加载/验证授权文件 + //4.1构建认证信息 + HmacRestAuthInfo restAuthInfo = new HmacRestAuthInfo(); + //4.2设置授权文件路径 + restAuthInfo.setLicPath(project.getGldLicPath()); + //4.3权限认证 + serviceClient.authenticate(restAuthInfo); + + /** ------------ 拼接请求地址 --------------*/ + //第5步：获取授权文件关联的GYS系统地址hostAddress + String hostAddress = serviceClient.getRestRootAddress(); + //第6步：设置请求接口的URI地址apiURI(以获取集成项目列表信息为例) + String apiURI = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", project.getGldProjectId()); + //第7步：拼装完整的请求网址 + String fullURL = hostAddress + apiURI; + //第8步：请求数据准备（本例中为从GYS系统获取数据，无需进行请求数据的准备） + + //第9步：发送请求，用来推送/获取数据 + RestResponseInfo restResponseInfo = serviceClient.get(fullURL); + + /** ------------ 处理请求返回结果 --------------*/ + if (restResponseInfo.isSuccess()) { + //请求成功： + //第10步：处理请求结果（第三方系统自行处理） + System.out.println(restResponseInfo.getStringContent()); + save(restResponseInfo.getStringContent(), project); + } else { + //请求失败: + //第11步：根据返回结果排查失败原因（数据原因第三方系统自行处理） + } + } catch (AuthenticateException e) { + e.printStackTrace(); + } catch (InvalidUriException e) { + e.printStackTrace(); + } catch (NoAuthenticateException e) { + e.printStackTrace(); + } + } + + private void save(String stringContent, Project project) { + //String projectId = "672804614860800"; + //String url = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", projectId); //String rs = thirdPartRequestUtil.get(url); //JSONObject jo = JSON.parseObject(rs); //if (Objects.equals(jo.getBoolean("success"), true)) { @@ -66,5 +133,7 @@ public class StableWaterMixStationTask { // stableWaterMixStationDataService.add(data); // } //} + } + } diff --git a/src/main/resources/application-cr-gsx.properties b/src/main/resources/application-cr-gsx.properties index e14e17c85..1068bd5d6 100644 --- a/src/main/resources/application-cr-gsx.properties +++ b/src/main/resources/application-cr-gsx.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-cr.properties b/src/main/resources/application-cr.properties index f5b42e375..eed52c3c0 100644 --- a/src/main/resources/application-cr.properties +++ b/src/main/resources/application-cr.properties @@ -23,7 +23,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://118.121.198.147:23232/ +serverUrl=http://118.121.198.147:23232 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 0889d5139..dd520ff27 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -23,7 +23,7 @@ mqtt.producer.clientId=mqttProd mqtt.producer.defaultTopic=topic1 mqtt.consumer.clientId=mqttConsumer mqtt.consumer.defaultTopic=topic1 -serverUrl=http://127.0.0.1:23912/ +serverUrl=http://127.0.0.1:23912 #视频分析url video-analysis-url= server.ssl.enabled=false diff --git a/src/main/resources/application-gsx-dev.properties b/src/main/resources/application-gsx-dev.properties index cb3aa8bfc..4242bbbde 100644 --- a/src/main/resources/application-gsx-dev.properties +++ b/src/main/resources/application-gsx-dev.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-gsx-other-env-show.properties b/src/main/resources/application-gsx-other-env-show.properties index 0deb9ae25..adb53e21f 100644 --- a/src/main/resources/application-gsx-other-env-show.properties +++ b/src/main/resources/application-gsx-other-env-show.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://192.168.34.221:30002/ +serverUrl=http://192.168.34.221:30002 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-gsx-t-dev.properties b/src/main/resources/application-gsx-t-dev.properties index 59dace4e4..7baa82f68 100644 --- a/src/main/resources/application-gsx-t-dev.properties +++ b/src/main/resources/application-gsx-t-dev.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://192.168.34.221:30002/ +serverUrl=http://192.168.34.221:30002 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-gxlt-gsx.properties b/src/main/resources/application-gxlt-gsx.properties index 10516a4ba..e7039481d 100644 --- a/src/main/resources/application-gxlt-gsx.properties +++ b/src/main/resources/application-gxlt-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-nmg-gsx.properties b/src/main/resources/application-nmg-gsx.properties index bc43bd24f..2f8da6b35 100644 --- a/src/main/resources/application-nmg-gsx.properties +++ b/src/main/resources/application-nmg-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-shahu-gsx.properties b/src/main/resources/application-shahu-gsx.properties index 82b0f7bf8..a246dd7ed 100644 --- a/src/main/resources/application-shahu-gsx.properties +++ b/src/main/resources/application-shahu-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-sjjt-gsx.properties b/src/main/resources/application-sjjt-gsx.properties index 49a8b1065..6865082f2 100644 --- a/src/main/resources/application-sjjt-gsx.properties +++ b/src/main/resources/application-sjjt-gsx.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-temp-init-gsx.properties b/src/main/resources/application-temp-init-gsx.properties index ba108ce1a..776203e32 100644 --- a/src/main/resources/application-temp-init-gsx.properties +++ b/src/main/resources/application-temp-init-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-test-gsx.properties b/src/main/resources/application-test-gsx.properties index 2fdee427e..2f1bdb104 100644 --- a/src/main/resources/application-test-gsx.properties +++ b/src/main/resources/application-test-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-ylww.properties b/src/main/resources/application-ylww.properties index cf5a3fde2..e99ec3729 100644 --- a/src/main/resources/application-ylww.properties +++ b/src/main/resources/application-ylww.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-zjsj-gsx.properties b/src/main/resources/application-zjsj-gsx.properties index a55f14593..00e73f87a 100644 --- a/src/main/resources/application-zjsj-gsx.properties +++ b/src/main/resources/application-zjsj-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-zjsj-prod.properties b/src/main/resources/application-zjsj-prod.properties index 3f96c5bb9..0f62ca7fd 100644 --- a/src/main/resources/application-zjsj-prod.properties +++ b/src/main/resources/application-zjsj-prod.properties @@ -28,7 +28,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url @@ -70,4 +70,4 @@ spring.boot.admin.client.instance.name=zjsj double-carbon.water-data-url=http://test.cesms.net double-carbon.ammeter-data-url=http://test.cesms.net license.licensePath=C:/jxj/prod/backEnd/license/license.lic -license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore \ No newline at end of file +license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore diff --git a/src/main/resources/application-zjsj.properties b/src/main/resources/application-zjsj.properties index f0b56d36d..8ebf15759 100644 --- a/src/main/resources/application-zjsj.properties +++ b/src/main/resources/application-zjsj.properties @@ -16,7 +16,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #\u89C6\u9891\u5206\u6790url video-analysis-url= server.ssl.enabled=false diff --git a/src/main/resources/application-zjsj_dev.properties b/src/main/resources/application-zjsj_dev.properties index 4d1bcc512..0f7cf1dcf 100644 --- a/src/main/resources/application-zjsj_dev.properties +++ b/src/main/resources/application-zjsj_dev.properties @@ -18,7 +18,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsj -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/application-zjwj-gsx.properties b/src/main/resources/application-zjwj-gsx.properties index d85b1e44c..4abe0ae6e 100644 --- a/src/main/resources/application-zjwj-gsx.properties +++ b/src/main/resources/application-zjwj-gsx.properties @@ -27,7 +27,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://124.71.67.160:8088 #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url diff --git a/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar b/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar new file mode 100644 index 000000000..135ea32cc Binary files /dev/null and b/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar differ diff --git a/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar b/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar new file mode 100644 index 000000000..34e202075 Binary files /dev/null and b/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar differ