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

各地配置外置

This commit is contained in:
wangliwen 2022-06-22 19:33:20 +08:00
parent 2d18cbbf9a
commit de75da4b68
9 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/domain/baotou.properties Normal file
View File

@ -0,0 +1 @@
baotou.hlsurl=http://10.110.205.1:18088/server/device/hisdeviceapplylist/url/%s

7
config/domain/tsingtao-xha.properties Normal file
View File

@ -0,0 +1,7 @@
tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weatherwarning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls
tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weatherwarning/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.resourcecount=http://10.16.3.224: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.134.135.24:30058/shareportal/platform/index/abilityMarket/count
tsingtao-xha.sjzy=http://10.16.3.224: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

0
config/domain/tsingtao.properties Normal file
View File

3
renren-admin/pom.xml
View File

@ -304,7 +304,8 @@
<!-- 排除生产环境配置 -->
<exclude>application-prod.yml</exclude>
<!-- 排除flyway管理的sql -->
<!-- <exclude>db/*.sql</exclude>-->
<exclude>db/*.sql</exclude>
<exclude>domain/**</exclude>
</excludes>
</resource>
<resource>

2
renren-admin/src/main/java/io/renren/common/domain/BaoTouProperties.java
View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
*/
@Data
@Component
@PropertySource("classpath:/domain/baotou.properties")
@PropertySource("file:config/domain/baotou.properties")
@ConfigurationProperties(prefix = "baotou")
public class BaoTouProperties {
private String hlsurl;

2
renren-admin/src/main/java/io/renren/common/domain/TsingtaoProperties.java
View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
*/
@Data
@Component
@PropertySource("classpath:/domain/tsingtao.properties")
@PropertySource("file:config/domain/tsingtao.properties")
@ConfigurationProperties(prefix = "tsingtao")
public class TsingtaoProperties {

2
renren-admin/src/main/java/io/renren/common/domain/Tsingtao_xhaProperties.java
View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
*/
@Data
@Component
@PropertySource("classpath:/domain/tsingtao-xha.properties")
@PropertySource("file:config/domain/tsingtao-xha.properties")
@ConfigurationProperties(prefix = "tsingtao-xha")
public class Tsingtao_xhaProperties {
private String cloudhls;

17
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -318,18 +318,18 @@ public class ResourceController {
String parame = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n" +
" <soap:Body><ZWCJ_mainPort xmlns=\"http://tempuri.org/\">\n" +
String.format("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n",page, size) +
String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n",pxcol, order);
if (bmname != null){
parame = parame + String.format("<bmname>%s</bmname>",bmname);
String.format("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n", page, size) +
String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n", pxcol, order);
if (bmname != null) {
parame = parame + String.format("<bmname>%s</bmname>", bmname);
}
if (zyname != null) {
parame = parame + String.format("<zyname>%s</zyname>",zyname);
parame = parame + String.format("<zyname>%s</zyname>", zyname);
}
parame = parame + "</ZWCJ_mainPort></soap:Body></soap:Envelope>";
HttpHeaders requestHeaders = new HttpHeaders();
requestHeaders.set("SOAPAction", "http://tempuri.org/ZWCJ_mainPort");
requestHeaders.setContentType(new MediaType("text","xml", Charset.forName("utf-8")));
requestHeaders.setContentType(new MediaType("text", "xml", Charset.forName("utf-8")));
HttpEntity<String> requestEntity = new HttpEntity(parame, requestHeaders);
try {
String body = restTemplate.postForEntity(url, requestEntity, String.class).getBody();
@ -415,15 +415,14 @@ public class ResourceController {
}
*/
@GetMapping("getHls")
@ApiOperation("获取hls地址")
@GetMapping("/hls/getHls")
public Result<String> getHls(String key) {
Optional<AbstractVideoPreviewService> factory = VideoPreviewFactory.build();
if (factory.isPresent()) {
String hls = factory.get().getHls(key);
return new Result<String>().ok(hls);
}
return null;
return new Result<String>().ok(null);
}

1
renren-admin/src/main/resources/assembly/assembly.xml
View File

@ -51,6 +51,7 @@
<include>*.properties</include>
<include>*.json</include>
<include>db/*.sql</include>
<include>domain/**</include>
</includes>
<excludes>
<exclude>application-prod.yml</exclude>