From eee74aefbc1573254a6c2195555afd438fc51957 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Sep 2023 09:17:08 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E5=AE=A2=E6=88=B7=E9=9B=B6?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index 2c307f43..a81d3104 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -243,7 +243,7 @@ export default {
         },
         lu: {
           type: "string",
-          title: "零件号",
+          title: "客户零件号",
         },
         partDesc: {
           type: "string",

From 1702060c646f547459879ee410c2b6d5fc320a4e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Sep 2023 09:30:10 +0800
Subject: [PATCH 2/5] update drone

---
 .drone.yml | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 365d8c02..cacce703 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,19 +45,34 @@ steps:
         - sleep 3s
         - cd ..
         - rm -rf publish
+        - mkdir publish
+
+  # - name: deploy
+  #   image: appleboy/drone-scp
+  #   settings:
+  #     host: dev.ccwin-in.com
+  #     port: 16085
+  #     username: Administrator
+  #     password: Microsoft@2022
+  #     timeout: "30m"
+  #     command_timeout: "30m"
+  #     target: /d/BQ-JS/publish
+  #     source: build/publish
+  #     strip_components: 2
 
   - name: deploy
-    image: appleboy/drone-scp
-    settings:
-      host: dev.ccwin-in.com
-      port: 16085
-      username: Administrator
-      password: Microsoft@2022
-      timeout: "30m"
-      command_timeout: "30m"
-      target: /d/BQ-JS/publish
-      source: build/publish
-      strip_components: 2
+    image: cschlosser/drone-ftps
+    environment:
+      FTP_USERNAME: Administrator
+      FTP_PASSWORD: Microsoft@2022
+      PLUGIN_SECURE: false
+      PLUGIN_VERIFY: false
+      PLUGIN_HOSTNAME: sftp://dev.ccwin-in.com:16085
+      PLUGIN_SRC_DIR: /build/publish
+      PLUGIN_DEST_DIR: /d/BQ-JS/publish
+      PLUGIN_AUTO_CONFIRM: true
+      PLUGIN_DEBUG: true
+      PLUGIN_ONLY_NEWER: true
 
   - name: start
     image: appleboy/drone-ssh

From 7a391189f1bf65ca00f3745313a296dfce27e969 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Sep 2023 09:31:33 +0800
Subject: [PATCH 3/5] update drone

---
 .drone.yml | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cacce703..b1c03901 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,19 +60,29 @@ steps:
   #     source: build/publish
   #     strip_components: 2
 
+  # - name: deploy
+  #   image: cschlosser/drone-ftps
+  #   environment:
+  #     FTP_USERNAME: Administrator
+  #     FTP_PASSWORD: Microsoft@2022
+  #     PLUGIN_SECURE: false
+  #     PLUGIN_VERIFY: false
+  #     PLUGIN_HOSTNAME: sftp://dev.ccwin-in.com:16085
+  #     PLUGIN_SRC_DIR: /build/publish
+  #     PLUGIN_DEST_DIR: /d/BQ-JS/publish
+  #     PLUGIN_AUTO_CONFIRM: true
+  #     PLUGIN_DEBUG: true
+  #     PLUGIN_ONLY_NEWER: true
+
   - name: deploy
-    image: cschlosser/drone-ftps
-    environment:
-      FTP_USERNAME: Administrator
-      FTP_PASSWORD: Microsoft@2022
-      PLUGIN_SECURE: false
-      PLUGIN_VERIFY: false
-      PLUGIN_HOSTNAME: sftp://dev.ccwin-in.com:16085
-      PLUGIN_SRC_DIR: /build/publish
-      PLUGIN_DEST_DIR: /d/BQ-JS/publish
-      PLUGIN_AUTO_CONFIRM: true
-      PLUGIN_DEBUG: true
-      PLUGIN_ONLY_NEWER: true
+    image: atmoz/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

From d4ff11c4ff8a515467806f1f55fe51fb9410e8fb Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Sep 2023 09:42:44 +0800
Subject: [PATCH 4/5] update drone

---
 .drone.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b1c03901..0e7fa03c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,27 +60,15 @@ steps:
   #     source: build/publish
   #     strip_components: 2
 
-  # - name: deploy
-  #   image: cschlosser/drone-ftps
-  #   environment:
-  #     FTP_USERNAME: Administrator
-  #     FTP_PASSWORD: Microsoft@2022
-  #     PLUGIN_SECURE: false
-  #     PLUGIN_VERIFY: false
-  #     PLUGIN_HOSTNAME: sftp://dev.ccwin-in.com:16085
-  #     PLUGIN_SRC_DIR: /build/publish
-  #     PLUGIN_DEST_DIR: /d/BQ-JS/publish
-  #     PLUGIN_AUTO_CONFIRM: true
-  #     PLUGIN_DEBUG: true
-  #     PLUGIN_ONLY_NEWER: true
-
   - name: deploy
     image: atmoz/sftp
     settings:
       host: dev.ccwin-in.com
       port: 16085
-      username: Administrator
-      password: Microsoft@2022
+      username:
+        from_secret: username
+      password:
+        from_secret: password
       source: build/publish
       target: /d/BQ-JS/publish
 

From c68527b9db0ddc67f9c8219245fa72a3bab5bc89 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 20 Sep 2023 09:57:15 +0800
Subject: [PATCH 5/5] update drone

---
 .drone.yml | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0e7fa03c..5fdf5504 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -47,6 +47,17 @@ steps:
         - rm -rf publish
         - mkdir publish
 
+  - name: deploy
+    image: appleboy/drone-scp
+    settings:
+      host: dev.ccwin-in.com
+      port: 16085
+      username: Administrator
+      password: Microsoft@2022
+      command_timeout: 30m
+      target: /d/BQ-JS/publish
+      source: build/publish
+
   # - name: deploy
   #   image: appleboy/drone-scp
   #   settings:
@@ -60,17 +71,20 @@ steps:
   #     source: build/publish
   #     strip_components: 2
 
-  - name: deploy
-    image: atmoz/sftp
-    settings:
-      host: dev.ccwin-in.com
-      port: 16085
-      username:
-        from_secret: username
-      password:
-        from_secret: password
-      source: build/publish
-      target: /d/BQ-JS/publish
+  # - name: deploy
+  #   image: atmoz/sftp
+  #   volumes:
+  #     - ./build/publish:/home/foo/upload
+  #   ports:
+  #    - 16085:22
+  #   command: Administrator@Microsoft@2022:::upload
+  # 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