Skip to content

Commit 807bde5

Browse files
committed
Merge branch 'master' into pr/6002
2 parents 6cce556 + 6a056d2 commit 807bde5

File tree

24 files changed

+909
-94
lines changed

24 files changed

+909
-94
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/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"@angular/platform-browser-dynamic": "^11.0.2",
2323
"@angular/router": "^11.0.2",
2424
"@aspnet/signalr": "^1.1.4",
25-
"@fortawesome/fontawesome-free": "^5.13.0",
25+
"@fortawesome/fontawesome-free": "^5.15.3",
2626
"abp-ng2-module": "^6.2.0",
2727
"abp-web-resources": "^5.3.0",
28-
"admin-lte-css-only": "^3.0.4",
28+
"admin-lte-css-only": "^3.1.0",
2929
"core-js": "^3.2.1",
3030
"famfamfam-flags": "^1.0.0",
3131
"lodash-es": "^4.17.15",
@@ -35,7 +35,7 @@
3535
"ngx-pagination": "^5.0.0",
3636
"push.js": "1.0.12",
3737
"rxjs": "^6.4.0",
38-
"sweetalert2": "^9.10.12",
38+
"sweetalert2": "^10.15.6",
3939
"ts-helpers": "^1.1.2",
4040
"tslib": "^2.0.0",
4141
"web-animations-js": "^2.3.2",
@@ -67,4 +67,4 @@
6767
"webpack-bundle-analyzer": "^3.7.0"
6868
},
6969
"angular-cli": {}
70-
}
70+
}

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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,10 +1392,10 @@
13921392
lodash "^4.17.13"
13931393
to-fast-properties "^2.0.0"
13941394

1395-
"@fortawesome/fontawesome-free@^5.13.0":
1396-
version "5.13.0"
1397-
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.0.tgz#fcb113d1aca4b471b709e8c9c168674fbd6e06d9"
1398-
integrity sha512-xKOeQEl5O47GPZYIMToj6uuA2syyFlq9EMSl2ui0uytjY9xbe8XS0pexNWmxrdcCyNGyDmLyYw5FtKsalBUeOg==
1395+
"@fortawesome/fontawesome-free@^5.15.3":
1396+
version "5.15.3"
1397+
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz#c36ffa64a2a239bf948541a97b6ae8d729e09a9a"
1398+
integrity sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==
13991399

14001400
"@istanbuljs/schema@^0.1.2":
14011401
version "0.1.2"
@@ -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+
admin-lte-css-only@^3.1.0:
1793+
version "3.1.0"
1794+
resolved "https://registry.yarnpkg.com/admin-lte-css-only/-/admin-lte-css-only-3.1.0.tgz#0f3aa486948726250bf75409c0a16e8b818ae1aa"
1795+
integrity sha512-aQ7V01lFs1VrWRsDhGmB3G9gXCmzEsAal18GS/sRPFqAM/oKnaDe4kdWXyB9BtxDoSIT9/U8VjQ4yxSs2faxQw==
17961796

17971797
17981798
version "0.8.2"
@@ -8702,10 +8702,10 @@ svgo@^1.0.0:
87028702
unquote "~1.1.1"
87038703
util.promisify "~1.0.0"
87048704

8705-
sweetalert2@^9.10.12:
8706-
version "9.14.0"
8707-
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.14.0.tgz#2ae59c417745ae9360e47d7745a39be3ecbee1a2"
8708-
integrity sha512-NXxaR5ZsT9JQ+pEH0lQPa6fzFr7Uqx2VNI3dcPBShwTngQkVLXzEJYB0XjWAx/oBLAIPyHlc/tc3bkojJ2HYzg==
8705+
sweetalert2@^10.15.6:
8706+
version "10.16.9"
8707+
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.16.9.tgz#8ed86f2fa811a136667a48357e204348705be8c9"
8708+
integrity sha512-oNe+md5tmmS3fGfVHa7gVPlun7Td2oANSacnZCeghnrr3OHBi6UPVPU+GFrymwaDqwQspACilLRmRnM7aTjNPA==
87098709

87108710
87118711
version "2.0.3"

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/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)