Browse Source

Merge branch 'master' of http://git.12345lm.cn/Fengwo/push

TANG JIANG 1 year ago
parent
commit
2cffe0a822

+ 1 - 1
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.12345lm.cn/v3/index.json" />
+    <add key="fengwo.org" value="http://110.188.24.182:5555/v3/index.json" />
   </packageSources>
 </configuration>

+ 5 - 1
src/Push.Share/Push.Share.csproj

@@ -4,11 +4,15 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Version>1.0.0</Version>
+        <Authors>fw.dev</Authors>
+        <Company>fw</Company>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.4" />
-      <PackageReference Include="XF.Utility.MQ" Version="1.0.5" />
+      <PackageReference Include="XF.Utility.MQ" Version="1.0.9" />
     </ItemGroup>
 
 </Project>

+ 1 - 1
src/yibin/Push.YiBin.Application/EventSubscriber.cs

@@ -5,7 +5,7 @@ using XF.Domain.Dependency;
 
 namespace Push.YiBin.Application;
 
-public class EventSubscriber : ICapSubscribe, IScopeDependency
+public class EventSubscriber : ICapSubscribe, ITransientDependency
 {
     private readonly IPushDomainService _pushDomainService;
 

+ 8 - 2
src/yibin/Push.YiBin.Host/Controllers/OriginController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Push.YiBin.Host.Controllers
 {
@@ -6,6 +7,11 @@ namespace Push.YiBin.Host.Controllers
     [Route("api/v1/[controller]")]
     public class OriginController : ControllerBase
     {
-
+        [HttpGet("test")]
+        [AllowAnonymous]
+        public string Test()
+        {
+            return DateTime.Now.ToString();
+        }
     }
 }

+ 0 - 37
src/yibin/Push.YiBin.Host/config/appsettings.Development.json

@@ -28,34 +28,6 @@
   "Cors": {
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
-  "IdentityConfiguration": {
-    "Password": {
-      "RequiredLength": 8,
-      "RequireNonAlphanumeric": true,
-      "RequireLowercase": true,
-      "RequireUppercase": true
-    },
-    "User": {
-      "RequireUniqueEmail": false
-    },
-    "SignIn": {
-      "RequireConfirmedAccount": false
-    },
-    "Lockout": {
-      "MaxFailedAccessAttempts": 5,
-      "DefaultLockoutTimeSpan": "00:10:00"
-    },
-    "Account": {
-      "DefaultPassword": "Fwkj@789"
-    },
-    "Jwt": {
-      "SecretKey": "e660d04ef1d3410798c953f5d7b8a4e1",
-      "Issuer": "hotline_server",
-      "Audience": "hotline",
-      "Scope": "hotline_api",
-      "Expired": 86400 //seceonds
-    }
-  },
   "DatabaseConfiguration": {
     "ApplyDbMigrations": false,
     "ApplySeed": false
@@ -69,14 +41,5 @@
       "HostName": "110.188.24.182",
       "VirtualHost": "fwt-master"
     }
-  },
-  "FwClient": {
-    "ClientId": "hotline",
-    "ClientSecret": "08db29cc-0da0-4adf-850c-1b2689bd535d"
-  },
-  "ConfigCenter": {
-    "ServerAddresses": [ "http://110.188.24.28:8848" ],
-    "Namespace": "17503980-9b0d-4d3e-8e35-c842c41fb888", //debug
-    "ServiceName": "hotline"
   }
 }

+ 0 - 37
src/yibin/Push.YiBin.Host/config/appsettings.json

@@ -28,34 +28,6 @@
   "Cors": {
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
-  "IdentityConfiguration": {
-    "Password": {
-      "RequiredLength": 8,
-      "RequireNonAlphanumeric": true,
-      "RequireLowercase": true,
-      "RequireUppercase": true
-    },
-    "User": {
-      "RequireUniqueEmail": false
-    },
-    "SignIn": {
-      "RequireConfirmedAccount": false
-    },
-    "Lockout": {
-      "MaxFailedAccessAttempts": 5,
-      "DefaultLockoutTimeSpan": "00:10:00"
-    },
-    "Account": {
-      "DefaultPassword": "Fwkj@789"
-    },
-    "Jwt": {
-      "SecretKey": "e660d04ef1d3410798c953f5d7b8a4e1",
-      "Issuer": "hotline_server",
-      "Audience": "hotline",
-      "Scope": "hotline_api",
-      "Expired": 86400 //seceonds
-    }
-  },
   "DatabaseConfiguration": {
     "ApplyDbMigrations": false,
     "ApplySeed": false
@@ -69,14 +41,5 @@
       "HostName": "110.188.24.182",
       "VirtualHost": "fwt-master"
     }
-  },
-  "FwClient": {
-    "ClientId": "hotline",
-    "ClientSecret": "08db29cc-0da0-4adf-850c-1b2689bd535d"
-  },
-  "ConfigCenter": {
-    "ServerAddresses": [ "http://110.188.24.28:8848" ],
-    "Namespace": "17503980-9b0d-4d3e-8e35-c842c41fb888", //debug
-    "ServiceName": "hotline"
   }
 }