diff --git a/.drone.yml b/.drone.yml
index 0ce8222c..4186a0fb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,10 +42,8 @@ steps:
script:
- mkdir -p /d/BQ-JS/publish
- cd /d/BQ-JS/publish
- - cmd.exe
- - stop.sh
- - exit
- - sleep 3s
+ - ./stop.cmd
+ - sleep 3
- cd ..
- rm -rf publish
- mkdir -p publish
@@ -73,8 +71,7 @@ steps:
command_timeout: 10m
script:
- cd /d/BQ-JS/publish
- - cmd.exe
- - start.sh
+ - ./start.cmd
# - name: deploy-scp
# image: appleboy/drone-scp
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
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))
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..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
@@ -97,9 +97,15 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
+
+ PreserveNewest
+
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
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
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())
{