Commit c7aec622 authored by nanahira's avatar nanahira

fix conflict id string

parent cba21253
Pipeline #6180 passed with stages
in 31 seconds
...@@ -75,9 +75,9 @@ export class AppModule {} ...@@ -75,9 +75,9 @@ export class AppModule {}
Koishi-Nest 的配置项和 Koishi 配置项一致,参照 [Koishi 文档](https://koishi.js.org/v4/api/core/app.html#%E6%9E%84%E9%80%A0%E5%87%BD%E6%95%B0%E9%80%89%E9%A1%B9) 。下列配置项为 Koishi-Nest 特有的配置项。 Koishi-Nest 的配置项和 Koishi 配置项一致,参照 [Koishi 文档](https://koishi.js.org/v4/api/core/app.html#%E6%9E%84%E9%80%A0%E5%87%BD%E6%95%B0%E9%80%89%E9%A1%B9) 。下列配置项为 Koishi-Nest 特有的配置项。
* `loggerPrefix`: `string` Nest 日志中 Logger 的前缀。默认 `koishi` * `loggerPrefix`: `string` Nest 日志中 Logger 的前缀。默认 `koishi`
* `loggerColor`: `number` Nest 日志中 Logger 的颜色支持。默认 `2` * `loggerColor`: `number` Nest 日志中 Logger 的颜色支持。默认 `0`
* `usePlugins`: `KoishiModulePlugin[]` 可选。预先安装的 Koishi 插件列表。使用 `PluginDef(plugin, options, select)` 方法生成该项的定义。该配置项的成员参数如下。 * `usePlugins`: `KoishiModulePlugin[]` 可选。预先安装的 Koishi 插件列表。使用 `PluginDef(plugin, options, select)` 方法生成该项的定义。该配置项的成员参数如下。
......
{ {
"name": "koishi-nestjs", "name": "koishi-nestjs",
"version": "1.0.37", "version": "1.0.38",
"description": "Koishi.js as Nest.js Module", "description": "Koishi.js as Nest.js Module",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",
......
...@@ -14,7 +14,9 @@ function constructProvideToken( ...@@ -14,7 +14,9 @@ function constructProvideToken(
scopeType: ContextScopeTypes, scopeType: ContextScopeTypes,
values: string[] = [], values: string[] = [],
) { ) {
return `KOISHI_CONTEXT_${scopeType}_${values.join('_')}`; return `KOISHI_CONTEXT_${scopeType}_${values
.map((v) => v.replace(/_/g, '__'))
.join('_')}`;
} }
function createContextProvider( function createContextProvider(
......
...@@ -9,7 +9,7 @@ export class KoishiLoggerService extends ConsoleLogger { ...@@ -9,7 +9,7 @@ export class KoishiLoggerService extends ConsoleLogger {
super(options.loggerPrefix || 'koishi'); super(options.loggerPrefix || 'koishi');
let colors = options.loggerColor; let colors = options.loggerColor;
if (colors == null) { if (colors == null) {
colors = 2; colors = 0;
} }
Logger.targets = [ Logger.targets = [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment