Skip to content

Commit 1b8d318

Browse files
committed
bugfix
1 parent d4f3d14 commit 1b8d318

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

src/SSCMS.Core/Repositories/AccessTokenRepository.Cache.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ public async Task<AccessToken> GetByTokenAsync(string token)
2121
_settingsManager.Encrypt(token))
2222
.CachingGet(cacheKey)
2323
);
24-
25-
//var cacheKey = GetCacheKeyByToken(token);
26-
//return await
27-
// _cache.GetOrCreateAsync(cacheKey, async entry =>
28-
// {
29-
// var accessToken = await _repository.GetAsync(Q
30-
// .Where(nameof(AccessToken.Token), WebConfigUtils.EncryptStringBySecretKey(token))
31-
// );
32-
33-
// return accessToken;
34-
// });
3524
}
3625
}
3726
}

src/SSCMS.Web/wwwroot/sitefiles/assets/js/admin/error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var methods = {
2121
var res = response.data;
2222

2323
$this.message = res.summary + ' ' + res.message;
24-
$this.stackTrace = res.stackTrace;
24+
$this.stackTrace = res.stackTrace ? res.stackTrace.replace(/\n/g, "<br>") : "";
2525
$this.createdDate = res.createdDate;
2626
}).catch(function (error) {
2727
utils.error(error);

src/SSCMS.Web/wwwroot/sitefiles/assets/js/home/error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var methods = {
2121
var res = response.data;
2222

2323
$this.message = res.summary + ' ' + res.message;
24-
$this.stackTrace = res.stackTrace;
24+
$this.stackTrace = res.stackTrace ? res.stackTrace.replace(/\n/g, "<br>") : "";
2525
$this.createdDate = res.createdDate;
2626
}).catch(function (error) {
2727
utils.error(error);

tests/SSCMS.Core.Tests/Repositories/AdministratorDaoTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public async Task TestInsert()
6060

6161
Assert.NotNull(entity);
6262
Assert.True(!string.IsNullOrWhiteSpace(userInfo.Password));
63-
Assert.True(userInfo.PasswordFormat == PasswordFormat.Encrypted);
63+
Assert.True(userInfo.PasswordFormat == PasswordFormat.SM4);
6464
Assert.True(!string.IsNullOrWhiteSpace(userInfo.PasswordSalt));
6565

6666
userInfo = await _userRepository.GetByUserNameAsync(TestUserName);

0 commit comments

Comments
 (0)