From 342ad61fc06d09fd4fe067b8c1c8946a23fd4378 Mon Sep 17 00:00:00 2001
From: pqcqaq <905739777@qq.com>
Date: Mon, 18 Aug 2025 13:40:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8bcryptjs=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2bcrypt=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=BA=86=E6=9C=AC?=
=?UTF-8?q?=E5=9C=B0C++=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BE=9D=E8=B5=96?=
=?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/build.js | 2 +-
lib/clean.js | 2 +-
lib/create.js | 7 +++----
lib/createConfig.js | 3 +--
lib/file-handle.d.ts | 2 --
lib/file-handle.js | 21 ++++++++++-----------
lib/makeDependency.js | 2 +-
lib/makeDomain.js | 2 +-
lib/makeLocale.js | 2 +-
lib/makeRouter.js | 2 +-
lib/rename.js | 5 ++---
lib/run.js | 2 +-
lib/server/initialize.d.ts | 1 -
lib/server/initialize.js | 3 +--
lib/server/start.d.ts | 1 -
lib/server/start.js | 9 ++++-----
lib/server/watch.d.ts | 1 -
lib/template.js | 23 +++++++++++------------
lib/utils.js | 17 ++++++++---------
package.json | 2 +-
src/server/start.ts | 2 +-
21 files changed, 49 insertions(+), 62 deletions(-)
diff --git a/lib/build.js b/lib/build.js
index 6fee0ef..2db5ec8 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = build;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -184,4 +185,3 @@ async function build(cmd) {
(0, tip_style_1.Error)(`${(0, tip_style_1.error)(`target could only be web or mp(wechatMp) or rn(native)`)}`);
}
}
-exports.default = build;
diff --git a/lib/clean.js b/lib/clean.js
index b6b057e..5e0e07f 100644
--- a/lib/clean.js
+++ b/lib/clean.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = run;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -48,4 +49,3 @@ async function run(options) {
process.exit(-1);
}
}
-exports.default = run;
diff --git a/lib/create.js b/lib/create.js
index 71ea8dd..b30d4c1 100644
--- a/lib/create.js
+++ b/lib/create.js
@@ -1,6 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = exports.create = void 0;
+exports.create = create;
+exports.update = update;
const tslib_1 = require("tslib");
const ts = tslib_1.__importStar(require("typescript"));
const fs_1 = require("fs");
@@ -242,7 +243,7 @@ async function create(dirName, cmd) {
}
// 获取package.json内容
const packageJson = (0, template_1.packageJsonContent)({
- name: DEFAULT_PROJECT_NAME,
+ name: DEFAULT_PROJECT_NAME, // 后面再统一rename
version,
description,
cliName: config_1.CLI_NAME,
@@ -265,7 +266,6 @@ async function create(dirName, cmd) {
(0, tip_style_1.Error)((0, tip_style_1.error)(err));
}
}
-exports.create = create;
async function update(dirName, subDirName, cmd) {
const isDev = cmd.dev ? true : false;
try {
@@ -292,4 +292,3 @@ async function update(dirName, subDirName, cmd) {
console.error((0, tip_style_1.error)(err.message));
}
}
-exports.update = update;
diff --git a/lib/createConfig.js b/lib/createConfig.js
index 71233f6..4c8e467 100644
--- a/lib/createConfig.js
+++ b/lib/createConfig.js
@@ -1,6 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateCompilerConfig = void 0;
+exports.CreateCompilerConfig = CreateCompilerConfig;
/**
* 创建一个oak编译器配置
* @param raw 原始配置
@@ -11,7 +11,6 @@ function CreateCompilerConfig(raw) {
// 在这里可以做配置的预处理
return raw;
}
-exports.CreateCompilerConfig = CreateCompilerConfig;
/**
* 将compiler.js中的模块导出使用以下形式：
* module.exports = CreateComilerConfig({})
diff --git a/lib/file-handle.d.ts b/lib/file-handle.d.ts
index 906763d..8c3c1bf 100644
--- a/lib/file-handle.d.ts
+++ b/lib/file-handle.d.ts
@@ -1,5 +1,3 @@
-///
-///
import { PathLike } from 'fs';
import { checkFileExistsAndCreateType } from './enum';
/**
diff --git a/lib/file-handle.js b/lib/file-handle.js
index 14f0c2f..3e5b805 100644
--- a/lib/file-handle.js
+++ b/lib/file-handle.js
@@ -1,6 +1,15 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFileExistsAndCreate = exports.checkFileExists = exports.copyFolder = exports.readFile = exports.writeFile = exports.deleteFolderRecursive = exports.parseJsonFile = exports.parseJsonFiles = exports.readDirGetFile = exports.readDirPath = void 0;
+exports.readDirPath = readDirPath;
+exports.readDirGetFile = readDirGetFile;
+exports.parseJsonFiles = parseJsonFiles;
+exports.parseJsonFile = parseJsonFile;
+exports.deleteFolderRecursive = deleteFolderRecursive;
+exports.writeFile = writeFile;
+exports.readFile = readFile;
+exports.copyFolder = copyFolder;
+exports.checkFileExists = checkFileExists;
+exports.checkFileExistsAndCreate = checkFileExistsAndCreate;
const fs_1 = require("fs");
const path_1 = require("path");
const enum_1 = require("./enum");
@@ -25,7 +34,6 @@ function readDirPath(entry) {
}
return pathList;
}
-exports.readDirPath = readDirPath;
/**
* @name 读取指定目录的文件（不进行深度遍历，只获取根目录）
* @export
@@ -36,7 +44,6 @@ function readDirGetFile(entry) {
const dirInfo = (0, fs_1.readdirSync)(entry);
return dirInfo;
}
-exports.readDirGetFile = readDirGetFile;
/**
* @name 解析json文件(数组)
* @export
@@ -51,7 +58,6 @@ function parseJsonFiles(arr) {
}
return result;
}
-exports.parseJsonFiles = parseJsonFiles;
/**
* @name 解析单个文件json
* @export
@@ -67,7 +73,6 @@ function parseJsonFile(file) {
return;
}
}
-exports.parseJsonFile = parseJsonFile;
/**
* @name 删除文件夹
* @export
@@ -97,7 +102,6 @@ function deleteFolderRecursive(entry) {
// console.log("文件夹不存在");
}
}
-exports.deleteFolderRecursive = deleteFolderRecursive;
;
function writeFile(path, data) {
try {
@@ -108,7 +112,6 @@ function writeFile(path, data) {
(0, tip_style_1.Error)((0, tip_style_1.error)('文件写入失败'));
}
}
-exports.writeFile = writeFile;
function readFile(path, options) {
try {
const data = (0, fs_1.readFileSync)(path, options);
@@ -119,7 +122,6 @@ function readFile(path, options) {
(0, tip_style_1.Error)((0, tip_style_1.error)('文件读取失败'));
}
}
-exports.readFile = readFile;
/**
* @name 拷贝文件夹
* @export
@@ -181,7 +183,6 @@ function copyFolder(currentDir, targetDir, overwrite = false) {
throw new global.Error(`需要copy的文件夹不存在: ${currentDir}`);
}
}
-exports.copyFolder = copyFolder;
/**
* @name 检测文件/文件夹是否存在
* @export
@@ -191,7 +192,6 @@ exports.copyFolder = copyFolder;
function checkFileExists(path) {
return (0, fs_1.existsSync)(path);
}
-exports.checkFileExists = checkFileExists;
/**
* @name 检测文件/文件夹是否存在，不存在则创建
* @export
@@ -217,4 +217,3 @@ function checkFileExistsAndCreate(path, data, type = enum_1.checkFileExistsAndCr
throw new global.Error(`${path} already exists!`);
}
}
-exports.checkFileExistsAndCreate = checkFileExistsAndCreate;
diff --git a/lib/makeDependency.js b/lib/makeDependency.js
index 271c321..0812d9a 100644
--- a/lib/makeDependency.js
+++ b/lib/makeDependency.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = make;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -21,4 +22,3 @@ async function make(cmd) {
process.exit(-1);
}
}
-exports.default = make;
diff --git a/lib/makeDomain.js b/lib/makeDomain.js
index c5c89e4..eb140b2 100644
--- a/lib/makeDomain.js
+++ b/lib/makeDomain.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = make;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -20,4 +21,3 @@ async function make() {
process.exit(-1);
}
}
-exports.default = make;
diff --git a/lib/makeLocale.js b/lib/makeLocale.js
index 7da9a71..f27f7fa 100644
--- a/lib/makeLocale.js
+++ b/lib/makeLocale.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = make;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const localeBuilder_1 = tslib_1.__importDefault(require("oak-domain/lib/compiler/localeBuilder"));
@@ -18,4 +19,3 @@ async function make(cmd) {
process.exit(-1);
}
}
-exports.default = make;
diff --git a/lib/makeRouter.js b/lib/makeRouter.js
index 61eda2b..d3a5196 100644
--- a/lib/makeRouter.js
+++ b/lib/makeRouter.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = make;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -30,4 +31,3 @@ async function make(cmd, watch) {
process.exit(-1);
}
}
-exports.default = make;
diff --git a/lib/rename.js b/lib/rename.js
index 62b30e3..71af610 100644
--- a/lib/rename.js
+++ b/lib/rename.js
@@ -1,6 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.rename = exports.renameProject = void 0;
+exports.renameProject = renameProject;
+exports.rename = rename;
const path_1 = require("path");
const fs_1 = require("fs");
const editTemplate_1 = require("@react-native-community/cli/build/commands/init/editTemplate");
@@ -44,7 +45,6 @@ async function renameProject(dir, name, title, placeholderName, placeholderTitle
process.chdir(cwd);
(0, tip_style_1.Success)(`${(0, tip_style_1.success)(`Change project name to ${(0, tip_style_1.primary)(name)}, project title to ${(0, tip_style_1.primary)(title)}`)}`);
}
-exports.renameProject = renameProject;
async function rename(cmd) {
const { oldName, newName, oldTitle, newTitle } = cmd;
if (!oldName) {
@@ -65,4 +65,3 @@ async function rename(cmd) {
}
renameProject(process.cwd(), newName, newTitle, oldName, oldTitle);
}
-exports.rename = rename;
diff --git a/lib/run.js b/lib/run.js
index 4d431e1..bfb8be2 100644
--- a/lib/run.js
+++ b/lib/run.js
@@ -1,5 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = run;
const tslib_1 = require("tslib");
const tip_style_1 = require("./tip-style");
const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
@@ -59,4 +60,3 @@ async function run(options) {
process.exit(-1);
}
}
-exports.default = run;
diff --git a/lib/server/initialize.d.ts b/lib/server/initialize.d.ts
index 964ab37..b13884d 100644
--- a/lib/server/initialize.d.ts
+++ b/lib/server/initialize.d.ts
@@ -1,4 +1,3 @@
-///
import { EntityDict } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
diff --git a/lib/server/initialize.js b/lib/server/initialize.js
index 90f692b..acdfa85 100644
--- a/lib/server/initialize.js
+++ b/lib/server/initialize.js
@@ -1,6 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialize = void 0;
+exports.initialize = initialize;
///
const oak_backend_base_1 = require("oak-backend-base");
async function initialize(path) {
@@ -10,4 +10,3 @@ async function initialize(path) {
await appLoader.unmount();
console.log('data initialized');
}
-exports.initialize = initialize;
diff --git a/lib/server/start.d.ts b/lib/server/start.d.ts
index 4507fbd..2e45380 100644
--- a/lib/server/start.d.ts
+++ b/lib/server/start.d.ts
@@ -1,4 +1,3 @@
-///
import './polyfill';
import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
import { Connector, EntityDict } from 'oak-domain/lib/types';
diff --git a/lib/server/start.js b/lib/server/start.js
index 49143a8..f6c6429 100644
--- a/lib/server/start.js
+++ b/lib/server/start.js
@@ -1,6 +1,6 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.startup = void 0;
+exports.startup = startup;
const tslib_1 = require("tslib");
///
require("./polyfill");
@@ -63,7 +63,7 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
}
: serverConfiguration.cors
? {
- origin: serverConfiguration.cors.origin,
+ origin: serverConfiguration.cors.origin, //socket.io配置cors origin是支持数组和字符串
allowedHeaders: [
...corsHeaders.concat(connector.getCorsHeader()),
...(serverConfiguration.cors.headers || []),
@@ -145,9 +145,9 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
if (!ui?.disable) {
(0, admin_ui_1.instrument)(io, {
auth: {
- type: "basic",
+ type: "basic", // 使用基本认证，生产建议关闭或换成自定义 auth
username: ui?.username || "admin",
- password: bcryptjs_1.default.hashSync(passwordForAdminUI, 10), // 使用 bcrypt 加密密码
+ password: bcryptjs_1.default.hashSync(passwordForAdminUI, 10), // 必须使用 bcrypt 加密之后的密码
},
mode: process.env.NODE_ENV === 'production' ? "production" : "development", // 根据环境设置模式
});
@@ -366,4 +366,3 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
};
return shutdown;
}
-exports.startup = startup;
diff --git a/lib/server/watch.d.ts b/lib/server/watch.d.ts
index 45b0b46..122b4de 100644
--- a/lib/server/watch.d.ts
+++ b/lib/server/watch.d.ts
@@ -1,4 +1,3 @@
-///
export type LogFormatterProp = {
level: "info" | "warn" | "error";
caller: NodeJS.CallSite | null;
diff --git a/lib/template.js b/lib/template.js
index c187434..5faa203 100644
--- a/lib/template.js
+++ b/lib/template.js
@@ -1,6 +1,16 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCompilerJsContent = exports.oakConfigContentWithWeb = exports.oakConfigContentWithWeChatMp = exports.appJsonContentWithWeChatMp = exports.projectConfigContentWithWeChatMp = exports.tsConfigWebJsonContent = exports.tsConfigMpJsonContent = exports.tsConfigPathsJsonContent = exports.tsConfigBuildJsonContent = exports.tsConfigJsonContent = exports.packageJsonContent = void 0;
+exports.packageJsonContent = packageJsonContent;
+exports.tsConfigJsonContent = tsConfigJsonContent;
+exports.tsConfigBuildJsonContent = tsConfigBuildJsonContent;
+exports.tsConfigPathsJsonContent = tsConfigPathsJsonContent;
+exports.tsConfigMpJsonContent = tsConfigMpJsonContent;
+exports.tsConfigWebJsonContent = tsConfigWebJsonContent;
+exports.projectConfigContentWithWeChatMp = projectConfigContentWithWeChatMp;
+exports.appJsonContentWithWeChatMp = appJsonContentWithWeChatMp;
+exports.oakConfigContentWithWeChatMp = oakConfigContentWithWeChatMp;
+exports.oakConfigContentWithWeb = oakConfigContentWithWeb;
+exports.updateCompilerJsContent = updateCompilerJsContent;
const tslib_1 = require("tslib");
const child_process_1 = require("child_process");
const fs_1 = require("fs");
@@ -299,7 +309,6 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
}
`;
}
-exports.packageJsonContent = packageJsonContent;
function tsConfigJsonContent() {
return `{
"extends": "./tsconfig.paths.json",
@@ -351,7 +360,6 @@ function tsConfigJsonContent() {
]
}`;
}
-exports.tsConfigJsonContent = tsConfigJsonContent;
function tsConfigBuildJsonContent() {
return `{
"extends": "./tsconfig.build.paths.json",
@@ -391,7 +399,6 @@ function tsConfigBuildJsonContent() {
]
}`;
}
-exports.tsConfigBuildJsonContent = tsConfigBuildJsonContent;
function tsConfigPathsJsonContent(deps) {
const paths = {
"@project/*": [
@@ -420,7 +427,6 @@ function tsConfigPathsJsonContent(deps) {
}
}, null, '\t');
}
-exports.tsConfigPathsJsonContent = tsConfigPathsJsonContent;
function tsConfigMpJsonContent() {
return `{
"extends": "./tsconfig.paths.json",
@@ -468,7 +474,6 @@ function tsConfigMpJsonContent() {
]
}`;
}
-exports.tsConfigMpJsonContent = tsConfigMpJsonContent;
function tsConfigWebJsonContent() {
return `{
"extends": "./tsconfig.paths.json",
@@ -518,7 +523,6 @@ function tsConfigWebJsonContent() {
]
}`;
}
-exports.tsConfigWebJsonContent = tsConfigWebJsonContent;
function projectConfigContentWithWeChatMp(oakConfigName, projectname, miniVersion) {
return `{
"description": "项目配置文件",
@@ -594,7 +598,6 @@ function projectConfigContentWithWeChatMp(oakConfigName, projectname, miniVersio
}
}`;
}
-exports.projectConfigContentWithWeChatMp = projectConfigContentWithWeChatMp;
function appJsonContentWithWeChatMp(isDev) {
const pages = [
'@project/pages/store/list/index',
@@ -618,21 +621,18 @@ function appJsonContentWithWeChatMp(isDev) {
"sitemapLocation": "sitemap.json"
}`;
}
-exports.appJsonContentWithWeChatMp = appJsonContentWithWeChatMp;
function oakConfigContentWithWeChatMp() {
return `{
"theme": {
}
}`;
}
-exports.oakConfigContentWithWeChatMp = oakConfigContentWithWeChatMp;
function oakConfigContentWithWeb() {
return `{
"theme": {
}
}`;
}
-exports.oakConfigContentWithWeb = oakConfigContentWithWeb;
function updateCompilerJsContent(directory, deps) {
const compilerJsPath = (0, path_1.join)(directory, 'configuration', 'compiler.js');
(0, assert_1.default)((0, fs_1.existsSync)(compilerJsPath));
@@ -691,4 +691,3 @@ function updateCompilerJsContent(directory, deps) {
(0, fs_1.writeFileSync)(compilerJsPath, code);
}
}
-exports.updateCompilerJsContent = updateCompilerJsContent;
diff --git a/lib/utils.js b/lib/utils.js
index 716af35..f919eb7 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,6 +1,13 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomString = exports.deWeight = exports.formatJsonByFile = exports.union = exports.intersect = exports.difference = exports.getStr = exports.findJson = void 0;
+exports.findJson = findJson;
+exports.getStr = getStr;
+exports.difference = difference;
+exports.intersect = intersect;
+exports.union = union;
+exports.formatJsonByFile = formatJsonByFile;
+exports.deWeight = deWeight;
+exports.randomString = randomString;
/**
* @name 从一组路径里查找到所有json文件
* @export
@@ -18,7 +25,6 @@ function findJson(pathArr) {
}
return result;
}
-exports.findJson = findJson;
/**
* @name 已知前后文取中间文本
* @export
@@ -32,7 +38,6 @@ function getStr(str, start, end) {
let res = str.match(reg);
return res ? res[1] : null;
}
-exports.getStr = getStr;
/**
* @name 差集
* @export
@@ -44,7 +49,6 @@ exports.getStr = getStr;
function difference(current, target) {
return new Set([...target].filter(x => !current.has(x)));
}
-exports.difference = difference;
/**
* @name 获取交集
* @export
@@ -56,7 +60,6 @@ exports.difference = difference;
function intersect(current, target) {
return new Set([...target].filter(x => current.has(x)));
}
-exports.intersect = intersect;
/**
* @name 获取并集
* @export
@@ -68,7 +71,6 @@ exports.intersect = intersect;
function union(current, target) {
return new Set([...current, ...target]);
}
-exports.union = union;
/**
* @name 格式化json
* @export
@@ -79,7 +81,6 @@ exports.union = union;
function formatJsonByFile(data) {
return JSON.stringify(data, null, 2);
}
-exports.formatJsonByFile = formatJsonByFile;
/**
* @name 数组对象去重
* @export
@@ -96,7 +97,6 @@ function deWeight(arr, type) {
}
return new Set([...map.values()]);
}
-exports.deWeight = deWeight;
/**
* @name 随机字符串
* @export
@@ -112,4 +112,3 @@ function randomString(length) {
}
return result;
}
-exports.randomString = randomString;
diff --git a/package.json b/package.json
index 9ef4e1b..9a2230a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
"babel-loader": "^8.2.3",
"babel-plugin-named-asset-import": "^0.3.8",
"babel-preset-react-app": "^10.0.1",
- "bcrypt": "^5.1.1",
+ "bcryptjs": "^3.0.2",
"bfj": "^7.0.2",
"browser-assert": "^1.2.1",
"browserify-sign": "4.2.2",
diff --git a/src/server/start.ts b/src/server/start.ts
index 268adc0..d97b8b4 100644
--- a/src/server/start.ts
+++ b/src/server/start.ts
@@ -172,7 +172,7 @@ export async function startup