From fe565aad796ca7ce83c0cfaa493abaad02d3d5a6 Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 20 Sep 2023 17:20:40 +0800 Subject: [PATCH 01/16] [CI SKIP] --- .../Services/Report/SaSeEdiCompareExportBaseService.cs | 1 - 1 file changed, 1 deletion(-) 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 e7ed0253..af8176a3 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,7 +181,6 @@ 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 afc79357649ee5e11f64ac7112e3adc4f6234fba Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 17:25:00 +0800 Subject: [PATCH 02/16] test drone --- .../SettleAccount.HttpApi.Host.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index fad77652..041d8780 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -97,9 +97,15 @@ PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + From afb252bc596878375ba359d6d5b77b95dfd76b9a Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 17:39:33 +0800 Subject: [PATCH 03/16] test drone --- .drone.yml | 5 ++--- .../host/SettleAccount.HttpApi.Host/.gitattributes | 3 +++ .../SettleAccount.HttpApi.Host.csproj | 3 --- .../host/SettleAccount.HttpApi.Host/start.sh | 14 -------------- .../host/SettleAccount.HttpApi.Host/stop.sh | 3 --- 5 files changed, 5 insertions(+), 23 deletions(-) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh diff --git a/.drone.yml b/.drone.yml index 0ce8222c..abf705eb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,8 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS/publish - cmd.exe - - stop.sh - - exit + - stop.cmd - sleep 3s - cd .. - rm -rf publish @@ -74,7 +73,7 @@ steps: script: - cd /d/BQ-JS/publish - cmd.exe - - start.sh + - start.cmd # - name: deploy-scp # image: appleboy/drone-scp diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes new file mode 100644 index 00000000..6c85ea2e --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes @@ -0,0 +1,3 @@ +* text=auto eol=lf +*.{cmd,[cC][mM][dD]} text eol=lf +*.{bat,[bB][aA][tT]} text eol=lf diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index 041d8780..58a95c92 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -103,9 +103,6 @@ PreserveNewest - - PreserveNewest - diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh deleted file mode 100644 index b85be9a6..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -@echo off - -tasklist|find /i "SettleAccount.HttpApi.Host.exe" - -if %errorlevel% == 0 ( - exit -) - - -cd /d %~dp0 - -%1 start mshta vbscript:createobject("wscript.shell").run("""%~0"" ::",0)(window.close)&&exit - -start /b SettleAccount.HttpApi.Host.exe --urls http://*:16082 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh deleted file mode 100644 index 22032ba8..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -taskkill /im SettleAccount.HttpApi.Host.exe /f /t From 00fa7efa9f7d968a2e6372b20cb6da3638bb3208 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 17:47:06 +0800 Subject: [PATCH 04/16] test drone --- .../host/SettleAccount.HttpApi.Host/.gitattributes | 3 --- .../host/SettleAccount.HttpApi.Host/start.cmd | 7 ------- 2 files changed, 10 deletions(-) delete mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes deleted file mode 100644 index 6c85ea2e..00000000 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -* text=auto eol=lf -*.{cmd,[cC][mM][dD]} text eol=lf -*.{bat,[bB][aA][tT]} text eol=lf diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd index b85be9a6..6c802e62 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd @@ -1,12 +1,5 @@ @echo off -tasklist|find /i "SettleAccount.HttpApi.Host.exe" - -if %errorlevel% == 0 ( - exit -) - - cd /d %~dp0 %1 start mshta vbscript:createobject("wscript.shell").run("""%~0"" ::",0)(window.close)&&exit From 0ed9c7ec7e3c6ddb4fe2cb89961de6205d692b8f Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 18:35:16 +0800 Subject: [PATCH 05/16] test drone --- .drone.yml | 6 +----- code/src/.editorconfig | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index abf705eb..75a3ac5d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,11 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS/publish - cmd.exe - - stop.cmd - - sleep 3s - - cd .. - - rm -rf publish - - mkdir -p publish + - stop.cmd&&cd ..&&rm -rf publish&&mkdir -p publish - name: deploy-ftp image: cschlosser/drone-ftps diff --git a/code/src/.editorconfig b/code/src/.editorconfig index 5de070fc..04b26933 100644 --- a/code/src/.editorconfig +++ b/code/src/.editorconfig @@ -8,6 +8,9 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +[*.cmd] +end_of_line = crlf + [*.md] trim_trailing_whitespace = false From a0b1f42e538172e8d12f9b539946b5d6f7f6889f Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 18:44:42 +0800 Subject: [PATCH 06/16] test drone --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 75a3ac5d..2aa9bafd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,9 +41,9 @@ steps: command_timeout: 10m script: - mkdir -p /d/BQ-JS/publish - - cd /d/BQ-JS/publish + - cd /d/BQ-JS - cmd.exe - - stop.cmd&&cd ..&&rm -rf publish&&mkdir -p publish + - cd publish&&stop.cmd&&cd ..&&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From 366654ba04f73275de2a743ca0cf3de2cb9cae02 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 18:53:11 +0800 Subject: [PATCH 07/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2aa9bafd..47b6a666 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&&stop.cmd&&cd ..&&rm -rf publish + - cd publish&stop.cmd&cd ..&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From 366323a0111d1be3c8c2e2cc2fff1142abccb152 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:00:57 +0800 Subject: [PATCH 08/16] test drone --- .drone.yml | 24 +++++++++---------- .../SettleAccount.HttpApi.Host/Program.cs | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 47b6a666..32b280ef 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,17 +19,17 @@ steps: - echo ${DRONE_COMMIT_MESSAGE}>./publish/version.txt - dotnet nuget locals global-packages --list - - 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 @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&stop.cmd&cd ..&rm -rf publish + - cd publish&stop.cmd&sleep 3&cd ..&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs index 8e90d366..44f1a678 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs @@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount Log.Logger = new LoggerConfiguration() .WriteTo.Async(c => c.Console()) - .WriteTo.Async(c => c.File("Logs/logs.txt" + .WriteTo.Async(c => c.File("../Logs/logs.txt" , rollingInterval: RollingInterval.Day , rollOnFileSizeLimit: true , fileSizeLimitBytes: 30 * 1024 * 1024)) From cf97cde3af77c9d3c0d97687f0df377f04b4bdbe Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:09:25 +0800 Subject: [PATCH 09/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 32b280ef..8f6a6fa1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&stop.cmd&sleep 3&cd ..&rm -rf publish + - cd publish&&stop.cmd&&sleep 3&&cd ..&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From 2f1f0703418875860d68fed5f77995ab07328e36 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:15:56 +0800 Subject: [PATCH 10/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8f6a6fa1..e48a26ee 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&&stop.cmd&&sleep 3&&cd ..&rm -rf publish + - cd publish&&stop.cmd&&cd ..&&sleep 3&&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From 2e3e2bb3bac8fd08573697a3f5ed53e672707c39 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:28:12 +0800 Subject: [PATCH 11/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e48a26ee..7f760df5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&&stop.cmd&&cd ..&&sleep 3&&rm -rf publish + - "cd publish&&stop.cmd&&cd ..&&sleep 3&&rm -rf publish" - name: deploy-ftp image: cschlosser/drone-ftps From aa4ddd5aad275fe64c3f09b9e17d98096d9cc011 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:36:51 +0800 Subject: [PATCH 12/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7f760df5..802c3474 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - "cd publish&&stop.cmd&&cd ..&&sleep 3&&rm -rf publish" + - cd publish&&stop.cmd&&sleep 3&&cd ..&&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From 10a62949cb20cf5f92cf385f952fd996bed9e3dd Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:47:23 +0800 Subject: [PATCH 13/16] test drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 802c3474..8468c717 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: - mkdir -p /d/BQ-JS/publish - cd /d/BQ-JS - cmd.exe - - cd publish&&stop.cmd&&sleep 3&&cd ..&&rm -rf publish + - cd publish&&.\stop.cmd&&sleep 3&&cd ..&&rm -rf publish - name: deploy-ftp image: cschlosser/drone-ftps From c17f4685db3e3efc895bc8c31e2a6fda5db21183 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 19:54:30 +0800 Subject: [PATCH 14/16] test drone --- .drone.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8468c717..b1702801 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,9 +41,12 @@ steps: command_timeout: 10m script: - mkdir -p /d/BQ-JS/publish - - cd /d/BQ-JS - - cmd.exe - - cd publish&&.\stop.cmd&&sleep 3&&cd ..&&rm -rf publish + - cd /d/BQ-JS/publish + - ./stop.cmd + - sleep 3 + - cd .. + - rm -rf publish + - mkdir -p publish - name: deploy-ftp image: cschlosser/drone-ftps @@ -68,8 +71,7 @@ steps: command_timeout: 10m script: - cd /d/BQ-JS/publish - - cmd.exe - - start.cmd + - ./start.cmd # - name: deploy-scp # image: appleboy/drone-scp From 6773b1fb1e9385472e01fbb22d8839f06a5fcf9e Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 20 Sep 2023 20:24:26 +0800 Subject: [PATCH 15/16] update drone --- .drone.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index b1702801..4186a0fb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,17 +19,17 @@ steps: - echo ${DRONE_COMMIT_MESSAGE}>./publish/version.txt - dotnet nuget locals global-packages --list - # - 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 From bf4e43077fe7e03694e80aba7468a1813e468915 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 21 Sep 2023 08:39:44 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.HttpApi.Host.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj index 58a95c92..4e8c7a47 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj @@ -103,6 +103,9 @@ PreserveNewest + + PreserveNewest +