@certd/lib-server 1.29.2 → 1.29.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/system/settings/service/models.d.ts +10 -0
- package/dist/system/settings/service/models.js +11 -1
- package/dist/system/settings/service/sys-settings-service.d.ts +2 -3
- package/dist/system/settings/service/sys-settings-service.js +29 -15
- package/dist/user/access/service/encrypt-service.js +4 -4
- package/package.json +6 -6
|
@@ -84,6 +84,16 @@ export declare class SysSecretBackup extends BaseSettings {
|
|
|
84
84
|
siteId?: string;
|
|
85
85
|
encryptSecret?: string;
|
|
86
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* 不要修改
|
|
89
|
+
*/
|
|
90
|
+
export declare class SysSecret extends BaseSettings {
|
|
91
|
+
static __title__: string;
|
|
92
|
+
static __key__: string;
|
|
93
|
+
static __access__: string;
|
|
94
|
+
siteId?: string;
|
|
95
|
+
encryptSecret?: string;
|
|
96
|
+
}
|
|
87
97
|
export declare class SysSiteEnv {
|
|
88
98
|
agent?: {
|
|
89
99
|
enabled?: boolean;
|
|
@@ -87,6 +87,16 @@ export class SysSecretBackup extends BaseSettings {
|
|
|
87
87
|
siteId;
|
|
88
88
|
encryptSecret;
|
|
89
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* 不要修改
|
|
92
|
+
*/
|
|
93
|
+
export class SysSecret extends BaseSettings {
|
|
94
|
+
static __title__ = '密钥信息';
|
|
95
|
+
static __key__ = 'sys.secret';
|
|
96
|
+
static __access__ = 'private';
|
|
97
|
+
siteId;
|
|
98
|
+
encryptSecret;
|
|
99
|
+
}
|
|
90
100
|
export class SysSiteEnv {
|
|
91
101
|
agent;
|
|
92
102
|
}
|
|
@@ -112,4 +122,4 @@ export class SysSuiteSetting extends BaseSettings {
|
|
|
112
122
|
registerGift;
|
|
113
123
|
intro;
|
|
114
124
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3N5c3RlbS9zZXR0aW5ncy9zZXJ2aWNlL21vZGVscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXRDLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLE1BQU0sQ0FBQyxPQUFPLENBQVM7SUFDdkIsTUFBTSxDQUFDLFNBQVMsQ0FBUztJQUN6QixNQUFNLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQztJQUU5QixNQUFNLENBQUMsV0FBVztRQUNoQixPQUFPLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3BDLENBQUM7O0FBR0gsTUFBTSxPQUFPLGlCQUFrQixTQUFRLFlBQVk7SUFDakQsTUFBTSxDQUFDLE9BQU8sR0FBRyxZQUFZLENBQUM7SUFDOUIsTUFBTSxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUM7SUFDNUIsTUFBTSxDQUFDLFVBQVUsR0FBRyxRQUFRLENBQUM7SUFFN0IsZUFBZSxHQUFHLEtBQUssQ0FBQztJQUN4QixvQkFBb0IsR0FBRyxJQUFJLENBQUM7SUFDNUIsdUJBQXVCLEdBQUcsSUFBSSxDQUFDO0lBQy9CLHFCQUFxQixHQUFHLEtBQUssQ0FBQztJQUM5QixlQUFlLEdBQUcsS0FBSyxDQUFDO0lBQ3hCLG9CQUFvQixHQUFHLEtBQUssQ0FBQztJQUU3QixzQkFBc0IsR0FBRyxDQUFDLENBQUM7SUFDM0Isd0JBQXdCLEdBQUcsS0FBSyxDQUFDO0lBQ2pDLEtBQUssQ0FBVTs7QUFHakIsTUFBTSxPQUFPLGtCQUFtQixTQUFRLFlBQVk7SUFDbEQsTUFBTSxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUM7SUFDNUIsTUFBTSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUM7SUFDOUIsTUFBTSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUM7SUFDL0IsTUFBTSxDQUFVO0lBQ2hCLGFB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
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { Repository } from 'typeorm';
|
|
2
2
|
import { SysSettingsEntity } from '../entity/sys-settings.js';
|
|
3
|
-
import {
|
|
4
|
-
import { BaseSettings, SysPrivateSettings, SysPublicSettings } from './models.js';
|
|
3
|
+
import { BaseSettings, SysPrivateSettings, SysPublicSettings, SysSecret } from './models.js';
|
|
5
4
|
import { BaseService } from '../../../basic/index.js';
|
|
6
5
|
/**
|
|
7
6
|
* 设置
|
|
8
7
|
*/
|
|
9
8
|
export declare class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|
10
9
|
repository: Repository<SysSettingsEntity>;
|
|
11
|
-
cache: CacheManager;
|
|
12
10
|
getRepository(): Repository<SysSettingsEntity>;
|
|
13
11
|
getById(id: any): Promise<SysSettingsEntity | null>;
|
|
14
12
|
getByKey(key: string): Promise<SysSettingsEntity | null>;
|
|
@@ -23,4 +21,5 @@ export declare class SysSettingsService extends BaseService<SysSettingsEntity> {
|
|
|
23
21
|
reloadPrivateSettings(): Promise<void>;
|
|
24
22
|
updateByKey(key: string, setting: any): Promise<void>;
|
|
25
23
|
backupSecret(): Promise<void>;
|
|
24
|
+
getSecret(): Promise<SysSecret>;
|
|
26
25
|
}
|
|
@@ -7,22 +7,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
10
|
+
import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
|
|
11
11
|
import { InjectEntityModel } from '@midwayjs/typeorm';
|
|
12
12
|
import { Repository } from 'typeorm';
|
|
13
13
|
import { SysSettingsEntity } from '../entity/sys-settings.js';
|
|
14
|
-
import {
|
|
15
|
-
import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecretBackup } from './models.js';
|
|
14
|
+
import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
|
|
16
15
|
import * as _ from 'lodash-es';
|
|
17
16
|
import { BaseService } from '../../../basic/index.js';
|
|
18
|
-
import { logger, setGlobalProxy } from '@certd/basic';
|
|
17
|
+
import { cache, logger, setGlobalProxy } from '@certd/basic';
|
|
19
18
|
import * as dns from 'node:dns';
|
|
20
19
|
/**
|
|
21
20
|
* 设置
|
|
22
21
|
*/
|
|
23
22
|
let SysSettingsService = class SysSettingsService extends BaseService {
|
|
24
23
|
repository;
|
|
25
|
-
cache; // 依赖注入CacheManager
|
|
26
24
|
getRepository() {
|
|
27
25
|
return this.repository;
|
|
28
26
|
}
|
|
@@ -72,7 +70,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
72
70
|
async getSetting(type) {
|
|
73
71
|
const key = type.__key__;
|
|
74
72
|
const cacheKey = type.getCacheKey();
|
|
75
|
-
const settings =
|
|
73
|
+
const settings = cache.get(cacheKey);
|
|
76
74
|
if (settings) {
|
|
77
75
|
return settings;
|
|
78
76
|
}
|
|
@@ -80,7 +78,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
80
78
|
const savedSettings = await this.getSettingByKey(key);
|
|
81
79
|
newSetting = _.merge(newSetting, savedSettings);
|
|
82
80
|
await this.saveSetting(newSetting);
|
|
83
|
-
|
|
81
|
+
cache.set(cacheKey, newSetting);
|
|
84
82
|
return newSetting;
|
|
85
83
|
}
|
|
86
84
|
async saveSetting(bean) {
|
|
@@ -91,6 +89,10 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
91
89
|
if (entity) {
|
|
92
90
|
entity.setting = JSON.stringify(bean);
|
|
93
91
|
entity.access = type.__access__;
|
|
92
|
+
if (key === SysSecretBackup.__key__ || key === SysSecret.__key__) {
|
|
93
|
+
//备份密钥不允许更新
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
94
96
|
await this.repository.save(entity);
|
|
95
97
|
}
|
|
96
98
|
else {
|
|
@@ -101,7 +103,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
101
103
|
newEntity.access = type.__access__;
|
|
102
104
|
await this.repository.save(newEntity);
|
|
103
105
|
}
|
|
104
|
-
|
|
106
|
+
cache.set(cacheKey, bean);
|
|
105
107
|
}
|
|
106
108
|
async getPublicSettings() {
|
|
107
109
|
return await this.getSetting(SysPublicSettings);
|
|
@@ -137,7 +139,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
137
139
|
else {
|
|
138
140
|
throw new Error('该设置不存在');
|
|
139
141
|
}
|
|
140
|
-
|
|
142
|
+
cache.delete(`settings.${key}`);
|
|
141
143
|
}
|
|
142
144
|
async backupSecret() {
|
|
143
145
|
const settings = await this.getSettingByKey(SysSecretBackup.__key__);
|
|
@@ -164,18 +166,30 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
164
166
|
}
|
|
165
167
|
}
|
|
166
168
|
}
|
|
169
|
+
async getSecret() {
|
|
170
|
+
const sysSecret = await this.getSetting(SysSecret);
|
|
171
|
+
if (sysSecret.encryptSecret) {
|
|
172
|
+
return sysSecret;
|
|
173
|
+
}
|
|
174
|
+
//从备份中读取
|
|
175
|
+
const settings = await this.getSettingByKey(SysSecretBackup.__key__);
|
|
176
|
+
if (settings == null || !settings.encryptSecret) {
|
|
177
|
+
throw new Error('密钥备份不存在');
|
|
178
|
+
}
|
|
179
|
+
sysSecret.siteId = settings.siteId;
|
|
180
|
+
sysSecret.encryptSecret = settings.encryptSecret;
|
|
181
|
+
await this.saveSetting(sysSecret);
|
|
182
|
+
logger.info('密钥恢复成功');
|
|
183
|
+
return sysSecret;
|
|
184
|
+
}
|
|
167
185
|
};
|
|
168
186
|
__decorate([
|
|
169
187
|
InjectEntityModel(SysSettingsEntity),
|
|
170
188
|
__metadata("design:type", Repository)
|
|
171
189
|
], SysSettingsService.prototype, "repository", void 0);
|
|
172
|
-
__decorate([
|
|
173
|
-
Inject(),
|
|
174
|
-
__metadata("design:type", CacheManager)
|
|
175
|
-
], SysSettingsService.prototype, "cache", void 0);
|
|
176
190
|
SysSettingsService = __decorate([
|
|
177
191
|
Provide(),
|
|
178
|
-
Scope(ScopeEnum.
|
|
192
|
+
Scope(ScopeEnum.Singleton)
|
|
179
193
|
], SysSettingsService);
|
|
180
194
|
export { SysSettingsService };
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3lzLXNldHRpbmdzLXNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc3lzdGVtL3NldHRpbmdzL3NlcnZpY2Uvc3lzLXNldHRpbmdzLXNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNyQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEVBQWdCLGNBQWMsRUFBRSxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzlILE9BQU8sS0FBSyxDQUFDLE1BQU0sV0FBVyxDQUFDO0FBQy9CLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDN0QsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFFaEM7O0dBRUc7QUFHSSxJQUFNLGtCQUFrQixHQUF4QixNQUFNLGtCQUFtQixTQUFRLFdBQThCO0lBRXBFLFVBQVUsQ0FBZ0M7SUFFMUMsYUFBYTtRQUNYLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUN6QixDQUFDO0lBQ0QsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFPO1FBQ25CLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWixPQUFPLElBQUksQ0FBQztRQUNk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
|
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
|
|
11
11
|
import crypto from 'crypto';
|
|
12
|
-
import {
|
|
12
|
+
import { SysSettingsService } from '../../../system/index.js';
|
|
13
13
|
/**
|
|
14
14
|
* 授权
|
|
15
15
|
*/
|
|
@@ -17,8 +17,8 @@ let EncryptService = class EncryptService {
|
|
|
17
17
|
secretKey;
|
|
18
18
|
sysSettingService;
|
|
19
19
|
async init() {
|
|
20
|
-
const
|
|
21
|
-
this.secretKey = Buffer.from(
|
|
20
|
+
const secret = await this.sysSettingService.getSecret();
|
|
21
|
+
this.secretKey = Buffer.from(secret.encryptSecret, 'base64');
|
|
22
22
|
}
|
|
23
23
|
// 加密函数
|
|
24
24
|
encrypt(text) {
|
|
@@ -56,4 +56,4 @@ EncryptService = __decorate([
|
|
|
56
56
|
Scope(ScopeEnum.Singleton)
|
|
57
57
|
], EncryptService);
|
|
58
58
|
export { EncryptService };
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jcnlwdC1zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3VzZXIvYWNjZXNzL3NlcnZpY2UvZW5jcnlwdC1zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDekUsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sRUFBYSxrQkFBa0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXpFOztHQUVHO0FBR0ksSUFBTSxjQUFjLEdBQXBCLE1BQU0sY0FBYztJQUN6QixTQUFTLENBQVM7SUFHbEIsaUJBQWlCLENBQXFCO0lBR2hDLEFBQU4sS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLE1BQU0sR0FBYyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNuRSxJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsT0FBTztJQUNQLE9BQU8sQ0FBQyxJQUFZO1FBQ2xCLE1BQU0sRUFBRSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRO1FBQzNDLDRDQUE0QztRQUM1QyxzQ0FBc0M7UUFDdEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLGNBQWMsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN4RSxJQUFJLFNBQVMsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BDLFNBQVMsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkQsT0FBTyxFQUFFLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLEdBQUcsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFFRCxPQUFPO0lBQ1AsT0FBTyxDQUFDLGFBQXFCO1FBQzNCLE1BQU0sU0FBUyxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDM0MsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDakQsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzFELE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDekYsSUFBSSxTQUFTLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUMzQyxTQUFTLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3pELE9BQU8sU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzlCLENBQUM7Q0FDRixDQUFBO0FBN0JDO0lBREMsTUFBTSxFQUFFOzhCQUNVLGtCQUFrQjt5REFBQztBQUdoQztJQURMLElBQUksRUFBRTs7OzswQ0FJTjtBQVZVLGNBQWM7SUFGMUIsT0FBTyxFQUFFO0lBQ1QsS0FBSyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7R0FDZCxjQUFjLENBaUMxQiJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@certd/lib-server",
|
|
3
|
-
"version": "1.29.
|
|
3
|
+
"version": "1.29.3",
|
|
4
4
|
"description": "midway with flyway, sql upgrade way ",
|
|
5
5
|
"private": false,
|
|
6
6
|
"type": "module",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
],
|
|
28
28
|
"license": "AGPL",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@certd/acme-client": "^1.29.
|
|
31
|
-
"@certd/basic": "^1.29.
|
|
32
|
-
"@certd/pipeline": "^1.29.
|
|
33
|
-
"@certd/plus-core": "^1.29.
|
|
30
|
+
"@certd/acme-client": "^1.29.3",
|
|
31
|
+
"@certd/basic": "^1.29.3",
|
|
32
|
+
"@certd/pipeline": "^1.29.3",
|
|
33
|
+
"@certd/plus-core": "^1.29.3",
|
|
34
34
|
"@midwayjs/cache": "~3.14.0",
|
|
35
35
|
"@midwayjs/core": "~3.17.1",
|
|
36
36
|
"@midwayjs/i18n": "~3.17.3",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"typeorm": "^0.3.11",
|
|
62
62
|
"typescript": "^5.4.2"
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "0c130f95967ba9d86faa1afb369794fb1e95f961"
|
|
65
65
|
}
|