Merge branch 'main' of github.com:nocobase/nocobase into fix-ci-build

This commit is contained in:
aaaaaajie 2025-04-17 10:53:42 +08:00
commit 4713b91e01
2 changed files with 35 additions and 33 deletions

View File

@ -5,38 +5,40 @@ concurrency:
cancel-in-progress: true
on:
push:
branches:
- main
- next
- develop
paths:
- 'package.json'
- '**/yarn.lock'
- 'packages/core/acl/**'
- 'packages/core/auth/**'
- 'packages/core/actions/**'
- 'packages/core/database/**'
- 'packages/core/resourcer/**'
- 'packages/core/data-source-manager/**'
- 'packages/core/server/**'
- 'packages/core/utils/**'
- 'packages/plugins/**/src/server/**'
- '.github/workflows/nocobase-test-backend.yml'
pull_request:
paths:
- 'package.json'
- '**/yarn.lock'
- 'packages/core/acl/**'
- 'packages/core/auth/**'
- 'packages/core/actions/**'
- 'packages/core/database/**'
- 'packages/core/resourcer/**'
- 'packages/core/data-source-manager/**'
- 'packages/core/server/**'
- 'packages/core/utils/**'
- 'packages/plugins/**/src/server/**'
- '.github/workflows/nocobase-test-backend.yml'
workflow_dispatch:
# push:
# branches:
# - main
# - next
# - develop
# paths:
# - 'package.json'
# - '**/yarn.lock'
# - 'packages/core/acl/**'
# - 'packages/core/auth/**'
# - 'packages/core/actions/**'
# - 'packages/core/database/**'
# - 'packages/core/resourcer/**'
# - 'packages/core/data-source-manager/**'
# - 'packages/core/server/**'
# - 'packages/core/utils/**'
# - 'packages/plugins/**/src/server/**'
# - '.github/workflows/nocobase-test-backend.yml'
# pull_request:
# paths:
# - 'package.json'
# - '**/yarn.lock'
# - 'packages/core/acl/**'
# - 'packages/core/auth/**'
# - 'packages/core/actions/**'
# - 'packages/core/database/**'
# - 'packages/core/resourcer/**'
# - 'packages/core/data-source-manager/**'
# - 'packages/core/server/**'
# - 'packages/core/utils/**'
# - 'packages/plugins/**/src/server/**'
# - '.github/workflows/nocobase-test-backend.yml'
jobs:
sqlite-test:

View File

@ -47,7 +47,7 @@ export class BasicAuth extends BaseAuth {
const valid = await field.verify(password, user.password);
if (!valid) {
ctx.throw(401, ctx.t('The username/email or password is incorrect, please re-enter', { ns: namespace }), {
code: 'INCORRECT_PASSWORD',
internalCode: 'INCORRECT_PASSWORD',
user,
});
}