Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

.drone.yml

@@ -13,23 +13,22 @@ steps:
     commands:
       - cd ./build
       - chmod 755 ./build.sh
-      #- ./build.sh
-      - mkdir publish
+      - ./build.sh
       - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}\n">./publish/version.txt
       - echo ${DRONE_COMMIT_MESSAGE}>./publish/version.txt
       - ls publish
 
-  # - name: publish
-  #   image: plugins/s3
-  #   settings:
-  #     endpoint: http://dev.ccwin-in.com:3008
-  #     path_style: true
-  #     bucket: default
-  #     access_key: O222sbIaMKeGfeX18t8K
-  #     secret_key: 0LEOWfXSDnaLbIYGZfdKUxyi2kYIayx4YvdLTgcR
-  #     source: build/publish/**/*
-  #     strip_prefix: build/publish/
-  #     target: /jie-suan/bei-qi/${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}
+  - name: publish
+    image: plugins/s3
+    settings:
+      endpoint: http://dev.ccwin-in.com:3008
+      path_style: true
+      bucket: default
+      access_key: O222sbIaMKeGfeX18t8K
+      secret_key: 0LEOWfXSDnaLbIYGZfdKUxyi2kYIayx4YvdLTgcR
+      source: build/publish/**/*
+      strip_prefix: build/publish/
+      target: /jie-suan/bei-qi/${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}
 
   - name: stop
     image: appleboy/drone-ssh
@@ -47,15 +46,27 @@ steps:
         - rm -rf publish
         - mkdir publish
 
-  - name: deploy
-    image: hypervtechnics/drone-sftp
+  - name: deploy-scp
+    image: axute/drone-sftp
     settings:
       host: dev.ccwin-in.com
       port: 16085
       username: Administrator
       password: Microsoft@2022
-      source: ./build/publish
+      source: build/publish
       target: /d/BQ-JS/publish
+      timeout: 1800s
+      command_timeout: 30m
+
+  # - name: deploy-sftp
+  #   image: axute/drone-sftp
+  #   settings:
+  #     host: dev.ccwin-in.com
+  #     port: 16085
+  #     username: Administrator
+  #     password: Microsoft@2022
+  #     source: build/publish
+  #     target: /d/BQ-JS/publish
 
   - name: start
     image: appleboy/drone-ssh