NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="fengwo.org" value="http://nuget.fengwo.com/v3/index.json" />
+    <add key="fengwo.org" value="http://110.188.24.182:5555/v3/index.json" />
   </packageSources>
 </configuration>

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM  mcr.microsoft.com/dotnet/aspnet:6.0
+FROM  mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /app
 COPY out/ .
 ENTRYPOINT ["dotnet", "Hotline.Api.dll"]

src/Hotline.Api/Hotline.Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>

src/Hotline.Api/config/appsettings.Development.json

@@ -8,8 +8,8 @@
     "Expired": 86300 //认证过期时间（秒）
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
-    "Redis": "192.168.100.223",
+    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+    "Redis": "110.188.24.182",
     "MongoDB": "mongodb://192.168.100.121:27017"
   },
   "Swagger": true,
@@ -45,16 +45,16 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": false,
-    "ApplySeed": false
+    "ApplyDbMigrations": true,
+    "ApplySeed": true
   },
   "MqConfiguration": {
-    "DbConnectionString": "PORT=5432;DATABASE=fwcap;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
+    "DbConnectionString": "PORT=5432;DATABASE=fwmq;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
     "UseDashBoard": true,
     "RabbitMq": {
       "UserName": "dev",
       "Password": "123456",
-      "HostName": "192.168.100.217",
+      "HostName": "110.188.24.182",
       "VirtualHost": "fwt-master"
     }
   }

src/Hotline.Api/config/appsettings.json

@@ -8,8 +8,8 @@
     "Expired": 1440 //认证过期时间（秒）
   },
   "ConnectionStrings": {
-    "Hotline": " PORT=5432;DATABASE=hotline;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
-    "Redis": "192.168.100.223",
+    "Hotline": " PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+    "Redis": "110.188.24.182",
     "MongoDB": "mongodb://192.168.100.121:27017"
   },
   "Swagger": true,
@@ -49,12 +49,12 @@
     "ApplySeed": false
   },
   "MqConfiguration": {
-    "DbConnectionString": "PORT=5432;DATABASE=fwcap;HOST=192.168.100.121;PASSWORD=fengwo11!!;USER ID=dev;",
+    "DbConnectionString": "PORT=5432;DATABASE=fwmq;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
     "UseDashBoard": true,
     "RabbitMq": {
       "UserName": "dev",
       "Password": "123456",
-      "HostName": "192.168.100.217",
+      "HostName": "110.188.24.182",
       "VirtualHost": "fwt-master"
     }
   }

src/Hotline.Api/config/appsettings.shared.json

@@ -26,22 +26,22 @@
           "theme": "Serilog.Sinks.SystemConsole.Themes.ConsoleTheme::None, Serilog.Sinks.Console"
         }
       },
-      {
-        "Name": "GrafanaLoki",
-        "Args": {
-          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext} [{TraceId}]{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
-          "uri": "http://192.168.100.217:3100",
-          "labels": [
-            {
-              "key": "app",
-              "value": "hotline"
-            }
-          ],
-          "propertiesAsLabels": [
-            "fwhl"
-          ]
-        }
-      }
+      //{
+      //  "Name": "GrafanaLoki",
+      //  "Args": {
+      //    "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext} [{TraceId}]{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
+      //    "uri": "http://192.168.100.217:3100",
+      //    "labels": [
+      //      {
+      //        "key": "app",
+      //        "value": "hotline"
+      //      }
+      //    ],
+      //    "propertiesAsLabels": [
+      //      "fwhl"
+      //    ]
+      //  }
+      //}
       //{
       //  "Name": "Exeptionless",
       //  "Args": {

src/Hotline.Application.Contracts/Hotline.Application.Contracts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Hotline.Application/Hotline.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
     <PackageReference Include="IdentityModel" Version="6.0.0" />
     <PackageReference Include="XC.RSAUtil" Version="1.3.6" />
-    <PackageReference Include="XF.Utility.AppIdentityModel" Version="1.0.3" />
+    <PackageReference Include="XF.Utility.AppIdentityModel" Version="1.0.4" />
   </ItemGroup>
 
   <ItemGroup>

src/Hotline.NewRock/Hotline.NewRock.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Hotline.Repository.SqlSugar/Hotline.Repository.SqlSugar.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/Hotline.Share/Hotline.Share.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="MediatR.Contracts" Version="1.0.1" />
-    <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.2" />
+    <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.3" />
   </ItemGroup>
 
 </Project>

src/Hotline/Hotline.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -20,7 +20,7 @@
     <PackageReference Include="Mapster" Version="7.3.0" />
     <PackageReference Include="MediatR" Version="12.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="XF.Utility.MQ" Version="1.0.4" />
+    <PackageReference Include="XF.Utility.MQ" Version="1.0.5" />
   </ItemGroup>
 
   <ItemGroup>

src/NewRock.Sdk/NewRock.Sdk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/XF.Domain.Repository/XF.Domain.Repository.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="SqlSugarCore" Version="5.1.3.52-preview04" />
-    <PackageReference Include="XF.Utility.SequentialId" Version="1.0.1" />
+    <PackageReference Include="XF.Utility.SequentialId" Version="1.0.2" />
   </ItemGroup>
 
   <ItemGroup>

src/XF.Domain/XF.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -15,7 +15,7 @@
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="2.3.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" />
-    <PackageReference Include="XF.Utility.UnifyResponse" Version="1.0.5" />
+    <PackageReference Include="XF.Utility.UnifyResponse" Version="1.0.6" />
   </ItemGroup>
 
 </Project>

src/XF.EasyCaching/XF.EasyCaching.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>