修改配置

refined-manager/pom.xml

@@ -14,32 +14,33 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <!-- 默认值 -->
+        <profiles.server.debug></profiles.server.debug>
+        <profiles.server.port>21080</profiles.server.port>
+        <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+        <profiles.log.level>info</profiles.log.level>
+        <profiles.publish.path>/home/publish</profiles.publish.path>
+        <profiles.filepath>/mortals/app/data</profiles.filepath>
+        <profiles.hik.host></profiles.hik.host>
+        <profiles.hik.protocol></profiles.hik.protocol>
+        <profiles.hik.appKey></profiles.hik.appKey>
+        <profiles.hik.appSecret></profiles.hik.appSecret>
+        <profiles.hik.callback></profiles.hik.callback>
+    </properties>
+
     <profiles>
         <profile>
             <id>develop</id>
 
             <properties>
                 <profiles.active>develop</profiles.active>
-                <profiles.platform.type>standalone</profiles.platform.type>
-                <profiles.server.port>21080</profiles.server.port>
-                <profiles.server.path>/refined</profiles.server.path>
                 <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.php.host>http://192.168.0.98:8090</profiles.php.host>
                 <profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>
                 <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
-                <profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
-                <profiles.hik.protocol>http://</profiles.hik.protocol>
-                <profiles.hik.appKey>25128371</profiles.hik.appKey>
-                <profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
-                <profiles.hik.callback>http://10.12.185.213:11080/refined/hik/eventRcv</profiles.hik.callback>
-                <package.environment>build</package.environment>
-                <skipUi>true</skipUi>
-                <showSql>true</showSql>
             </properties>
         </profile>
         <profile>
@@ -49,60 +50,20 @@
             </activation>
             <properties>
                 <profiles.active>test</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>21080</profiles.server.port>
-                <profiles.server.path>/refined</profiles.server.path>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
                 <profiles.php.host>http://192.168.0.98:8090</profiles.php.host>
                 <profiles.sms.smsSendUrl>http://sms.wx3.com.cn</profiles.sms.smsSendUrl>
                 <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
-                <profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
-                <profiles.hik.protocol>http://</profiles.hik.protocol>
-                <profiles.hik.appKey>25128371</profiles.hik.appKey>
-                <profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
-                <profiles.hik.callback>http://8.136.255.30:11080/refined/hik/eventRcv</profiles.hik.callback>
-                <package.environment>test</package.environment>
-                <skipUi>false</skipUi>
             </properties>
         </profile>
         <profile>
             <id>product</id>
             <properties>
                 <profiles.active>product</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>21080</profiles.server.port>
-                <profiles.server.path>/refined</profiles.server.path>
-                <profiles.rabbitmq.host>192.168.0.250</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.php.host>http://192.168.0.250:8090</profiles.php.host>
                 <profiles.sms.smsSendUrl>http://192.168.0.250:8901/api/index/index</profiles.sms.smsSendUrl>
                 <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
-                <profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
-                <profiles.hik.protocol>https://</profiles.hik.protocol>
-                <profiles.hik.appKey>25128371</profiles.hik.appKey>
-                <profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
-                <profiles.hik.callback>http://8.136.255.30:11080/refined/hik/eventRcv</profiles.hik.callback>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
             </properties>
         </profile>
 
@@ -110,20 +71,7 @@
             <id>yibin</id>
             <properties>
                 <profiles.active>yibin</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>21080</profiles.server.port>
-                <profiles.server.path>/refined</profiles.server.path>
-                <profiles.rabbitmq.host>172.15.28.117</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.php.host>http://172.15.28.116:8090</profiles.php.host>
                 <profiles.sms.smsSendUrl>http://172.15.28.113:8901/api/index/index</profiles.sms.smsSendUrl>
                 <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
@@ -137,6 +85,18 @@
             </properties>
         </profile>
 
+
+        <profile>
+            <id>qionglai</id>
+            <properties>
+                <profiles.active>qionglai</profiles.active>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+                <profiles.php.host>http://127.0.0.1:8090</profiles.php.host>
+                <profiles.sms.smsSendUrl>http://172.15.28.113:8901/api/index/index</profiles.sms.smsSendUrl>
+                <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
+            </properties>
+        </profile>
+
     </profiles>
 
     <properties>

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SubEventStartedService.java

@@ -24,6 +24,7 @@ import com.mortals.xhx.module.hik.face.service.IHikPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
@@ -39,6 +40,7 @@ import static com.mortals.xhx.common.key.ParamKey.PARAM_FACE_GROUP;
  */
 @Component
 @Slf4j
+@ConditionalOnExpression("'${hik.host:}'!=''")
 public class SubEventStartedService implements IApplicationStartedService {
 
     @Value("${hik.callback:}")

refined-manager/src/main/java/com/mortals/xhx/daemon/task/RealTimePeopleStatTaskImpl.java

@@ -24,6 +24,7 @@ import com.mortals.xhx.module.realtime.service.RealtimeDataflowService;
 import com.mortals.xhx.module.realtime.service.RealtimeDataflowStatService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -37,6 +38,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("RealTimePeopleStatTask")
+@ConditionalOnExpression("'${hik.host:}'!=''")
 public class RealTimePeopleStatTaskImpl implements ITaskExcuteService {
 
     @Autowired
@@ -55,15 +57,12 @@ public class RealTimePeopleStatTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         statPeople();
         delFiles();
-
         //随机添加人员监控
        // randomAlarmPeople();
-
     }
 
 
     private void randomAlarmPeople() {
-
         RealtimeDataflowQuery realtimeDataflowQuery = new RealtimeDataflowQuery();
         realtimeDataflowQuery.setDetectTimeStart(DateUtil.offsetDay(new Date(),-7).toDateStr());
         realtimeDataflowQuery.setDetectTimeEnd(DateUtil.today());
@@ -115,10 +114,6 @@ public class RealTimePeopleStatTaskImpl implements ITaskExcuteService {
             monitorAlarmRecordEntity.setCreateUserId(1L);
             monitorAlarmRecordService.save(monitorAlarmRecordEntity);
         });
-
-
-
-
     }
 
     private void delFiles() {

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java

@@ -15,6 +15,7 @@ import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("SyncRegisterUserPicTask")
+@ConditionalOnExpression("'${hik.host:}'!=''")
 public class SyncRegisterUserPicTaskImpl implements ITaskExcuteService {
 
     @Autowired

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSubmitAppointTaskImpl.java

@@ -48,7 +48,6 @@ public class SyncSubmitAppointTaskImpl implements ITaskExcuteService {
 
     }
 
-
     private void syncSubmitAppoint() {
         String registerPath = "/inter/Actuary/orderTakebusiness";
         String url = host + registerPath;
@@ -86,7 +85,6 @@ public class SyncSubmitAppointTaskImpl implements ITaskExcuteService {
         }
     }
 
-
     @Override
     public void stopTask(ITask task) throws AppException {
 

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java

@@ -24,6 +24,7 @@ import com.mortals.xhx.module.person.model.PersonQuery;
 import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -41,6 +42,7 @@ import static com.mortals.xhx.common.key.ParamKey.PARAM_FACE_GROUP_REGISTER;
  */
 @Slf4j
 @Service("SyncUserToHikTask")
+@ConditionalOnExpression("'${hik.host:}'!=''")
 public class SyncUserToHikTaskImpl implements ITaskExcuteService {
 
     @Autowired

refined-manager/src/main/resources/bootstrap.yml

 platform:
-  #  type: standalone
-  type: @profiles.platform.type@
+    type: cloud
 server:
   tomcat:
     uri-encoding: utf-8
   port: @profiles.server.port@
   servlet:
-    context-path: @profiles.server.path@
+    context-path: /refined
 spring:
   application:
     name: @project.artifactId@
@@ -22,12 +21,6 @@ spring:
     default-property-inclusion: NON_NULL
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
-  rabbitmq:
-    host: @profiles.rabbitmq.host@
-    port: @profiles.rabbitmq.port@
-    username: @profiles.rabbitmq.username@
-    password: @profiles.rabbitmq.password@
-    virtualHost: @profiles.rabbitmq.virtualhost@
   dao:
     exceptiontranslation:
       enabled: false