Merge remote-tracking branch 'origin/S03-轨迹中台优化项' into test

src/SJZY.Track.Api/appsettings.Development.json

@@ -3,27 +3,40 @@
   "Logging": {
     "LogLevel": {
       "Default": "Debug",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Debug"
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "server=mysql-dev.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_dev_user;Pwd=818f83e5;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;",
+    "DefaultConnection": "server=mysql-dev.default.svc.cluster.local;Database=sjzy_track;Uid=sjzy_dev_user;Pwd=818f83e5;AllowLoadLocalInfile=true;SslMode=None;Charset=utf8mb4;"
+  },
+  "CAP": {
+    "FailedRetryCount": 0,
+    "FailedRetryInterval": 60,
+    "PrefetchCount": 1,
+    "ConsumerThreadCount": 2,
+    "UseDispatchingPerGroup": true,
+    "SucceedMessageExpiredAfter": 21600
   },
   "Redis": {
     "Host": "redis-dev.default.svc.cluster.local:6379",
     "Password": "gaVEHR3V7qiY",
     "MaxPoolSize": 1000,
     "Database": 6,
-    "Prefix": ""
+    "Prefix": "",
+    "IdleTimeout": 1000
   },
   "CorsPolicy": [
     ""
   ],
   "Swagger": {
     "IsEnable": true,
-    "ServiceUrl": "",
-    "JsonUrlPrefix": "", //转发目录前缀,部署服务器时需要配置  /kingmall
-    "ScanPrefix": [ "SJZY" ] //全局扫描程序集或xml文件时只加载以 SJZY 开头的内容
+    "ServiceUrl": "/trackApi",
+    "JsonUrlPrefix": "/trackApi",
+    //转发目录前缀,部署服务器时需要配置  /kingmall
+    "ScanPrefix": [
+      "SJZY"
+    ]
+    //全局扫描程序集或xml文件时只加载以 SJZY 开头的内容
   },
   "RabbitMQ": {
     "UserName": "sjzy",
@@ -31,14 +44,18 @@
     "HostName": "rabbitmq-dev.default.svc.cluster.local",
     "Port": 5672
   },
+  "Notice": {
+    "Webhook": "https://open.feishu.cn/open-apis/bot/v2/hook/fbe92f24-7f9f-41ea-a93a-63d855a03bc0",
+    "Title": "😭 轨迹中台开发环境异常"
+  },
   "Serilog": {
     "MinimumLevel": {
-      "Default": "Information",
+      "Default": "Debug",
       "Override": {
-        "System": "Warning",
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information",
-        "Microsoft.EntityFrameworkCore": "Information"
+        "System": "Debug",
+        "Microsoft": "Debug",
+        "Microsoft.Hosting.Lifetime": "Debug",
+        "Microsoft.EntityFrameworkCore": "Debug"
       }
     },
     "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ],
@@ -66,13 +83,18 @@
     "Base64PassPassword": "Basic ZWxhc3RpYzphZnlUZ21WYjhqcTY="
   },
   "RemoteServices": {
-    "UserCenter": {
-      "BaseUrl": "http://192.168.80.55:5020/"
-    },
     "InterfaceForward": {
-      "BaseUrl": "http://192.168.80.55:5041/", //开发环境80.55，测试环境80.57
-      "AppKey": "从接口通应用获取",
-      "AppSecret": "从接口通应用获取"
+      "BaseUrl": "http://interfaceapi-test.default.svc.cluster.local:5041/",
+      "AppKey": "BSI2302001",
+      "AppSecret": "ArJYL14XZneXpqvpq80wyi3h2hT918AX"
+    },
+    "UserCenter": {
+      "BaseUrl": "http://userapi-dev.default.svc.cluster.local:5020/"
     }
+  },
+  "Language": {
+    "SystemName": "Track",
+    "Index": 6,
+    "KeyPrefix": "language"
   }
 }

src/SJZY.Track.Application/EventHandlers/TrackPushEventHandler.cs

@@ -109,11 +109,11 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
         {
             if (@event.RetryNum < 3)
             {
+                @event.RetryNum++;
                 // 1, 2, 4min
                 await _capPublisher.PublishDelayAsync(
-                    TimeSpan.FromSeconds((1 << @event.RetryNum) * 60),
+                    TimeSpan.FromSeconds((1 << @event.RetryNum - 1) * RandomHelper.GetRandom(30, 60)),
                     GlobalConst.TrackPushSubscribe, @event);
-                @event.RetryNum++;
                 return;
             }
         }

src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs

@@ -161,6 +161,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             {
                 OptionType = track.Id.IsNullOrWhiteSpace() ? OptionType.新增 : OptionType.修改,
                 OrderId = order.OrderId,
+                OrderNo = order.OrderNo,
                 TrackStatus = track.TrackStatus,
                 TrackCode = track.TrackCode,
                 TrackContent = track.TrackContent,

src/SJZY.Track.Domain/SJZY.Track.Domain.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="SJZY.Expand.ABP.Core" Version="7.7.1" />
+        <PackageReference Include="SJZY.Expand.ABP.Core" Version="7.7.5"/>
         <PackageReference Include="SJZY.Expand.ElasticSearch" Version="7.0.17" />
     </ItemGroup>