befly 3.13.3 → 3.13.4
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/befly.js +11 -11
- package/dist/befly.min.js +8 -8
- package/dist/lib/connect.js +1 -1
- package/dist/plugins/db.js +3 -3
- package/dist/plugins/logger.js +3 -3
- package/dist/plugins/redis.js +4 -4
- package/package.json +2 -2
package/dist/befly.js
CHANGED
|
@@ -8476,7 +8476,7 @@ class Connect {
|
|
|
8476
8476
|
await this.connectSql(config2.db || {});
|
|
8477
8477
|
await this.connectRedis(config2.redis || {});
|
|
8478
8478
|
} catch (error) {
|
|
8479
|
-
Logger.error({ env: config2.nodeEnv, err: error, msg: "\u6570\u636E\u5E93\u521D\u59CB\u5316\u5931\u8D25" });
|
|
8479
|
+
Logger.error({ env: config2.nodeEnv, err: error, msg: "\u6570\u636E\u5E93\u8FDE\u63A5\u521D\u59CB\u5316\u5931\u8D25" });
|
|
8480
8480
|
await this.disconnect();
|
|
8481
8481
|
throw error;
|
|
8482
8482
|
}
|
|
@@ -14619,13 +14619,13 @@ var dbPlugin = {
|
|
|
14619
14619
|
enable: true,
|
|
14620
14620
|
deps: ["logger", "redis"],
|
|
14621
14621
|
async handler(befly) {
|
|
14622
|
-
const env = befly.config
|
|
14622
|
+
const env = befly.config?.nodeEnv;
|
|
14623
14623
|
if (!befly.redis) {
|
|
14624
|
-
throw new Error("
|
|
14624
|
+
throw new Error("Redis \u672A\u521D\u59CB\u5316");
|
|
14625
14625
|
}
|
|
14626
14626
|
try {
|
|
14627
14627
|
const sql = Connect.getSql();
|
|
14628
|
-
const rawDbType = befly.config
|
|
14628
|
+
const rawDbType = befly.config?.db?.type;
|
|
14629
14629
|
const resolvedDbType = rawDbType === "postgres" ? "postgresql" : rawDbType;
|
|
14630
14630
|
const dialect = getDialectByName(resolvedDbType === "postgresql" || resolvedDbType === "sqlite" ? resolvedDbType : "mysql");
|
|
14631
14631
|
const dbManager = new DbHelper({ redis: befly.redis, sql, dialect });
|
|
@@ -14720,9 +14720,9 @@ var loggerPlugin = {
|
|
|
14720
14720
|
name: "logger",
|
|
14721
14721
|
enable: true,
|
|
14722
14722
|
deps: [],
|
|
14723
|
-
async handler(
|
|
14724
|
-
if (
|
|
14725
|
-
Logger.configure(
|
|
14723
|
+
async handler(befly) {
|
|
14724
|
+
if (befly.config && befly.config.logger) {
|
|
14725
|
+
Logger.configure(befly.config.logger);
|
|
14726
14726
|
}
|
|
14727
14727
|
return Logger;
|
|
14728
14728
|
}
|
|
@@ -15100,12 +15100,12 @@ var redisPlugin = {
|
|
|
15100
15100
|
name: "redis",
|
|
15101
15101
|
enable: true,
|
|
15102
15102
|
deps: ["logger"],
|
|
15103
|
-
async handler(
|
|
15104
|
-
const env =
|
|
15105
|
-
const
|
|
15103
|
+
async handler(befly) {
|
|
15104
|
+
const env = befly.config?.nodeEnv;
|
|
15105
|
+
const redisPrefix = befly.config?.redis?.prefix;
|
|
15106
15106
|
try {
|
|
15107
15107
|
Connect.getRedis();
|
|
15108
|
-
return new RedisHelper(
|
|
15108
|
+
return new RedisHelper(redisPrefix);
|
|
15109
15109
|
} catch (error) {
|
|
15110
15110
|
Logger.error({ env, err: error, msg: "Redis \u521D\u59CB\u5316\u5931\u8D25" });
|
|
15111
15111
|
throw error;
|