Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit ffa37af

Browse files
brunobritodevbrunobritodev
committed
updating Quickstart
1 parent 7182766 commit ffa37af

File tree

55 files changed

+1813
-15461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1813
-15461
lines changed

‎.dockerignore‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
1-
[Oo]bj/
2-
[Bb]in/
3-
TestResults/
4-
.nuget/
5-
_ReSharper.*/
6-
packages/
7-
artifacts/
8-
PublishProfiles/
9-
*.user
10-
*.suo
11-
*.cache
12-
*.docstates
13-
_ReSharper.*
14-
nuget.exe
15-
*net45.csproj
16-
*k10.csproj
17-
*.psess
18-
*.vsp
19-
*.pidb
20-
*.userprefs
21-
*DS_Store
22-
*.ncrunchsolution
23-
*.*sdf
24-
*.ipch
25-
.vs/
26-
project.lock.json
1+
*.dockerignore
2+
*.env
3+
.git
4+
*.gitignore
5+
**/.vs
6+
**/.vscode
7+
docker-compose.yml
8+
docker-compose.*.yml
9+
**/*log*.txt
10+
**/*log*.log
11+
**/bin
12+
**/obj
13+
**/node_modules
14+
**/packages
2715

28-
bower_components/
29-
node_modules/
16+
# current folder
17+
.github
18+
build
19+
docs

‎docker-compose.yml‎

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ services:
2424
context: .
2525
dockerfile: sso.dockerfile
2626
ports:
27-
- "5000:443"
28-
- "5001:80"
27+
- "5000:80"
28+
- "5001:443"
2929
links:
3030
- jpdatabase
3131
depends_on:
@@ -36,53 +36,54 @@ services:
3636
ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
3737
ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
3838
ASPNETCORE_ENVIRONMENT: "Development"
39-
ASPNETCORE_URLS: https://+:443;http://+:80
39+
ASPNETCORE_URLS: http://+;https://+
4040

41-
#############################
42-
# Management API
43-
#############################
44-
jpproject-api:
45-
container_name: jpproject-api
46-
build:
47-
context: .
48-
dockerfile: user-management.dockerfile
49-
ports:
50-
- "5003:5003"
51-
- "5002:5002"
52-
depends_on:
53-
- jpdatabase
54-
environment:
55-
DATABASE_TYPE: "MySql"
56-
CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
57-
ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
58-
ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
59-
ASPNETCORE_ENVIRONMENT: "Development"
60-
AUTHORITY: "https://jpproject:5000"
61-
ASPNETCORE_URLS: "https://+:5003;http://+:5002"
41+
# #############################
42+
# # Management API
43+
# #############################
44+
# jpproject-api:
45+
# container_name: jpproject-api
46+
# build:
47+
# context: .
48+
# dockerfile: user-management.dockerfile
49+
# ports:
50+
# - "5003:443"
51+
# - "5002:80"
52+
# depends_on:
53+
# - jpdatabase
54+
# environment:
55+
# DATABASE_TYPE: "MySql"
56+
# CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
57+
# ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
58+
# ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
59+
# ASPNETCORE_ENVIRONMENT: "Development"
60+
# AUTHORITY: "http://jpproject:5000"
61+
# ASPNETCORE_URLS: https://+;http://+
6262

63-
#############################
64-
# User management UI
65-
#############################
66-
user-ui:
67-
container_name: jpproject-user-management-ui
68-
build:
69-
context: .
70-
dockerfile: ui-user-management.dockerfile
71-
depends_on:
72-
- jpproject-api
73-
- jpproject
74-
ports:
75-
- 4200:80
76-
#############################
77-
# Admin Ui
78-
#############################
79-
admin-ui:
80-
container_name: jpproject-admin-ui
81-
build:
82-
context: .
83-
dockerfile: ui-user-management.dockerfile
84-
depends_on:
85-
- jpproject-api
86-
- jpproject
87-
ports:
88-
- 4300:80
63+
# #############################
64+
# # User management UI
65+
# #############################
66+
# user-ui:
67+
# container_name: jpproject-user-management-ui
68+
# build:
69+
# context: .
70+
# dockerfile: ui-user-management.dockerfile
71+
# depends_on:
72+
# - jpproject-api
73+
# - jpproject
74+
# ports:
75+
# - 4200:80
76+
77+
# #############################
78+
# # Admin Ui
79+
# #############################
80+
# admin-ui:
81+
# container_name: jpproject-admin-ui
82+
# build:
83+
# context: .
84+
# dockerfile: ui-user-management.dockerfile
85+
# depends_on:
86+
# - jpproject-api
87+
# - jpproject
88+
# ports:
89+
# - 4300:80

‎src/Backend/Jp.Domain/Jp.Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="FluentValidation" Version="8.1.3" />
14-
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.3.2" />
14+
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Backend/Jp.Infra.CrossCutting.Identity/Jp.Infra.CrossCutting.Identity.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.2">
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.3">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1919
</PackageReference>
@@ -23,8 +23,7 @@
2323
</ItemGroup>
2424
<ItemGroup>
2525
<PackageReference Include="MailKit" Version="2.1.3" />
26-
<PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
27-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
26+
<PackageReference Include="ServiceStack.Text.Core" Version="5.5.0" />
2827
</ItemGroup>
2928
<ItemGroup>
3029
<ProjectReference Include="..\Jp.Domain\Jp.Domain.csproj" />

‎src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313

1414
<ItemGroup>
15-
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.3.0" />
16-
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.3.2" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.2">
15+
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" />
16+
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.3">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>

‎src/Backend/Jp.Infra.CrossCutting.Tools/Jp.Infra.CrossCutting.Tools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
9-
<PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
9+
<PackageReference Include="ServiceStack.Text.Core" Version="5.5.0" />
1010
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
1111
</ItemGroup>
1212

‎src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.2" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.3" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
1212

1313
</ItemGroup>

‎src/Backend/Jp.Infra.Migrations.MySql.Identity/Jp.Infra.Migrations.MySql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.2" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.2" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.3" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.3" />
1010
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
1111
</ItemGroup>
1212

‎src/Backend/Jp.Infra.Migrations.Sql.Identity/Jp.Infra.Migrations.Sql.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3" />
9-
</ItemGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
139
</ItemGroup>
1410

1511
<ItemGroup>

‎src/Frontend/Jp.AdminUI/src/environments/environment.docker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
export const environment = {
77
production: false,
88
ResourceServer: "https://localhost:5003/",
9-
IssuerUri: "https://jpproject:5000",
9+
IssuerUri: "http://jpproject:5000",
1010
RequireHttps: false,
1111
Uri: "http://localhost:4300"
1212
};

0 commit comments

Comments
 (0)