Merge branch 'develop' into test-store

* develop:
  优化本地删除文件后重新打包导致文件还存在的问题

# Conflicts:
#	.drone.yml

.drone.yml

@@ -1567,7 +1567,7 @@ steps:
     commands: # 执行命令
       - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
-      - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && rsync -av --delete /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && rsync -av --delete /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
+      - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
         - success # 当前步骤成功时执行
@@ -1588,6 +1588,8 @@ steps:
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
+      commands: # 执行命令
+        - rm -rf /home/ABServer/deploy-ready/*
       source:
         - echo ====开始拷贝=======
         - /kxs-store/*.jar
@@ -1614,7 +1616,8 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
-        - rsync -av --delete /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/kxs-store
+        - rm -rf /home/ABServer/webroot/kxs-store/*
+        - cp -r /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/
         - docker stop kxs-store && docker rm kxs-store && docker-compose up -d kxs-store
         # - docker restart nodeServer1
         - echo ====部署成功=======