Skip to content

Commit

Permalink
Merge remote-tracking branch 'bp/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
waitingsong committed Jan 28, 2024
2 parents 8c32c0a + 582101c commit ccbd0e1
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 2 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ rules:
"@typescript-eslint/no-unused-vars": 0
"node/no-unpublished-import": 0
"@typescript-eslint/prefer-ts-expect-error": 0
"@typescript-eslint/no-extraneous-class": 0
"unicorn/filename-case": 0

23 changes: 23 additions & 0 deletions .scripts/set-env-local.sh.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash


export MIDWAY_SERVER_ENV=local
export NODE_ENV=local
export OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:4317"
export TS_NODE_PROJECT="test/tsconfig.json"
export POSTGRES_HOST="127.0.0.1"
export POSTGRES_PORT="5432"
export POSTGRES_DB=""
export POSTGRES_USER="postgres"
export POSTGRES_PASSWORD="postgres"
export ALI_ALB_IPS="120.55"
export ALI_ALB_GROUPID="sgp-7z"
export ALI_ECS_AID="LTAI5"
export ALI_ECS_ASECRET="Dr"
export ALI_ECS_IDS=""
export ALI_ECS_IPS=""
export ALI_OSS_AID="LTAI4"
export ALI_OSS_ASECRET="FRK"
export ALI_OSS_ENDPOINT="https://oss-cn-hangzhou.aliyuncs.com"
export ALI_OSS_BUCKET=""

23 changes: 23 additions & 0 deletions .scripts/set-env-test.sh.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash


export MIDWAY_SERVER_ENV=unittest
export NODE_ENV=unittest
export OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:4317"
export TS_NODE_PROJECT="test/tsconfig.json"
export POSTGRES_HOST="127.0.0.1"
export POSTGRES_PORT="5432"
export POSTGRES_DB=""
export POSTGRES_USER="postgres"
export POSTGRES_PASSWORD="postgres"
export ALI_ALB_IPS="120.55"
export ALI_ALB_GROUPID="sgp-7z"
export ALI_ECS_AID="LTAI5"
export ALI_ECS_ASECRET="Dr"
export ALI_ECS_IDS=""
export ALI_ECS_IPS=""
export ALI_OSS_AID="LTAI4"
export ALI_OSS_ASECRET="FRK"
export ALI_OSS_ENDPOINT="https://oss-cn-hangzhou.aliyuncs.com"
export ALI_OSS_BUCKET=""

1 change: 0 additions & 1 deletion .vscode/launch.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
],
"runtimeExecutable": "npm",
"skipFiles": [
"**/node_modules/**",
"**/node_modules/rxjs/**",
"<node_internals>/**",
"<node_internals>/**/*.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/midway-component-kmore/src/imports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const useComponents: IComponentInfo[] = [otel]
if (CI) {
useComponents.push(koa)
useComponents.push(info)
useComponents.push(cache)
useComponents.push(swagger)
useComponents.push(cache)
}

export interface IComponentInfo {
Expand Down

0 comments on commit ccbd0e1

Please sign in to comment.