Skip to content

Commit 87b5a33

Browse files
luoyunchongluoyunchong
committed
删除ids4
1 parent 1de8ce7 commit 87b5a33

File tree

13 files changed

+8
-164
lines changed

13 files changed

+8
-164
lines changed

‎LinCms.sln‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Application", "src\L
3636
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Core", "src\LinCms.Core\LinCms.Core.csproj", "{45F73A33-9E44-4DCF-A104-0D475FF9CA1E}"
3838
EndProject
39-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "identityserver4", "identityserver4", "{3EF28FC9-9518-401A-9DCC-FCCB4C72511F}"
40-
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.IdentityServer4", "identityserver4\LinCms.IdentityServer4\LinCms.IdentityServer4.csproj", "{37084D54-1A11-4C04-A091-EB502BB49B19}"
42-
EndProject
4339
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinCms.Application.Contracts", "src\LinCms.Application.Contracts\LinCms.Application.Contracts.csproj", "{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}"
4440
EndProject
4541
Global
@@ -72,10 +68,6 @@ Global
7268
{45F73A33-9E44-4DCF-A104-0D475FF9CA1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
7369
{45F73A33-9E44-4DCF-A104-0D475FF9CA1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
7470
{45F73A33-9E44-4DCF-A104-0D475FF9CA1E}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{37084D54-1A11-4C04-A091-EB502BB49B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{37084D54-1A11-4C04-A091-EB502BB49B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{37084D54-1A11-4C04-A091-EB502BB49B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{37084D54-1A11-4C04-A091-EB502BB49B19}.Release|Any CPU.Build.0 = Release|Any CPU
7971
{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8072
{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Debug|Any CPU.Build.0 = Debug|Any CPU
8173
{70E47B1C-17F2-4F9A-9EF6-4F94548E506D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,7 +83,6 @@ Global
9183
{A769DA45-FC9F-452F-A591-635C101569C8} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
9284
{936A0FF9-135E-4A3F-AE4D-17C3FA78D961} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
9385
{45F73A33-9E44-4DCF-A104-0D475FF9CA1E} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
94-
{37084D54-1A11-4C04-A091-EB502BB49B19} = {3EF28FC9-9518-401A-9DCC-FCCB4C72511F}
9586
{70E47B1C-17F2-4F9A-9EF6-4F94548E506D} = {1783DEB0-9AA8-44D0-90A8-19D16FE397E7}
9687
EndGlobalSection
9788
GlobalSection(ExtensibilityGlobals) = postSolution

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ Lin 已经内置了 CMS 中最为常见的需求：用户管理、权限管理
8383
- 数据库相关：ORM:[FreeSql](https://github.com/dotnetcore/FreeSql)+DataBase:MySQL5.6/MsSqlServer/Oracle/Sqlite/PostgreSQL
8484
- ASP.NET Core + WebAPI + RESTful
8585
- 简化对象映射：[AutoMapper](https://automapper.org/)
86-
- 身份认证框架：[IdentityServer4](https://github.com/IdentityServer/IdentityServer4)
8786
- Json Web令牌:JWT
8887
- 文档API：Swagger([Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore))
8988
- RapiDoc([RapiDoc](https://github.com/luoyunchong/IGeekFan.AspNetCore.RapiDoc))
@@ -115,8 +114,6 @@ Lin 已经内置了 CMS 中最为常见的需求：用户管理、权限管理
115114
- Clean Code（代码整洁之道）
116115

117116
### 分层结构（Layers）
118-
- identityserver4
119-
- LinCms.IdentityServer4:使用id4授权登录
120117
- src
121118
- LinCms.Web：接口API（ASP.NET Core)
122119
- LinCms.Application:应用服务

‎docs/README.md‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,11 @@
55
sudo /etc/init.d/supervisor restart
66
```
77

8-
98
### 项目介绍
109

11-
12-
identityserver4:Oauth2授权登录
13-
- 项目 identityserver4/LinCms.IdentityServer4
14-
15-
运行后，可打开[https://localhost:5003/.well-known/openid-configuration](https://localhost:5003/.well-known/openid-configuration)
16-
17-
token_endpoint:
18-
19-
20-
2110
### 本地
2211
- cap Dashboard [https://localhost:5001/cap](https://localhost:5001/cap)
2312

24-
25-
26-
## 发布
27-
- lincms-identityserver4 [http://111.231.197.142:5011/swagger/index.html](http://111.231.197.142:5011/swagger/index.html)
28-
- http://111.231.197.142:5010/.well-known/openid-configuration
29-
- lincms-web [http://111.231.197.142:5012/swagger/index.html](http://111.231.197.142:5012/swagger/index.html)
30-
- cap [http://111.231.197.142:5012/cap](http://111.231.197.142:5012/cap)
31-
- Docker管理Portainer [http://47.106.80.39:9000/#/home](http://111.231.197.142:9000/#/home)
32-
- [http://111.231.197.142:5005/healthchecks-ui#/healthchecks](http:/111.231.197.142:5005/healthchecks-ui#/healthchecks)
33-
3413
### 第三方账号登录
3514
- https://localhost:5001/cms/oauth2/signin?provider=Gitee&redirectUrl=https://vvlog.igeekfan.cn/
3615
- https://localhost:5001/cms/oauth2/signin?provider=GitHub&redirectUrl=https://vvlog.igeekfan.cn/

‎src/LinCms.Application.Contracts/LinCms.Application.Contracts.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
</ItemGroup>
2424
<ItemGroup>
2525
<Compile Remove="Constracts\**" />
26+
<Compile Remove="v1\**" />
2627
<EmbeddedResource Remove="Constracts\**" />
28+
<EmbeddedResource Remove="v1\**" />
2729
<None Remove="Constracts\**" />
30+
<None Remove="v1\**" />
2831
</ItemGroup>
2932

3033
<ItemGroup>
@@ -34,8 +37,4 @@
3437
<ItemGroup>
3538
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3639
</ItemGroup>
37-
38-
<ItemGroup>
39-
<Folder Include="v1\" />
40-
</ItemGroup>
4140
</Project>

‎src/LinCms.Application/Cms/Account/IdentityServer4Service.cs‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎src/LinCms.Application/Cms/Account/JwtTokenService.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
namespace LinCms.Cms.Account;
1414

15-
[DisableConventionalRegistration]
1615
public class JwtTokenService(IUserRepository userRepository, ILogger<JwtTokenService> logger,
1716
IUserIdentityService userIdentityService, ITokenManager tokenManager)
1817
: ITokenService

‎src/LinCms.Application/LinCms.Application.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.1.2" />
1717
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="8.1.2" />
1818
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.1.2" />
19-
<PackageReference Include="IdentityServer4" Version="4.1.2" />
2019
<PackageReference Include="IdentityModel" Version="7.0.0" />
21-
<PackageReference Include="IGeekFan.Localization.FreeSql" Version="0.0.540" />
2220
<PackageReference Include="MQiniu.Core" Version="1.0.1" />
2321
<PackageReference Include="FreeRedis" Version="1.2.15" />
2422
<PackageReference Include="FreeRedis.DistributedCache" Version="1.2.5" />

‎src/LinCms.Core/Entities/LinUserIdentity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public LinUserIdentity(string identityType, string identifier, string credential
2828
}
2929

3030
/// <summary>
31-
///认证类型， Password，GitHub、QQ、Weixin等
31+
///认证类型， Password,GitHub,Gitee
3232
/// </summary>
3333
[Column(StringLength = 20)]
3434
public string IdentityType { get; set; }

‎src/LinCms.Core/LinCms.Core.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/LinCms.Web/Controllers/Cms/AccountController.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ public class AccountController : ApiControllerBase
3737
private readonly CaptchaOption _loginCaptchaOption;
3838
private readonly ICaptchaManager _captchaManager;
3939
private readonly RedisClient _redisClient;
40-
public AccountController(IComponentContext componentContext, IConfiguration configuration, IAccountService accountService, IAuditBaseRepository<BlackRecord> blackRecordRepository, IUserService userService, IOptionsMonitor<CaptchaOption> loginCaptchaOption, ICaptchaManager captchaManager, RedisClient redisClient)
40+
public AccountController(ITokenService tokenService, IConfiguration configuration, IAccountService accountService, IAuditBaseRepository<BlackRecord> blackRecordRepository, IUserService userService, IOptionsMonitor<CaptchaOption> loginCaptchaOption, ICaptchaManager captchaManager, RedisClient redisClient)
4141
{
42-
bool isIdentityServer4 = configuration.GetSection("Service:IdentityServer4").Value?.ToBoolean() ?? false;
43-
_tokenService = componentContext.ResolveNamed<ITokenService>(isIdentityServer4 ? nameof(IdentityServer4Service) : nameof(JwtTokenService));
42+
_tokenService = tokenService;
4443
_accountService = accountService;
4544
_blackRecordRepository = blackRecordRepository;
4645
_loginCaptchaOption = loginCaptchaOption.CurrentValue;

0 commit comments

Comments
 (0)