各地配置外置

config/domain/baotou.properties

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

config/domain/tsingtao-xha.properties

@@ -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

renren-admin/pom.xml

@@ -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>

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

@@ -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;

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

@@ -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 {
 

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

@@ -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;

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

@@ -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("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n", page, size) +
-                String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n",pxcol, order);
+                String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n", pxcol, order);
-        if (bmname != null){
+        if (bmname != null) {
-            parame = parame + String.format("<bmname>%s</bmname>",bmname);
+            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")
+    @GetMapping("/hls/getHls")
-    @ApiOperation("获取hls地址")
     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);
     }
 
 

renren-admin/src/main/resources/assembly/assembly.xml

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