Skip to content

Commit 6a7a639

Browse files
ismcagdasismcagdas
committed
Merge branch 'master' into pr/583
2 parents 8916dee + be16bda commit 6a7a639

File tree

33 files changed

+2964
-83
lines changed

33 files changed

+2964
-83
lines changed

‎angular/nswag/service.config.nswag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"defaultVariables": null,
44
"documentGenerator": {
55
"fromDocument": {
6-
"url": "http://localhost:21021/swagger/v1/swagger.json",
6+
"url": "https://localhost:44311/swagger/v1/swagger.json",
77
"output": null
88
}
99
},

‎angular/src/assets/appconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"remoteServiceBaseUrl": "http://localhost:21021",
2+
"remoteServiceBaseUrl": "https://localhost:44311",
33
"appBaseUrl": "http://localhost:4200",
44
"localeMappings": [
55
{

‎angular/src/assets/appconfig.production.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"remoteServiceBaseUrl": "http://localhost:21021",
2+
"remoteServiceBaseUrl": "https://localhost:44311",
33
"appBaseUrl": "http://localhost:4200",
44
"localeMappings": [
55
{

‎angular/src/shared/auth/app-auth.service.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ export class AppAuthService {
2828

2929
logout(reload?: boolean): void {
3030
abp.auth.clearToken();
31-
abp.utils.setCookieValue(
32-
AppConsts.authorization.encryptedAuthTokenName,
33-
undefined,
34-
undefined,
35-
abp.appPath
36-
);
31+
abp.utils.deleteCookie(AppConsts.authorization.encryptedAuthTokenName);
32+
3733
if (reload !== false) {
3834
location.href = AppConsts.appBaseUrl;
3935
}

‎angular/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,10 +1789,10 @@ adm-zip@^0.4.9:
17891789
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.14.tgz#2cf312bcc9f8875df835b0f6040bd89be0a727a9"
17901790
integrity sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==
17911791

1792-
admin-lte-css-only@^3.0.4:
1793-
version "3.0.4"
1794-
resolved "https://registry.yarnpkg.com/admin-lte-css-only/-/admin-lte-css-only-3.0.4.tgz#5aa5c33930fa35c827cb602533dcd93fbe1cb4ca"
1795-
integrity sha512-70vZ6coYYKqEs5Qxixl4qtN9ndGEpkgTEpKZi55vHJnBQMG52/nPaTQvd358Akp0pnidGA+M9O4N4HBm1Byqrw==
1792+
[email protected].5:
1793+
version "3.0.5"
1794+
resolved "https://registry.yarnpkg.com/admin-lte-css-only/-/admin-lte-css-only-3.0.5.tgz#e9b9a8a8eed169a86e764a068d7495a991f7bf2e"
1795+
integrity sha512-Z58k4Tli3lH4Jc8Agew9r6cf3s1aT4XoW7OKnSqHsBiD5twlh4jj8dAk29wvrRnwo42leFpVA6w/FPUQTMsZWw==
17961796

17971797
[email protected]:
17981798
version "0.8.2"

‎aspnet-core/build/build-with-ng.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Copy-Item (Join-Path $ngFolder "Dockerfile") (Join-Path $outputFolder "ng")
3131

3232
# Change UI configuration
3333
$ngConfigPath = Join-Path $outputFolder "ng/assets/appconfig.json"
34-
(Get-Content $ngConfigPath) -replace "21021", "9901" | Set-Content $ngConfigPath
34+
(Get-Content $ngConfigPath) -replace "44311", "9901" | Set-Content $ngConfigPath
3535
(Get-Content $ngConfigPath) -replace "4200", "9902" | Set-Content $ngConfigPath
3636

3737
## CREATE DOCKER IMAGES #######################################################

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AppConsts.cs

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

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="6.2.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.2.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="6.3.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="6.3.0" />
2323
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
2424
</ItemGroup>
2525

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@ public class AbpProjectNameConsts
77
public const string ConnectionStringName = "Default";
88

99
public const bool MultiTenancyEnabled = true;
10+
11+
/// <summary>
12+
/// Default pass phrase for SimpleStringCipher decrypt/encrypt operations
13+
/// </summary>
14+
public const string DefaultPassPhrase = "{{DEFAULT_PASS_PHRASE_HERE}}";
1015
}
1116
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public override void PreInitialize()
3636
Configuration.Settings.Providers.Add<AppSettingProvider>();
3737

3838
Configuration.Localization.Languages.Add(new LanguageInfo("fa", "فارسی", "famfamfam-flags ir"));
39+
40+
Configuration.Settings.SettingEncryptionConfiguration.DefaultPassPhrase = AbpProjectNameConsts.DefaultPassPhrase;
3941
}
4042

4143
public override void Initialize()

0 commit comments

Comments
 (0)