@fecommunity/reactpress-server 4.0.0-beta.9 → 4.0.0

package/dist/modules/file/content-image-scan.util.js

@@ -0,0 +1,222 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeContentImageRefs = exports.summarizeContentImageRefs = exports.isActionableContentImage = exports.extractUploadFilename = exports.isLocalUploadUrl = exports.classifyImageUrl = exports.extractImageUrlsFromFields = exports.isNonWebImageExtension = exports.isWebReadyExtension = exports.extractExtension = void 0;
+const WEB_READY_EXT = new Set(['webp', 'avif', 'svg']);
+const NON_WEB_EXT = new Set([
+    'jpg',
+    'jpeg',
+    'png',
+    'gif',
+    'bmp',
+    'tiff',
+    'tif',
+    'ico',
+    'heic',
+    'heif',
+    'jfif',
+    'pjpeg',
+    'pjp',
+]);
+const MARKDOWN_IMAGE_RE = /!\[[^\]]*]\(\s*<?([^)\s>]+)>?(?:\s+(?:"[^"]*"|'[^']*'))?\s*\)/g;
+const HTML_IMG_SRC_RE = /<img\b[^>]*?\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s>]+))/gi;
+const HTML_SRCSET_RE = /<img\b[^>]*?\bsrcset\s*=\s*(?:"([^"]+)"|'([^']+)')/gi;
+function extractExtension(url) {
+    try {
+        const pathname = new URL(url, 'http://local').pathname;
+        const match = pathname.match(/\.([a-z0-9]+)$/i);
+        return match ? match[1].toLowerCase() : null;
+    }
+    catch (_a) {
+        const bare = url.split('?')[0].split('#')[0];
+        const match = bare.match(/\.([a-z0-9]+)$/i);
+        return match ? match[1].toLowerCase() : null;
+    }
+}
+exports.extractExtension = extractExtension;
+function isWebReadyExtension(ext) {
+    return Boolean(ext && WEB_READY_EXT.has(ext));
+}
+exports.isWebReadyExtension = isWebReadyExtension;
+function isNonWebImageExtension(ext) {
+    return Boolean(ext && NON_WEB_EXT.has(ext));
+}
+exports.isNonWebImageExtension = isNonWebImageExtension;
+function extractImageUrlsFromFields(fields) {
+    const found = [];
+    const seen = new Set();
+    const push = (raw, field) => {
+        const url = String(raw || '').trim();
+        if (!url || url.startsWith('data:'))
+            return;
+        const key = `${field}:${url}`;
+        if (seen.has(key))
+            return;
+        seen.add(key);
+        found.push({ url, field });
+    };
+    if (fields.cover) {
+        push(fields.cover, 'cover');
+    }
+    for (const [text, field] of [
+        [fields.content, 'content'],
+        [fields.html, 'html'],
+    ]) {
+        if (!text)
+            continue;
+        MARKDOWN_IMAGE_RE.lastIndex = 0;
+        let md;
+        while ((md = MARKDOWN_IMAGE_RE.exec(text)) !== null) {
+            push(md[1], field);
+        }
+        HTML_IMG_SRC_RE.lastIndex = 0;
+        let img;
+        while ((img = HTML_IMG_SRC_RE.exec(text)) !== null) {
+            push(img[1] || img[2] || img[3], field);
+        }
+        HTML_SRCSET_RE.lastIndex = 0;
+        let srcset;
+        while ((srcset = HTML_SRCSET_RE.exec(text)) !== null) {
+            const value = srcset[1] || srcset[2] || '';
+            for (const part of value.split(',')) {
+                const candidate = part.trim().split(/\s+/)[0];
+                push(candidate, field);
+            }
+        }
+    }
+    return found;
+}
+exports.extractImageUrlsFromFields = extractImageUrlsFromFields;
+function classifyImageUrl(url, opts) {
+    const extension = extractExtension(url);
+    const local = isLocalUploadUrl(url, opts);
+    if (local) {
+        if (isWebReadyExtension(extension)) {
+            return { kind: 'localWeb', extension };
+        }
+        if (isNonWebImageExtension(extension) || !extension) {
+            return { kind: 'localNonWeb', extension };
+        }
+        return { kind: 'unknown', extension };
+    }
+    if (/^https?:\/\//i.test(url)) {
+        return { kind: 'external', extension };
+    }
+    if (url.startsWith('/')) {
+        if (isWebReadyExtension(extension))
+            return { kind: 'localWeb', extension };
+        if (isNonWebImageExtension(extension) || !extension)
+            return { kind: 'localNonWeb', extension };
+        return { kind: 'unknown', extension };
+    }
+    return { kind: 'unknown', extension };
+}
+exports.classifyImageUrl = classifyImageUrl;
+function isLocalUploadUrl(url, opts) {
+    const normalized = url.trim();
+    if (!normalized)
+        return false;
+    if (normalized.includes('/public/uploads/') ||
+        normalized.includes('/uploads/') ||
+        normalized.startsWith('undefined/public/uploads') ||
+        normalized.startsWith('undefined/')) {
+        return true;
+    }
+    const uploadBase = opts.uploadBaseUrl.replace(/\/$/, '');
+    if (uploadBase && (normalized === uploadBase || normalized.startsWith(`${uploadBase}/`))) {
+        return true;
+    }
+    try {
+        const parsed = new URL(normalized, 'http://local');
+        if (opts.siteHosts.has(parsed.host.toLowerCase())) {
+            return (parsed.pathname.includes('/public/uploads/') ||
+                parsed.pathname.includes('/uploads/') ||
+                parsed.pathname.startsWith('/public/uploads'));
+        }
+    }
+    catch (_a) {
+    }
+    return false;
+}
+exports.isLocalUploadUrl = isLocalUploadUrl;
+function extractUploadFilename(url, uploadBaseUrl) {
+    const base = uploadBaseUrl.replace(/\/$/, '');
+    const candidates = [
+        base + '/',
+        '/public/uploads/',
+        '/uploads/',
+        'undefined/public/uploads/',
+        'undefined/',
+    ];
+    for (const prefix of candidates) {
+        const idx = url.indexOf(prefix);
+        if (idx >= 0) {
+            const rest = url.slice(idx + prefix.length).split('?')[0].split('#')[0];
+            if (rest)
+                return decodeURIComponent(rest);
+        }
+    }
+    return null;
+}
+exports.extractUploadFilename = extractUploadFilename;
+function isActionableContentImage(kind) {
+    return kind === 'external' || kind === 'localNonWeb';
+}
+exports.isActionableContentImage = isActionableContentImage;
+function summarizeContentImageRefs(refs, sampleLimit = 20) {
+    let external = 0;
+    let localNonWeb = 0;
+    let localWeb = 0;
+    let unknown = 0;
+    let coverIssues = 0;
+    const articleIds = new Set();
+    const pageIds = new Set();
+    for (const ref of refs) {
+        if (ref.kind === 'external')
+            external += 1;
+        else if (ref.kind === 'localNonWeb')
+            localNonWeb += 1;
+        else if (ref.kind === 'localWeb')
+            localWeb += 1;
+        else
+            unknown += 1;
+        if (isActionableContentImage(ref.kind) && ref.locations.some((l) => l.field === 'cover')) {
+            coverIssues += 1;
+        }
+        if (isActionableContentImage(ref.kind)) {
+            for (const loc of ref.locations) {
+                if (loc.entityType === 'article')
+                    articleIds.add(loc.entityId);
+                else
+                    pageIds.add(loc.entityId);
+            }
+        }
+    }
+    const actionable = external + localNonWeb;
+    const samples = refs.filter((r) => isActionableContentImage(r.kind)).slice(0, sampleLimit);
+    return {
+        totalUnique: refs.length,
+        external,
+        localNonWeb,
+        localWeb,
+        unknown,
+        coverIssues,
+        articlesWithIssues: articleIds.size,
+        pagesWithIssues: pageIds.size,
+        actionable,
+        samples,
+    };
+}
+exports.summarizeContentImageRefs = summarizeContentImageRefs;
+function mergeContentImageRefs(map, url, kind, extension, location) {
+    const existing = map.get(url);
+    if (existing) {
+        const key = `${location.entityType}:${location.entityId}:${location.field}`;
+        if (!existing.locations.some((l) => `${l.entityType}:${l.entityId}:${l.field}` === key)) {
+            existing.locations.push(location);
+        }
+        return;
+    }
+    map.set(url, { url, kind, extension, locations: [location] });
+}
+exports.mergeContentImageRefs = mergeContentImageRefs;
+//# sourceMappingURL=content-image-scan.util.js.map

package/dist/modules/file/content-image-scan.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-image-scan.util.js","sourceRoot":"","sources":["../../../src/modules/file/content-image-scan.util.ts"],"names":[],"mappings":"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"}

package/dist/modules/file/file-optimization.service.js

@@ -24,6 +24,7 @@ const date_util_1 = require("../../utils/date.util");
 const image_processor_util_1 = require("../../utils/image-processor.util");
 const oss_util_1 = require("../../utils/oss.util");
 const upload_util_1 = require("../../utils/upload.util");
+const upload_url_util_1 = require("../../utils/upload-url.util");
 const article_revision_entity_1 = require("../article/article-revision.entity");
 const article_entity_1 = require("../article/article.entity");
 const page_entity_1 = require("../page/page.entity");
@@ -53,8 +54,7 @@ let FileOptimizationService = FileOptimizationService_1 = class FileOptimization
         this.localUpload = new upload_util_1.LocalUpload();
     }
     getUploadBaseUrl() {
-        return (this.configService.get('SERVER_PUBLIC_UPLOAD_URL') ||
-            `${this.configService.get('SERVER_SITE_URL')}/public/uploads`);
+        return (0, upload_url_util_1.resolveUploadBaseUrl)(this.configService);
     }
     async persistBuffer(filename, buffer, hasOssConfig) {
         if (hasOssConfig) {
@@ -268,11 +268,13 @@ let FileOptimizationService = FileOptimizationService_1 = class FileOptimization
     }
     async reprocessOne(file, opts) {
         var _a, _b;
+        const uploadBase = this.getUploadBaseUrl();
+        const storedUrl = file.url;
         const base = {
             fileId: file.id,
             originalname: file.originalname,
             status: 'failed',
-            oldUrl: file.url,
+            oldUrl: storedUrl,
         };
         try {
             const buffer = await this.readStoredFile(file.filename, opts.hasOssConfig);
@@ -300,8 +302,8 @@ let FileOptimizationService = FileOptimizationService_1 = class FileOptimization
             const primaryVariant = (0, image_processor_util_1.primaryVariantForScene)('default');
             const primary = variantsMeta[primaryVariant];
             const oldFilename = file.filename;
-            const oldUrl = file.url;
             const oldSize = (_b = file.size) !== null && _b !== void 0 ? _b : 0;
+            const normalizedOldUrl = (0, upload_url_util_1.rewriteBrokenUploadUrl)(storedUrl, uploadBase);
             file.originalname = `${path.basename(file.originalname, path.extname(file.originalname))}.webp`;
             file.filename = primary.filename;
             file.url = primary.url;
@@ -312,7 +314,7 @@ let FileOptimizationService = FileOptimizationService_1 = class FileOptimization
             if (opts.cleanupOriginals && oldFilename !== primary.filename) {
                 await this.removeStoredFile(oldFilename, opts.hasOssConfig);
             }
-            return Object.assign(Object.assign({}, base), { status: 'success', newUrl: primary.url, savedBytes: Math.max(0, oldSize - primary.size) });
+            return Object.assign(Object.assign({}, base), { status: 'success', oldUrl: storedUrl.startsWith('undefined/') ? storedUrl : normalizedOldUrl, newUrl: primary.url, savedBytes: Math.max(0, oldSize - primary.size) });
         }
         catch (err) {
             return Object.assign(Object.assign({}, base), { error: err instanceof Error ? err.message : String(err) });

package/dist/modules/file/file-optimization.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-optimization.service.js","sourceRoot":"","sources":["../../../src/modules/file/file-optimization.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-optimization.service.js","sourceRoot":"","sources":["../../../src/modules/file/file-optimization.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/file/file.service.d.ts

@@ -11,6 +11,7 @@ export declare class FileService {
     private localUpload;
     constructor(fileRepository: Repository<File>, settingService: SettingService, configService: ConfigService);
     private getUploadBaseUrl;
+    private normalizeFile;
     private persistBuffer;
     private removeStoredFile;
     uploadFile(file: any, unique: any, scene?: ImageScene): Promise<File>;

package/dist/modules/file/file.service.js

@@ -11,17 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileService = void 0;
 const common_1 = require("@nestjs/common");
@@ -34,6 +23,7 @@ const image_processor_util_1 = require("../../utils/image-processor.util");
 const query_whitelist_util_1 = require("../../utils/query-whitelist.util");
 const oss_util_1 = require("../../utils/oss.util");
 const uniqueid_util_1 = require("../../utils/uniqueid.util");
+const upload_url_util_1 = require("../../utils/upload-url.util");
 const upload_util_1 = require("../../utils/upload.util");
 const setting_service_1 = require("../setting/setting.service");
 const file_entity_1 = require("./file.entity");
@@ -46,8 +36,19 @@ let FileService = class FileService {
         this.localUpload = new upload_util_1.LocalUpload();
     }
     getUploadBaseUrl() {
-        return (this.configService.get('SERVER_PUBLIC_UPLOAD_URL') ||
-            `${this.configService.get('SERVER_SITE_URL')}/public/uploads`);
+        return (0, upload_url_util_1.resolveUploadBaseUrl)(this.configService);
+    }
+    normalizeFile(file) {
+        const base = this.getUploadBaseUrl();
+        file.url = (0, upload_url_util_1.rewriteBrokenUploadUrl)(file.url, base);
+        if (file.variants) {
+            for (const variant of Object.values(file.variants)) {
+                if (variant === null || variant === void 0 ? void 0 : variant.url) {
+                    variant.url = (0, upload_url_util_1.rewriteBrokenUploadUrl)(variant.url, base);
+                }
+            }
+        }
+        return file;
     }
     async persistBuffer(filename, buffer, hasOssConfig) {
         if (hasOssConfig) {
@@ -64,7 +65,7 @@ let FileService = class FileService {
         await this.localUpload.deleteFile(filename);
     }
     async uploadFile(file, unique, scene = 'default') {
-        let { originalname, mimetype, size, buffer } = file;
+        const { originalname, mimetype, size, buffer } = file;
         const dataFolder = (0, date_util_1.dateFormat)(new Date(), 'yyyy-MM-dd');
         const ext = path.extname(originalname);
         const hasOssConfig = await this.oss.hasOssConfig();
@@ -113,7 +114,7 @@ let FileService = class FileService {
     async findAll(queryParams) {
         const query = this.fileRepository.createQueryBuilder('file').orderBy('file.createAt', 'DESC');
         if (typeof queryParams === 'object') {
-            const { page = 1, pageSize = 12 } = queryParams, otherParams = __rest(queryParams, ["page", "pageSize"]);
+            const { page = 1, pageSize = 12 } = queryParams;
             query.skip((+page - 1) * +pageSize);
             query.take(+pageSize);
             const filtered = (0, query_whitelist_util_1.filterByWhitelist)('file', queryParams);
@@ -121,13 +122,16 @@ let FileService = class FileService {
                 query.andWhere(`file.${key} LIKE :${key}`).setParameter(`${key}`, `%${filtered[key]}%`);
             });
         }
-        return query.getManyAndCount();
+        const [rows, total] = await query.getManyAndCount();
+        return [rows.map((file) => this.normalizeFile(file)), total];
     }
     async findById(id) {
-        return this.fileRepository.findOne(id);
+        const file = await this.fileRepository.findOne(id);
+        return file ? this.normalizeFile(file) : file;
     }
     async findByIds(ids) {
-        return this.fileRepository.findByIds(ids);
+        const files = await this.fileRepository.findByIds(ids);
+        return files.map((file) => this.normalizeFile(file));
     }
     async deleteById(id) {
         const target = await this.fileRepository.findOne(id);

package/dist/modules/file/file.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.service.js","sourceRoot":"","sources":["../../../src/modules/file/file.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.service.js","sourceRoot":"","sources":["../../../src/modules/file/file.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/setting/setting.constant.d.ts

@@ -1,5 +1,5 @@
 export { messages as i18n } from '@fecommunity/reactpress-toolkit/config';
 export declare const settings: {
-    theme: import("@fecommunity/reactpress-toolkit/theme").SiteThemeState;
+    theme: import("@fecommunity/reactpress-toolkit/theme/extension").SiteThemeState;
 };
-export declare const UNPROTECTED_KEYS: ("i18n" | "systemUrl" | "adminSystemUrl" | "globalSetting" | "systemTitle" | "systemSubTitle" | "systemLogo" | "systemFavicon" | "systemNoticeInfo" | "seoKeyword" | "seoDesc" | "baiduAnalyticsId" | "googleAnalyticsId" | "systemFooterInfo" | "aboutUsGithubUrl" | "aboutUsCommentQr" | "aboutUsWechatQr")[];
+export declare const UNPROTECTED_KEYS: ("i18n" | "globalSetting" | "systemUrl" | "systemTitle" | "systemSubTitle" | "systemLogo" | "systemFavicon" | "systemNoticeInfo" | "systemFooterInfo" | "aboutUsGithubUrl" | "aboutUsCommentQr" | "aboutUsWechatQr" | "adminSystemUrl" | "baiduAnalyticsId" | "googleAnalyticsId" | "seoKeyword" | "seoDesc")[];

package/dist/modules/setting/setting.constant.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNPROTECTED_KEYS = exports.settings = exports.i18n = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
 var config_1 = require("../../../../toolkit/dist/config");
 Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return config_1.messages; } });
-exports.settings = theme_1.systemGlobalSettingDefaults;
-exports.UNPROTECTED_KEYS = [...theme_1.PUBLIC_SETTING_KEYS];
+exports.settings = extension_1.systemGlobalSettingDefaults;
+exports.UNPROTECTED_KEYS = [...extension_1.PUBLIC_SETTING_KEYS];
 //# sourceMappingURL=setting.constant.js.map

package/dist/modules/setting/setting.constant.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.constant.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.constant.ts"],"names":[],"mappings":";;;AAAA,0DAAyG;AAKzG,0DAA0E;AAAjE,8FAAA,QAAQ,OAAQ;AAGZ,QAAA,QAAQ,GAAG,mCAA2B,CAAC;AAEvC,QAAA,gBAAgB,GAAG,CAAC,GAAG,2BAAmB,CAAC,CAAC"}
+{"version":3,"file":"setting.constant.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.constant.ts"],"names":[],"mappings":";;;AAAA,wEAAmH;AAKnH,0DAA0E;AAAjE,8FAAA,QAAQ,OAAQ;AAGZ,QAAA,QAAQ,GAAG,uCAA2B,CAAC;AAEvC,QAAA,gBAAgB,GAAG,CAAC,GAAG,+BAAmB,CAAC,CAAC"}

package/dist/modules/setting/setting.service.js

@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingService = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
@@ -121,8 +121,8 @@ let SettingService = class SettingService {
         catch (_b) {
             data = {};
         }
-        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(data);
-        const defaultTheme = (0, theme_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
+        const themeState = (0, extension_1.getThemeStateFromGlobalSetting)(data);
+        const defaultTheme = (0, extension_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
         const mergedTheme = Object.assign(Object.assign(Object.assign({}, defaultTheme), themeState), { mods: Object.assign(Object.assign({}, defaultTheme.mods), themeState.mods), installedThemes: ((_a = themeState.installedThemes) === null || _a === void 0 ? void 0 : _a.length) > 0 ? themeState.installedThemes : defaultTheme.installedThemes });
         const mergedSettings = Object.assign(Object.assign({}, data), { theme: mergedTheme });
         const mergedSettingsString = JSON.stringify(mergedSettings);
@@ -166,7 +166,7 @@ let SettingService = class SettingService {
         catch (_a) {
             gs = {};
         }
-        const { global, changed } = (0, theme_1.migrateLegacyAppearanceToThemeMods)(gs, target);
+        const { global, changed } = (0, extension_1.migrateLegacyAppearanceToThemeMods)(gs, target);
         if (changed) {
             target.globalSetting = JSON.stringify(global);
             await this.settingRepository.save(target);
@@ -184,14 +184,14 @@ let SettingService = class SettingService {
         catch (_a) {
             gs = {};
         }
-        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(gs);
+        const themeState = (0, extension_1.getThemeStateFromGlobalSetting)(gs);
         const activeTheme = themeState.activeTheme || 'hello-world';
         const config = gs.config && typeof gs.config === 'object'
             ? Object.assign({}, gs.config)
             : {};
         let changed = false;
         for (const themeId of THEMES_WITH_CONFIGURATION) {
-            const seed = (0, theme_1.getThemeConfigurationSeed)(themeId, 'zh');
+            const seed = (0, extension_1.getThemeConfigurationSeed)(themeId, 'zh');
             if (!seed)
                 continue;
             const current = config[themeId];
@@ -221,16 +221,16 @@ let SettingService = class SettingService {
         if (isAdmin && !innerInvoke) {
             return res;
         }
-        const effective = (0, theme_1.resolveEffectiveSettingRow)(res);
+        const effective = (0, extension_1.resolveEffectiveSettingRow)(res);
         if (innerInvoke) {
             return effective;
         }
-        return (0, theme_1.buildPublicSettingView)(effective);
+        return (0, extension_1.buildPublicSettingView)(effective);
     }
     async update(setting) {
         var _a;
         const old = await this.ensureSettingRow();
-        const sanitized = (0, theme_1.pickSystemSettingPatch)(setting);
+        const sanitized = (0, extension_1.pickSystemSettingPatch)(setting);
         if ('smtpPass' in sanitized && !String((_a = sanitized.smtpPass) !== null && _a !== void 0 ? _a : '').trim()) {
             delete sanitized.smtpPass;
         }

package/dist/modules/setting/setting.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/user/user.service.js

@@ -39,13 +39,13 @@ let UserService = class UserService {
         const password = this.configService.get('ADMIN_PASSWD', 'admin');
         this.createUser({ name, password, role: 'admin' }, true)
             .then(() => {
-            console.log(`[reactpress] 管理员账户创建成功，用户名：${name}，密码：${password}，请及时登录系统修改默认密码`);
+            console.log(`[reactpress] Admin account created (username: ${name}). Change the default password after first login.`);
         })
             .catch(async (e) => {
             const existAdminUser = await this.userRepository.findOne({ where: { name } });
             const isDefaultPasswd = user_entity_1.User.comparePassword(password, existAdminUser.password);
             if (isDefaultPasswd) {
-                console.log(`[reactpress] 管理员账户已经存在，用户名：${name}，密码：${password}，请及时登录系统修改默认密码`);
+                console.log(`[reactpress] Admin account already exists (username: ${name}). Change the default password if you still use factory credentials.`);
             }
         });
     }