Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev

web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj

@@ -19,6 +19,10 @@
     <Content Remove="C:\Users\Dai Zan\.nuget\packages\volo.abp.aspnetcore\8.3.3\contentFiles\any\net8.0\Volo.Abp.AspNetCore.abppkg.analyze.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Plugins\ignore.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="9.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.0" />
@@ -52,6 +56,10 @@
     <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />-->
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Include="Plugins\ignore.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\modules\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj" />
     <ProjectReference Include="..\..\services\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj" />

web/JiShe.CollectBus.Host/appsettings.Production.json

@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
     "Default": "mongodb://admin:4mFmPTTB8tn6aI@47.110.62.104:27017,47.110.53.196:27017,47.110.60.222:27017/JiSheCollectBus?authSource=admin&maxPoolSize=400&minPoolSize=10&waitQueueTimeoutMS=5000",
-    "PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
+    "PrepayDB": "server=rm-m5el3d1u1k0wzk70n2o.sqlserver.rds.aliyuncs.com,3433;database=jishe.sysdb;uid=v3sa;pwd=JiShe123;Encrypt=False;Trust Server Certificate=False",
-    "EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
+    "EnergyDB": "server=rm-wz9hw529i3j1e3b5fbo.sqlserver.rds.aliyuncs.com,3433;database=db_energy;uid=yjdb;pwd=Kdjdhf+9*7ad222LL;Encrypt=False;Trust Server Certificate=False"
   },
   "Redis": {
     "Configuration": "47.110.60.222:6379,password=3JBGfyhTaD46nS,syncTimeout=30000,abortConnect=false,connectTimeout=30000,allowAdmin=true",

web/JiShe.CollectBus.Host/appsettings.json

@@ -1,39 +1,4 @@
 {
-  "Serilog": {
-    "Using": [
-      "Serilog.Sinks.Console",
-      "Serilog.Sinks.File"
-    ],
-    "MinimumLevel": {
-      "Default": "Warning",
-      "Override": {
-        "Microsoft": "Warning",
-        "Volo.Abp": "Warning",
-        "Hangfire": "Warning",
-        "DotNetCore.CAP": "Warning",
-        "Serilog.AspNetCore": "Information",
-        "Microsoft.EntityFrameworkCore": "Warning",
-        "Microsoft.AspNetCore": "Warning",
-        "Microsoft.AspNetCore.Diagnostics.HealthChecks": "Warning"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "Console"
-      },
-      {
-        "Name": "File",
-        "Args": {
-          "path": "logs/logs-.txt",
-          "rollingInterval": "Day"
-        }
-      }
-    ]
-  },
-  "App": {
-    "SelfUrl": "http://localhost:44315",
-    "CorsOrigins": "http://localhost:4200,http://localhost:3100"
-  },
   "ConnectionStrings": {
     "Default": "mongodb://mongo_PmEeF3:lixiao1980@192.168.5.9:27017/JiSheCollectBus?authSource=admin&maxPoolSize=400&minPoolSize=10&waitQueueTimeoutMS=5000",
     "Kafka": "192.168.5.9:29092,192.168.5.9:39092,192.168.5.9:49092",
@@ -46,30 +11,6 @@
     "DefaultDB": "14",
     "HangfireDB": "13"
   },
-  "Jwt": {
-    "Audience": "JiShe.CollectBus",
-    "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
-    "Issuer": "JiShe.CollectBus",
-    "ExpirationTime": 2
-  },
-  "HealthChecks": {
-    "IsEnable": true,
-    "HealthCheckDatabaseName": "HealthChecks",
-    "EvaluationTimeInSeconds": 10,
-    "MinimumSecondsBetweenFailureNotifications": 60
-  },
-  "SwaggerConfig": [
-    {
-      "GroupName": "Basic",
-      "Title": "【后台管理】基础模块",
-      "Version": "V1"
-    },
-    {
-      "GroupName": "Business",
-      "Title": "【后台管理】业务模块",
-      "Version": "V1"
-    }
-  ],
   "Kafka": {
     "BootstrapServers": "192.168.5.9:29092,192.168.5.9:39092,192.168.5.9:49092",
     "EnableFilter": true,
@@ -140,6 +81,65 @@
       "DefaultIdempotence": true
     }
   },
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.Console",
+      "Serilog.Sinks.File"
+    ],
+    "MinimumLevel": {
+      "Default": "Warning",
+      "Override": {
+        "Microsoft": "Warning",
+        "Volo.Abp": "Warning",
+        "Hangfire": "Warning",
+        "DotNetCore.CAP": "Warning",
+        "Serilog.AspNetCore": "Information",
+        "Microsoft.EntityFrameworkCore": "Warning",
+        "Microsoft.AspNetCore": "Warning",
+        "Microsoft.AspNetCore.Diagnostics.HealthChecks": "Warning"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console"
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "logs/logs-.txt",
+          "rollingInterval": "Day"
+        }
+      }
+    ]
+  },
+  "App": {
+    "SelfUrl": "http://localhost:44315",
+    "CorsOrigins": "http://localhost:4200,http://localhost:3100"
+  },
+  "Jwt": {
+    "Audience": "JiShe.CollectBus",
+    "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
+    "Issuer": "JiShe.CollectBus",
+    "ExpirationTime": 2
+  },
+  "HealthChecks": {
+    "IsEnable": false,
+    "HealthCheckDatabaseName": "HealthChecks",
+    "EvaluationTimeInSeconds": 10,
+    "MinimumSecondsBetweenFailureNotifications": 60
+  },
+  "SwaggerConfig": [
+    {
+      "GroupName": "Basic",
+      "Title": "【后台管理】基础模块",
+      "Version": "V1"
+    },
+    {
+      "GroupName": "Business",
+      "Title": "【后台管理】业务模块",
+      "Version": "V1"
+    }
+  ],
   "ServerApplicationOptions": {
     "ServerTagName": "JiSheCollectBus99",
     "SystemType": "Energy",