调整pom文件

device-manager/src/main/bin/deploy.sh

@@ -35,15 +35,18 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
-  rm -rf ${EXECPATH}
+  writelog "mv ${EXECPATH} backup/${EXECPATH}"
+  mv ${EXECPATH} backup/${PROJECT_NAME}
+  #rm -rf ${EXECPATH}
 }
 
 #清理ui
 clear_ui_deploy() {
   EXEC_UI_PATH=$1
-  rm -rf ${EXEC_UI_PATH}
+  #rm -rf ${EXEC_UI_PATH}
+  mv ${EXEC_UI_PATH} backup/${PROJECT_NAME}
   mkdir -p ${EXEC_UI_PATH}
 }
 
@@ -81,7 +84,6 @@ start_service() {
 #部署后台服务
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
-  systemctl stop ${PROJECT_NAME}
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
@@ -101,6 +103,10 @@ project_ui_deploy() {
 
 #主函数
 main() {
+  if [ ! -d $PUBLISH_PATH/backup ];
+  then
+      mkdir -p $$PUBLISH_PATH/backup;
+  fi
   echo "后台服务部署"
   project_deploy
   echo "前端服务部署"

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java

 package com.mortals.xhx.daemon.applicationservice;
 
+import cn.hutool.core.net.NetUtil;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.xhx.base.framework.listener.DirectDynamicListener;
 import com.mortals.xhx.base.system.message.impl.MessageProducer;
@@ -16,6 +17,7 @@ import com.mortals.xhx.thread.SendThirdPartyThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
@@ -50,17 +52,31 @@ public class DeviceComsumersRegisterService implements IApplicationStartedServic
     @Autowired
     private DeviceDownMsgThread deviceDownMsgThread;
 
+    @Value("${deviceUpdateComsumerIp:")
+    public String deviceUpdateComsumerIp;
+
     @Override
     public void start() {
         log.info("初始化发送线程数量");
         sendTaskThreadPool.init(20);
+
+        //判断是否为
+        if (!ObjectUtils.isEmpty(deviceUpdateComsumerIp)) {
+            //判断指定了ip是否与启动节点的ip一致，如果一致则启动当前节点
+            final String localIp = NetUtil.getLocalhostStr();
+            log.info("get Ip...-->" + localIp);
+            if (deviceUpdateComsumerIp.equals(localIp)) {
                 log.info("设备更新消费线程启动");
                 deviceUpdateComsumerThread.start();
+            }
+        } else {
+            log.info("设备更新消费线程启动");
+            deviceUpdateComsumerThread.start();
+        }
         log.info("第三方发送线程启动");
         sendThirdPartyThread.start();
         log.info("消息下发发送线程启动");
         deviceDownMsgThread.start();
-
         log.info("服务端消息队列初始化服务开始..");
 
         deviceService.find(new DeviceEntity())

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

@@ -20,6 +20,22 @@ spring:
     default-property-inclusion: NON_NULL
 #    time-zone: GMT+8
 #    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    host: @profiles.redis.uri@
+    port: @profiles.redis.port@
+    username: @profiles.redis.username@
+    password: @profiles.redis.password@
+    database: @profiles.redis.database@
+    timeout: 30000
+    lettuce:
+      pool:
+        max-idle: 50
+        min-idle: 20
+        max-active: 100
+        max-wait: 5000
+#    sentinel:
+#      master: mymaster
+#      nodes: @profiles.redis.sentinel@
   cloud:
     loadbalancer:
       ribbon:
@@ -38,6 +54,17 @@ spring:
   dao:
     exceptiontranslation:
       enabled: false
+  datasource:
+    druid:
+      connect-timeout: 30000
+      socket-timeout: 60000
+    type: com.alibaba.druid.pool.DruidDataSource
+    #driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: @profiles.datasource.uri@
+    username: @profiles.datasource.username@
+    password: @profiles.datasource.password@
+
 mybatis:
   root-path: com.mortals
   type-aliases-package: com.mortals.framework.model,com.mortals.xhx.common.**.model,com.mortals.xhx.**.model