【视频监控，创城合并】配置文件修改

renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java

@@ -66,9 +66,9 @@ public class MonitorService {
     @Autowired
     private BoothMapper boothMapper;
 
-    @Value("${hwx.file.work-path}")
+    @Value("${resource.path}")
     private String fileDir;
-    @Value("${hwx.file.pic-host}")
+    @Value("${resource.pic-host}")
     private String picHost;
 
     @Value("iOgQotfgfyLvhj6WgfDTpq7F")
@@ -88,6 +88,18 @@ public class MonitorService {
     @PostConstruct
     public String init(){
 
+        try {
+            return monitorLogin();
+        }catch (Exception e){
+            log.warn("摄像头登录异常，跳过", e);
+        }
+
+        return null;
+
+    }
+
+    public String monitorLogin(){
+
         String loginUrl = monitorDomain + "/videoService/accounts/authorize";
         HashMap<String, String> loginParam = new HashMap<>();
         loginParam.put("userName", userName);

renren-admin/src/main/resources/application-dev.yml

@@ -53,6 +53,7 @@ spring:
 #上传的静态资源配置
 resource:
   root_url: 15.2.21.238
+  pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
   path: /home/yth/files/
   devModelFilePath: /home/yth/files/devModelFile
 # 大数据部门相关配置

renren-admin/src/main/resources/application-hwx.yml

@@ -37,6 +37,7 @@ spring:
 #上传的静态资源配置
 resource:
   root_url: 15.2.21.238
+  pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
   path: /data/services/nengli/files/
   devModelFilePath: /data/services/nengli/files/devModelFile
 # 大数据部门相关配置

renren-admin/src/main/resources/application-prod.yml

@@ -37,6 +37,7 @@ spring:
 #上传的静态资源配置
 resource:
   root_url: 15.72.183.90
+  pic-host: http://${resource.root_url}:${server.port}${server.servlet.context-path}
   path: /data/services/nengli/files/
   devModelFilePath: /data/services/nengli/files/devModelFile
 # 大数据部门相关配置

renren-admin/src/main/resources/application.yml

@@ -26,7 +26,7 @@ server:
 spring:
   # 环境 dev|test|prod|show
   profiles:
-    active: dev
+    active: hwx
   messages:
     encoding: UTF-8
     basename: i18n/messages