调整pom文件

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

@@ -37,8 +37,10 @@ clear_deploy() {
   #清理后台自启服务
   rm -f ${SERVICE}
   #清理执行文件目录
-  writelog "mv ${EXECPATH} backup/${EXECPATH}"
-  mv ${EXECPATH} backup/${PROJECT_NAME}
+
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
+  mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
   #rm -rf ${EXECPATH}
 }
 
@@ -46,7 +48,9 @@ clear_deploy() {
 clear_ui_deploy() {
   EXEC_UI_PATH=$1
   #rm -rf ${EXEC_UI_PATH}
-  mv ${EXEC_UI_PATH} backup/${PROJECT_NAME}
+  # mv /home/publish/portal-manager /home/publish/backup/portal-manager
+  writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
+  mv ${EXEC_UI_PATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui
   mkdir -p ${EXEC_UI_PATH}
 }
 

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

@@ -20,22 +20,6 @@ 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:
@@ -54,16 +38,6 @@ 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