From 772c0756f0e1efdc0572fe963848e6967b8761b0 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:12:29 +0800 Subject: [PATCH 01/33] update drone --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 43d96ef8..8ed4f23d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -69,8 +69,9 @@ steps: username: Administrator password: Microsoft@2022 command_timeout: 10m - target: D:\BQ-JS\test + target: /d/BQ-JS/test source: build/publish + #strip_components: 1 # - name: deploy # image: atmoz/sftp From 887d8bda03b73e87ca395c6dee29e5d519528625 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:13:52 +0800 Subject: [PATCH 02/33] update drone --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8ed4f23d..93d22ae3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,8 +41,7 @@ steps: password: Microsoft@2022 command_timeout: 10m script: - - scp help - - cd D:/BQ-JS/test + - cd /d/BQ-JS/test # - stop.cmd - cd .. - rm test -Recurse From e1c2bfbf55a857ef51a523071835ebd6b901d356 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:15:17 +0800 Subject: [PATCH 03/33] update drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 93d22ae3..16046c6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ steps: - cd /d/BQ-JS/test # - stop.cmd - cd .. - - rm test -Recurse + - rm -rf test # - name: deploy # image: cschlosser/drone-ftps From ca6a1ec03a0c73172b2b3c3a064298270130a6dc Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:26:08 +0800 Subject: [PATCH 04/33] update drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 16046c6c..6adf7612 100644 --- a/.drone.yml +++ b/.drone.yml @@ -70,7 +70,7 @@ steps: command_timeout: 10m target: /d/BQ-JS/test source: build/publish - #strip_components: 1 + strip_components: 2 # - name: deploy # image: atmoz/sftp From 39e94e80029714fe3912b428c0f93657adb2b97a Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:39:49 +0800 Subject: [PATCH 05/33] update drone --- .drone.yml | 81 +++++++++++++++++++----------------------------------- 1 file changed, 28 insertions(+), 53 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6adf7612..f459ee64 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,22 +15,22 @@ steps: - pwd - ls - chmod 755 ./build.sh - # - ./build.sh + - ./build.sh - mkdir publish - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}">./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 @@ -41,24 +41,10 @@ steps: password: Microsoft@2022 command_timeout: 10m script: - - cd /d/BQ-JS/test - # - stop.cmd + - cd /d/BQ-JS/publish + - stop.cmd - cd .. - - rm -rf test - - # - 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/test - # PLUGIN_AUTO_CONFIRM: true - # PLUGIN_DEBUG: true - # PLUGIN_ONLY_NEWER: true + - rm -rf publish - name: deploy image: appleboy/drone-scp @@ -68,30 +54,19 @@ steps: username: Administrator password: Microsoft@2022 command_timeout: 10m - target: /d/BQ-JS/test + target: /d/BQ-JS/publish 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/test -# - name: start -# image: appleboy/drone-ssh -# settings: -# host: dev.ccwin-in.com -# port: 16085 -# username: Administrator -# password: Microsoft@2022 -# command_timeout: 10m -# script: -# - cd D:/BQ-JS/test -# - start.cmd -# - echo ok +- name: start + image: appleboy/drone-ssh +settings: + host: dev.ccwin-in.com + port: 16085 + username: Administrator + password: Microsoft@2022 + command_timeout: 10m + script: + - cd D:/BQ-JS/publish + - start.cmd + - echo ok From 45286f24b93d2eb77d68fa99e321a43b2a40ffab Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:41:05 +0800 Subject: [PATCH 06/33] update drone --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index f459ee64..791b29c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,15 +58,15 @@ steps: source: build/publish strip_components: 2 -- name: start - image: appleboy/drone-ssh -settings: - host: dev.ccwin-in.com - port: 16085 - username: Administrator - password: Microsoft@2022 - command_timeout: 10m - script: - - cd D:/BQ-JS/publish - - start.cmd - - echo ok + - name: start + image: appleboy/drone-ssh + settings: + host: dev.ccwin-in.com + port: 16085 + username: Administrator + password: Microsoft@2022 + command_timeout: 10m + script: + - cd D:/BQ-JS/publish + - start.cmd + - echo ok From 522d5c60cdc0f61d0adfd489741caf576422110c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:41:34 +0800 Subject: [PATCH 07/33] update drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 791b29c1..ffd4c7fb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,7 +60,7 @@ steps: - name: start image: appleboy/drone-ssh - settings: + settings: host: dev.ccwin-in.com port: 16085 username: Administrator From 06a8f411a74f7bca126c1c7ce7e61741b5b3c00f Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 17:58:18 +0800 Subject: [PATCH 08/33] [CI SKIP] --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..2fdc7a79 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# 说明 + +在提交中添加 [CI SKIP] 避免自动构建、发布和部署 From 928d3a1f2276de7e6e6d146e4cbf11c239959c0f Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:20:04 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/SettleAccount.Application/Bases/BA_SERVICE.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 3f460f75..5f2bfd46 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -204,7 +204,7 @@ namespace Win.Sfs.SettleAccount.Bases PartDesc = tm == null ? string.Empty : itm.PartDesc, InvDate = itm1.CreationTime, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, - Version = itm.Version, + //Version = itm.Version, InvbillNum = itm.InvbillNum, InvGroupNum = itm.InvGroupNum, LU = itm.LU, From 97488f2013b754399b5289babfe1acbd51358f83 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:24:26 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 11c505e3..43628ecf 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -232,7 +232,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ PartDesc = tm == null ? string.Empty : itm.PartDesc, InvDate = itm1.CreationTime, RealInvbillNum = string.IsNullOrEmpty(itm1.RealnvBillNum) ? string.Empty : itm1.RealnvBillNum, - Version = itm.Version, + //Version = itm.Version, InvbillNum = itm.InvbillNum, InvGroupNum = itm.InvGroupNum, LU = itm.LU, From 9d7d4a8a394b038f497e70de0de173b3d8acf746 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:30:59 +0800 Subject: [PATCH 11/33] update drone --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ffd4c7fb..55cae7fb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,8 +16,7 @@ steps: - ls - chmod 755 ./build.sh - ./build.sh - - mkdir publish - - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}">./publish/version.txt + - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}\n${DRONE_COMMIT_MESSAGE}">./publish/version.txt - ls publish - name: publish From 71ebfed13b618496f020ef87908d7d2d76e597e4 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:39:04 +0800 Subject: [PATCH 12/33] update drone --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 55cae7fb..d98142ea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,8 @@ steps: - ls - chmod 755 ./build.sh - ./build.sh - - echo "${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_AUTHOR}-${DRONE_REPO_BRANCH}-${DRONE_COMMIT_SHA:0:8}\n${DRONE_COMMIT_MESSAGE}">./publish/version.txt + - 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 From 53421ce5f12e609a12d6ba13504b94ccc7114889 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:51:06 +0800 Subject: [PATCH 13/33] update drone --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d98142ea..5caeba5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ steps: command_timeout: 10m script: - cd /d/BQ-JS/publish - - stop.cmd + - ./stop.cmd - cd .. - rm -rf publish @@ -68,5 +68,5 @@ steps: command_timeout: 10m script: - cd D:/BQ-JS/publish - - start.cmd + - ./start.cmd - echo ok From b4bdc86cc22047f0108e0ea643365375e9c0f924 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 18:56:31 +0800 Subject: [PATCH 14/33] update drone --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 5caeba5a..9c906c95 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,6 +42,8 @@ steps: command_timeout: 10m script: - cd /d/BQ-JS/publish + - pwd + - ls - ./stop.cmd - cd .. - rm -rf publish From 1b9988aa5b9163a553b0390d38ae68566d027a2c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 19:39:56 +0800 Subject: [PATCH 15/33] update drone --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9c906c95..53271a6b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,9 +42,8 @@ steps: command_timeout: 10m script: - cd /d/BQ-JS/publish - - pwd - - ls - ./stop.cmd + - sleep 3s - cd .. - rm -rf publish From 6f402fa000a5ec1929077ef44b044ed5a39014e1 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 19:53:27 +0800 Subject: [PATCH 16/33] drone test --- .drone.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 53271a6b..f9d6073b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,10 +12,9 @@ steps: image: mcr.microsoft.com/dotnet/sdk:6.0 commands: - cd ./build - - pwd - - ls - chmod 755 ./build.sh - - ./build.sh + # - ./build.sh + - mkdir publish - 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 From 51a0065f5be001c8535b4754b60c20419f41226e Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 19:56:23 +0800 Subject: [PATCH 17/33] update drone --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f9d6073b..4a1c881a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,8 @@ steps: commands: - cd ./build - chmod 755 ./build.sh - # - ./build.sh - - mkdir publish + - ./build.sh + # - mkdir publish - 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 @@ -53,7 +53,8 @@ steps: port: 16085 username: Administrator password: Microsoft@2022 - command_timeout: 10m + timeout: 30m + command_timeout: 30m target: /d/BQ-JS/publish source: build/publish strip_components: 2 From ca7a56c1b14fbce3e5499aaf7e50d566c9d3d79e Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 21:26:35 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4a1c881a..0eb1ddb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,8 +53,8 @@ steps: port: 16085 username: Administrator password: Microsoft@2022 - timeout: 30m - command_timeout: 30m + timeout: 1800 + command_timeout: 30 target: /d/BQ-JS/publish source: build/publish strip_components: 2 From 63c121ba39eda580f1c52fa84953f79c08c0abd9 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 21:31:29 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0eb1ddb0..2dbd84e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,8 +53,8 @@ steps: port: 16085 username: Administrator password: Microsoft@2022 - timeout: 1800 - command_timeout: 30 + timeout: 1800s + command_timeout: 30m target: /d/BQ-JS/publish source: build/publish strip_components: 2 From a83955081120e52d00d4d133907bd5e05602e4e0 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Sep 2023 22:09:42 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2dbd84e2..365d8c02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,8 +53,8 @@ steps: port: 16085 username: Administrator password: Microsoft@2022 - timeout: 1800s - command_timeout: 30m + timeout: "30m" + command_timeout: "30m" target: /d/BQ-JS/publish source: build/publish strip_components: 2 From fe0488c937a93ed84147b7a99c01cb56143bd2fa Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 20 Sep 2023 08:49:26 +0800 Subject: [PATCH 21/33] up --- .../Entities/Prices/PriceListAppServiceBJ.cs | 6 +++--- .../Services/Report/JisBBACSaSeEdiCompareExportService.cs | 1 + .../Services/Report/JisHBPOSaSeEdiCompareExportService.cs | 1 + .../Services/Report/SaSeEdiCompareExportBaseService.cs | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index db748b59..ebf48587 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -58,9 +58,9 @@ namespace Win.Sfs.SettleAccount.Entities.Prices var _exportImporter = new ExportImporter(); var result = await _exportImporter.UploadExcelImportByHeadDesc(files, _excelImportService).ConfigureAwait(false); var filter = new List - { - "1049" - }; + { + "1049" + }; result = result.Where(p => filter.Contains(p.Plant)).ToList(); result.FindAll(t => !string.IsNullOrEmpty(t.ES1) || !string.IsNullOrEmpty(t.ES2)).ForEach(t => t.PartNo = t.PartNo + new string(' ', 6) + t.ES1 + t.ES2); var newPrice = ObjectMapper.Map, List>(result); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs index 73da9782..8aad5ea4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs @@ -93,6 +93,7 @@ namespace SettleAccount.Job.Services.Report #region 结算数据处理 HandleSaDetails(saSeEdiCompareDiffs, businessType, version); + HandleSaDetailsMain(saSeEdiCompareDiffs, businessType, version); #endregion if (string.IsNullOrEmpty(lu) == false) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs index 0869466a..84ce98ef 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs @@ -92,6 +92,7 @@ namespace SettleAccount.Job.Services.Report #region 结算数据处理 HandleSaDetails(saSeEdiCompareDiffs, businessType, version); + HandleSaDetailsMain(saSeEdiCompareDiffs, businessType, version); #endregion if (string.IsNullOrEmpty(lu) == false) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs index af8176a3..e7ed0253 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs @@ -181,6 +181,7 @@ namespace SettleAccount.Job.Services.Report /// public virtual void HandleSaDetailsMain(List saSeEdiCompareDiff, EnumBusinessType businessType, int version) where T : SA_BASE { + return; var haveSaHaveSes = saSeEdiCompareDiff.FindAll(t => t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeHaveEdi || t.Category == EnumSaSeEdiCompareCategory.HaveSaHaveSeNotHaveEdi); if (haveSaHaveSes.Any()) { 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 22/33] =?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 23/33] 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 24/33] 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 25/33] 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 26/33] 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 From cd736ffcc4a6f3fe6f1b212f1c70cfa3481a60b6 Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 20 Sep 2023 10:12:46 +0800 Subject: [PATCH 27/33] up --- .../Entities/BQ/PUB_SA_SERVICE.cs | 33 +++++++++++++++++++ .../MaterialRelationshipAppService.cs | 4 +++ .../Entities/Prices/PriceListAppService.cs | 21 ++++++------ .../Entities/Prices/PriceListAppServiceBJ.cs | 10 ++++++ .../BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs | 2 +- 5 files changed, 59 insertions(+), 11 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs index e4027663..1416d7de 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs @@ -124,6 +124,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 导入 /// + /// + /// 直供件BBAC、直供件HBPO、备件、印度件 + /// 业务结算数据导入 + /// [HttpPost] public async Task ImportAsync([FromForm] PUB_SAImportRequestDto pubSaImportRequestDto) { @@ -168,6 +172,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 删除 /// + /// + /// 同时删除 + /// 结算主表、明细表 + /// 可结算主表、明细表 + /// 不可结算明细表（不可结算又没主表） + /// [HttpPost] public async Task DeleteListAsync(List ids) { @@ -230,6 +240,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 直供件BBAC导入 /// + /// + /// 导入数据过滤 + /// * 筛选 Vendor 为15663496的数据 + /// HandleSaDetails方法处理导入的数据 + /// private async Task ImportZhiGongJianBBACAsync([FromForm] IFormFileCollection files) { #region 导入数据转换 @@ -359,6 +374,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 数据校验 /// + /// + /// 验证结算分组号是否已存在 + /// 验证 + /// private async Task> CheckAsync(List pubSaDetails) { #region 数据校验 @@ -399,6 +418,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 处理结算数据 /// + /// + /// 零件号（Lu）格式处理 + /// 零件号可能存在颜色码 颜色码和塑件码中间用同一用6个空格替换 + /// PN有0开头的数据过滤 '‘’符号 + /// private List HandleSaDetails(List pubSaDetails) { pubSaDetails.ForEach(pubSaDetail => @@ -419,6 +443,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 结算数据分组Pn、Lu /// + /// + /// 导入文件中可能存在PN+LU相同的数据 + /// 根据PN+LU分组合计数量后导入 + /// private List GroupPnLu(List pubSaDetails) { return pubSaDetails.GroupBy(t => new { t.PN, t.LU }).Select(t => @@ -587,6 +615,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 获取结算关联项 /// + /// + /// 根据结算主表Id获取关联的结算主表、结算明细表、可结算主表、可结算明细表、不可结算明细表要删除的数据 + /// 验证可结算主表状态 + /// 只有可结算主表状态为未结状态时才可以删除结算数据 + /// private async Task<(List pubSas, List pubSaDetails, List pubCanSas, List pubCanSaDetails, List pubNotSaDetails)> GetPubSaDelItemsAsync(Guid id) { //结算主表 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs index f0ada4a6..7b2c5eb9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs @@ -51,6 +51,10 @@ public class MaterialRelationshipAppService : SettleAccountApplicationBase /// 导入 /// + /// + /// 数据校验 + /// * 根据客户零件号分组判断是否有客户零件号重复的数据 + /// [HttpPost] public async Task ImportAsync([FromForm] MaterialRelationshipImportRequestDto materialRelationshipImportRequestDto) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index 50b53d74..05f289c2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -54,19 +54,19 @@ namespace Win.Sfs.SettleAccount.Entities.Prices } #region 导入、导出 - ///// - ///// 获取导入模板 - ///// - //[HttpPost("import-template")] - //public virtual async Task ImportTemplateAsync() - //{ - // await Task.CompletedTask; - // return new Microsoft.AspNetCore.Mvc.OkResult(); - //} - /// /// 导入 /// + /// + /// * 销售价格单筛选 Plant（客户编码） 为（1040、1046、104T）的数据 + /// * 客户零件号为 PartNo+6个空格+ES1+ES2 + /// * 根据 合同日期、客户编码、零件号、开始时间、结束时间分组导入（过滤重复数据） + /// 数据校验 + /// * 同一合同日期、客户编码、零件号 不能存在时间交集 + /// * 判断同一个零件号时间区间是否连续 + /// 作废旧合同日期的数据 + /// * 比较新导入的数据和数据库中老数据（同一零件号、旧合同日期的数据修改状态为作废） + /// [HttpPost] public virtual async Task ImportAsync([FromForm] IFormFileCollection files, string version) { @@ -247,6 +247,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 修改实体 + /// 修改作废状态 /// [HttpPost] public async Task UpdateAsync(PriceListUpdateDto input) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index ebf48587..45bba2cb 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -51,6 +51,16 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 导入 /// + /// + /// * 备件价格单筛选 Plant（客户编码） 为（1049）的数据 + /// * 客户零件号为 PartNo+6个空格+ES1+ES2 + /// * 根据 合同日期、客户编码、零件号、开始时间、结束时间分组导入（过滤重复数据） + /// 数据校验 + /// * 同一合同日期、客户编码、零件号 不能存在时间交集 + /// * 判断同一个零件号时间区间是否连续 + /// 作废旧合同日期的数据 + /// * 比较新导入的数据和数据库中老数据（同一零件号、旧合同日期的数据修改状态为作废） + /// [HttpPost] public async Task ImportAsync([FromForm] IFormFileCollection files, string version) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs index d8db4a4d..22c7245f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs @@ -11,7 +11,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs #if DEBUG [Table("TM_BJBMPT_OTHER_RECORD")] #else - [Table("EX_BJBMPT_JIS_RECORD")] + [Table("EX_BJBMPT_OTHER_RECORD")] #endif public class TM_BJBMPT_OTHER_RECORD { From 01d8fcf70ead9cc63f7db99804669b2e45d653e1 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 10:21:23 +0800 Subject: [PATCH 28/33] upload drone --- .drone.yml | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5fdf5504..e25ba812 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,43 +48,14 @@ steps: - mkdir publish - name: deploy - image: appleboy/drone-scp + image: cupcakearmy/drone-deploy settings: host: dev.ccwin-in.com port: 16085 - username: Administrator + user: Administrator password: Microsoft@2022 - command_timeout: 30m + sources: ./build/publish target: /d/BQ-JS/publish - source: build/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: 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 @@ -95,6 +66,6 @@ steps: password: Microsoft@2022 command_timeout: 10m script: - - cd D:/BQ-JS/publish + - cd /d/BQ-JS/publish - ./start.cmd - echo ok From 2586c116daec71e1798b4cbfa8c1f013388fd5b2 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 10:37:38 +0800 Subject: [PATCH 29/33] test drone --- .drone.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index e25ba812..1116b040 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,8 @@ steps: commands: - cd ./build - chmod 755 ./build.sh - - ./build.sh - # - mkdir publish + #- ./build.sh + - mkdir publish - 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 @@ -47,15 +47,26 @@ steps: - rm -rf publish - mkdir publish + # - name: deploy + # image: cupcakearmy/drone-deploy + # settings: + # host: dev.ccwin-in.com + # port: 16085 + # user: Administrator + # password: Microsoft@2022 + # sources: ./build/publish + # target: /d/BQ-JS/publish + - name: deploy - image: cupcakearmy/drone-deploy + image: appleboy/drone-ssh settings: host: dev.ccwin-in.com port: 16085 - user: Administrator + username: Administrator password: Microsoft@2022 - sources: ./build/publish - target: /d/BQ-JS/publish + command_timeout: 10m + script: + - rsync - name: start image: appleboy/drone-ssh From 0e516579402500d53776b96ec4a5744b22d381a0 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 10:40:42 +0800 Subject: [PATCH 30/33] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1116b040..1e467f36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -66,7 +66,7 @@ steps: password: Microsoft@2022 command_timeout: 10m script: - - rsync + - scp /drone/src/build/publish Administrator@dev.ccwin-in.com:/d/BQ-JS/publish - name: start image: appleboy/drone-ssh From a7640f454fdfe2917c2e4171381118dd48d60cf8 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 10:46:39 +0800 Subject: [PATCH 31/33] test drone --- .drone.yml | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1e467f36..dd7c2948 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,17 +19,17 @@ steps: - 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,16 +47,6 @@ steps: - rm -rf publish - mkdir publish - # - name: deploy - # image: cupcakearmy/drone-deploy - # settings: - # host: dev.ccwin-in.com - # port: 16085 - # user: Administrator - # password: Microsoft@2022 - # sources: ./build/publish - # target: /d/BQ-JS/publish - - name: deploy image: appleboy/drone-ssh settings: From ce0ea2c1781d1ac1e1de26c59db34adba74318ca Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 10:51:01 +0800 Subject: [PATCH 32/33] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dd7c2948..3f38874a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -56,7 +56,7 @@ steps: password: Microsoft@2022 command_timeout: 10m script: - - scp /drone/src/build/publish Administrator@dev.ccwin-in.com:/d/BQ-JS/publish + - scp -r /drone/src/build/publish Administrator@dev.ccwin-in.com:/d/BQ-JS/publish - name: start image: appleboy/drone-ssh From 306b6fc1d3d78a12488fafc834f1eaed5022ed14 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 11:08:49 +0800 Subject: [PATCH 33/33] test drone --- .drone.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3f38874a..11bcfef9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,15 +48,14 @@ steps: - mkdir publish - name: deploy - image: appleboy/drone-ssh + image: hypervtechnics/drone-sftp settings: host: dev.ccwin-in.com port: 16085 username: Administrator password: Microsoft@2022 - command_timeout: 10m - script: - - scp -r /drone/src/build/publish Administrator@dev.ccwin-in.com:/d/BQ-JS/publish + source: ./build/publish + target: /d/BQ-JS/publish - name: start image: appleboy/drone-ssh