@fecommunity/reactpress-server 1.0.0-beta.22 → 1.0.0-beta.23
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.
|
@@ -26,30 +26,54 @@ let SettingService = class SettingService {
|
|
|
26
26
|
this.initGlobalConfig();
|
|
27
27
|
}
|
|
28
28
|
async initI18n() {
|
|
29
|
-
const items = await this.settingRepository.find();
|
|
30
|
-
const target = (items && items[0]) || {};
|
|
31
|
-
let data = {};
|
|
32
29
|
try {
|
|
33
|
-
|
|
30
|
+
console.log('[SettingService] i18n constant keys:', Object.keys(setting_constant_1.i18n));
|
|
31
|
+
const items = await this.settingRepository.find();
|
|
32
|
+
const target = (items && items[0]) || {};
|
|
33
|
+
let data = {};
|
|
34
|
+
try {
|
|
35
|
+
if (target.i18n) {
|
|
36
|
+
data = JSON.parse(target.i18n);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
console.warn('[SettingService] Error parsing i18n from DB:', e);
|
|
41
|
+
data = {};
|
|
42
|
+
}
|
|
43
|
+
const mergedI18n = merge({}, setting_constant_1.i18n, data);
|
|
44
|
+
const mergedI18nString = JSON.stringify(mergedI18n);
|
|
45
|
+
if (!target.i18n || target.i18n !== mergedI18nString) {
|
|
46
|
+
target.i18n = mergedI18nString;
|
|
47
|
+
await this.settingRepository.save(target);
|
|
48
|
+
console.log('[SettingService] i18n updated in database');
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
console.log('[SettingService] i18n already up to date');
|
|
52
|
+
}
|
|
34
53
|
}
|
|
35
|
-
catch (
|
|
36
|
-
|
|
54
|
+
catch (error) {
|
|
55
|
+
console.error('[SettingService] Error in initI18n:', error);
|
|
56
|
+
throw error;
|
|
37
57
|
}
|
|
38
|
-
target.i18n = JSON.stringify(merge({}, setting_constant_1.i18n, data));
|
|
39
|
-
await this.settingRepository.save(target);
|
|
40
58
|
}
|
|
41
59
|
async initGlobalConfig() {
|
|
42
60
|
const items = await this.settingRepository.find();
|
|
43
61
|
const target = (items && items[0]) || {};
|
|
44
62
|
let data = {};
|
|
45
63
|
try {
|
|
46
|
-
|
|
64
|
+
if (target.globalSetting) {
|
|
65
|
+
data = JSON.parse(target.globalSetting);
|
|
66
|
+
}
|
|
47
67
|
}
|
|
48
68
|
catch (e) {
|
|
49
69
|
data = {};
|
|
50
70
|
}
|
|
51
|
-
|
|
52
|
-
|
|
71
|
+
const mergedSettings = merge({}, setting_constant_1.settings, data);
|
|
72
|
+
const mergedSettingsString = JSON.stringify(mergedSettings);
|
|
73
|
+
if (!target.globalSetting || target.globalSetting !== mergedSettingsString) {
|
|
74
|
+
target.globalSetting = mergedSettingsString;
|
|
75
|
+
await this.settingRepository.save(target);
|
|
76
|
+
}
|
|
53
77
|
}
|
|
54
78
|
async findAll(innerInvoke = false, isAdmin = false) {
|
|
55
79
|
const data = await this.settingRepository.find();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,mCAAmC;AACnC,qCAAqC;AAErC,yDAAsE;AACtE,qDAA2C;AAG3C,IAAa,cAAc,GAA3B,MAAa,cAAc;IACzB,YAEmB,iBAAsC;QAAtC,sBAAiB,GAAjB,iBAAiB,CAAqB;QAEvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAKD,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,22 +161,22 @@
|
|
|
161
161
|
"signature": "d2f31f19e1ba6ed59be9259d660a239d9a3fcbbc8e038c6b2009bde34b175fed",
|
|
162
162
|
"affectsGlobalScope": false
|
|
163
163
|
},
|
|
164
|
-
"../../
|
|
164
|
+
"../../config/lib/env.d.ts": {
|
|
165
165
|
"version": "88a06cd512bc833482a6876d6066c214c01f1695d9204b4ec4c801220fdd96b2",
|
|
166
166
|
"signature": "88a06cd512bc833482a6876d6066c214c01f1695d9204b4ec4c801220fdd96b2",
|
|
167
167
|
"affectsGlobalScope": false
|
|
168
168
|
},
|
|
169
|
-
"../../
|
|
169
|
+
"../../config/lib/i18n.d.ts": {
|
|
170
170
|
"version": "902633438878a605dfd324c80a5e07346c564ad797958d7893ec19b67244d2ce",
|
|
171
171
|
"signature": "902633438878a605dfd324c80a5e07346c564ad797958d7893ec19b67244d2ce",
|
|
172
172
|
"affectsGlobalScope": false
|
|
173
173
|
},
|
|
174
|
-
"../../
|
|
174
|
+
"../../config/lib/global.d.ts": {
|
|
175
175
|
"version": "5b8d87f4a55456128450ec046b3d94a8a676942e10ddbc99f3b0619af4887c41",
|
|
176
176
|
"signature": "5b8d87f4a55456128450ec046b3d94a8a676942e10ddbc99f3b0619af4887c41",
|
|
177
177
|
"affectsGlobalScope": false
|
|
178
178
|
},
|
|
179
|
-
"../../
|
|
179
|
+
"../../config/lib/index.d.ts": {
|
|
180
180
|
"version": "1ec1e6cb5a653e5d63f7281b3fb3c5f812430ad6c514b5b19d978aa5a3f8e8bc",
|
|
181
181
|
"signature": "1ec1e6cb5a653e5d63f7281b3fb3c5f812430ad6c514b5b19d978aa5a3f8e8bc",
|
|
182
182
|
"affectsGlobalScope": false
|
|
@@ -3792,7 +3792,7 @@
|
|
|
3792
3792
|
"affectsGlobalScope": false
|
|
3793
3793
|
},
|
|
3794
3794
|
"../src/modules/setting/setting.service.ts": {
|
|
3795
|
-
"version": "
|
|
3795
|
+
"version": "852d5c5517f0cd9841bda297d223fca800c4a5778b3d974aa48106fcd8cbfba3",
|
|
3796
3796
|
"signature": "cc63adffef524f8617baf980bc9d996a811a19ba0633c9a41e901de2dec72aad",
|
|
3797
3797
|
"affectsGlobalScope": false
|
|
3798
3798
|
},
|
|
@@ -5047,19 +5047,19 @@
|
|
|
5047
5047
|
"configFilePath": "../tsconfig.build.json"
|
|
5048
5048
|
},
|
|
5049
5049
|
"referencedMap": {
|
|
5050
|
-
"../../
|
|
5050
|
+
"../../config/lib/env.d.ts": [
|
|
5051
5051
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
5052
5052
|
],
|
|
5053
|
-
"../../
|
|
5053
|
+
"../../config/lib/global.d.ts": [
|
|
5054
5054
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
5055
5055
|
],
|
|
5056
|
-
"../../
|
|
5056
|
+
"../../config/lib/i18n.d.ts": [
|
|
5057
5057
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
5058
5058
|
],
|
|
5059
|
-
"../../
|
|
5060
|
-
"../../
|
|
5061
|
-
"../../
|
|
5062
|
-
"../../
|
|
5059
|
+
"../../config/lib/index.d.ts": [
|
|
5060
|
+
"../../config/lib/env.d.ts",
|
|
5061
|
+
"../../config/lib/global.d.ts",
|
|
5062
|
+
"../../config/lib/i18n.d.ts",
|
|
5063
5063
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
5064
5064
|
],
|
|
5065
5065
|
"../../node_modules/.pnpm/@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7/node_modules/@nestjs/common/cache/cache.constants.d.ts": [
|
|
@@ -10044,7 +10044,7 @@
|
|
|
10044
10044
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10045
10045
|
],
|
|
10046
10046
|
"../src/app.module.ts": [
|
|
10047
|
-
"../../
|
|
10047
|
+
"../../config/lib/index.d.ts",
|
|
10048
10048
|
"../../node_modules/.pnpm/@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7/node_modules/@nestjs/common/index.d.ts",
|
|
10049
10049
|
"../../node_modules/.pnpm/@nestjs+config@0.6.3_@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7__reflect-metadata@0.1.14_rxjs@6.6.7/node_modules/@nestjs/config/index.d.ts",
|
|
10050
10050
|
"../../node_modules/.pnpm/@nestjs+typeorm@6.3.4_@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7__@nestj_d653714ff2384d9f9869c554302af1a8/node_modules/@nestjs/typeorm/index.d.ts",
|
|
@@ -10431,7 +10431,7 @@
|
|
|
10431
10431
|
"../src/modules/search/search.entity.ts"
|
|
10432
10432
|
],
|
|
10433
10433
|
"../src/modules/setting/setting.constant.ts": [
|
|
10434
|
-
"../../
|
|
10434
|
+
"../../config/lib/index.d.ts",
|
|
10435
10435
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10436
10436
|
],
|
|
10437
10437
|
"../src/modules/setting/setting.controller.ts": [
|
|
@@ -10656,19 +10656,19 @@
|
|
|
10656
10656
|
]
|
|
10657
10657
|
},
|
|
10658
10658
|
"exportedModulesMap": {
|
|
10659
|
-
"../../
|
|
10659
|
+
"../../config/lib/env.d.ts": [
|
|
10660
10660
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10661
10661
|
],
|
|
10662
|
-
"../../
|
|
10662
|
+
"../../config/lib/global.d.ts": [
|
|
10663
10663
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10664
10664
|
],
|
|
10665
|
-
"../../
|
|
10665
|
+
"../../config/lib/i18n.d.ts": [
|
|
10666
10666
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10667
10667
|
],
|
|
10668
|
-
"../../
|
|
10669
|
-
"../../
|
|
10670
|
-
"../../
|
|
10671
|
-
"../../
|
|
10668
|
+
"../../config/lib/index.d.ts": [
|
|
10669
|
+
"../../config/lib/env.d.ts",
|
|
10670
|
+
"../../config/lib/global.d.ts",
|
|
10671
|
+
"../../config/lib/i18n.d.ts",
|
|
10672
10672
|
"../../node_modules/.pnpm/date-fns@2.30.0/node_modules/date-fns/typings.d.ts"
|
|
10673
10673
|
],
|
|
10674
10674
|
"../../node_modules/.pnpm/@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7/node_modules/@nestjs/common/cache/cache.constants.d.ts": [
|
|
@@ -15770,8 +15770,8 @@
|
|
|
15770
15770
|
"../src/modules/search/search.entity.ts"
|
|
15771
15771
|
],
|
|
15772
15772
|
"../src/modules/setting/setting.constant.ts": [
|
|
15773
|
-
"../../
|
|
15774
|
-
"../../
|
|
15773
|
+
"../../config/lib/global.d.ts",
|
|
15774
|
+
"../../config/lib/index.d.ts"
|
|
15775
15775
|
],
|
|
15776
15776
|
"../src/modules/setting/setting.controller.ts": [
|
|
15777
15777
|
"../../node_modules/.pnpm/@nestjs+jwt@6.1.2_@nestjs+common@6.11.11_reflect-metadata@0.1.14_rxjs@6.6.7_/node_modules/@nestjs/jwt/index.d.ts",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fecommunity/reactpress-server",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.23",
|
|
4
4
|
"description": "ReactPress Server - NestJS-based backend API for ReactPress CMS",
|
|
5
5
|
"author": "fecommunity",
|
|
6
6
|
"license": "MIT",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"pm2:status": "pm2 status reactpress-server"
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@fecommunity/reactpress-config": "
|
|
63
|
+
"@fecommunity/reactpress-config": "workspace:*",
|
|
64
64
|
"commander": "^9.4.1",
|
|
65
65
|
"chalk": "^4.1.2",
|
|
66
66
|
"inquirer": "^8.2.4",
|