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

.drone.yml

@@ -42,10 +42,8 @@ steps:
       script:
         - mkdir -p /d/BQ-JS/publish
         - cd /d/BQ-JS/publish
-        - cmd.exe
+        - ./stop.cmd
-        - stop.sh
+        - sleep 3
-        - exit
-        - sleep 3s
         - cd ..
         - rm -rf publish
         - mkdir -p publish
@@ -73,8 +71,7 @@ steps:
       command_timeout: 10m
       script:
         - cd /d/BQ-JS/publish
-        - cmd.exe
+        - ./start.cmd
-        - start.sh
 
   # - name: deploy-scp
   #   image: appleboy/drone-scp

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
 

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))

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -97,9 +97,15 @@
     <None Update="start.cmd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="start.sh">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="stop.cmd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="tempkey.jwk">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.sh

@@ -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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/stop.sh

@@ -1,3 +0,0 @@
-@echo off
-
-taskkill /im SettleAccount.HttpApi.Host.exe /f /t

code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeEdiCompareExportBaseService.cs

@@ -181,7 +181,6 @@ namespace SettleAccount.Job.Services.Report
         /// </summary>
         public virtual void HandleSaDetailsMain<T>(List<SaSeEdiCompareDiff> 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())
             {