fix: create-nocobase-app (#306)
* chore: create-nocobase-app * chore: change create-nocobase-app lib to src * chore(versions): 😊 publish v0.6.2-alpha.9 * fix: publish * chore(versions): 😊 publish v0.6.2-alpha.10 * fix: read-config * chore(versions): 😊 publish v0.6.2-alpha.11 * fix: create-nocobase-app publish * chore: create-nocobase-app package.json * chore(versions): 😊 publish v0.6.2-alpha.12 Co-authored-by: Chareice <chareice@live.com>
This commit is contained in:
parent
c940873ec8
commit
f5dbb04a9f
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"npmClient": "yarn",
|
||||
"useWorkspaces": true,
|
||||
"npmClientArgs": [
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/app-client",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"scripts": {
|
||||
"start": "umi dev",
|
||||
"build": "umi build",
|
||||
@ -9,7 +9,7 @@
|
||||
"test:coverage": "umi-test --coverage"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/client": "0.6.2-alpha.8",
|
||||
"@nocobase/client": "0.6.2-alpha.12",
|
||||
"@types/react": "^17.0.0",
|
||||
"@types/react-dom": "^17.0.0",
|
||||
"@umijs/test": "^3.5.20",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/app-server",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"main": "./lib/index.js",
|
||||
@ -11,19 +11,19 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/database": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-acl": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-china-region": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-client": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-collection-manager": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-error-handler": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-file-manager": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-system-settings": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-ui-routes-storage": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-ui-schema-storage": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-users": "0.6.2-alpha.8",
|
||||
"@nocobase/plugin-workflow": "0.6.2-alpha.8",
|
||||
"@nocobase/server": "0.6.2-alpha.8"
|
||||
"@nocobase/database": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-acl": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-china-region": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-client": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-collection-manager": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-error-handler": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-file-manager": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-system-settings": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-ui-routes-storage": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-ui-schema-storage": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-users": "0.6.2-alpha.12",
|
||||
"@nocobase/plugin-workflow": "0.6.2-alpha.12",
|
||||
"@nocobase/server": "0.6.2-alpha.12"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/acl",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"main": "./lib/index.js",
|
||||
@ -11,7 +11,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/resourcer": "0.6.2-alpha.8",
|
||||
"@nocobase/resourcer": "0.6.2-alpha.12",
|
||||
"json-templates": "^4.2.0"
|
||||
},
|
||||
"repository": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/actions",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"main": "./lib/index.js",
|
||||
@ -11,8 +11,8 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/database": "0.6.2-alpha.8",
|
||||
"@nocobase/resourcer": "0.6.2-alpha.8"
|
||||
"@nocobase/database": "0.6.2-alpha.12",
|
||||
"@nocobase/resourcer": "0.6.2-alpha.12"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/client",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"license": "MIT",
|
||||
"main": "lib",
|
||||
"module": "esm",
|
||||
@ -23,7 +23,7 @@
|
||||
"@formily/antd": "^2.0.15",
|
||||
"@formily/core": "^2.0.15",
|
||||
"@formily/react": "^2.0.15",
|
||||
"@nocobase/utils": "0.6.2-alpha.8",
|
||||
"@nocobase/utils": "0.6.2-alpha.12",
|
||||
"ahooks": "^3.0.5",
|
||||
"antd": "^4.18.9",
|
||||
"axios": "^0.24.0",
|
||||
|
@ -3,5 +3,4 @@ node_modules
|
||||
docs
|
||||
__tests__
|
||||
tsconfig.json
|
||||
src
|
||||
.fatherrc.ts
|
||||
.fatherrc.ts
|
||||
|
@ -1,12 +1,7 @@
|
||||
{
|
||||
"name": "create-nocobase-app",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "src/index.js",
|
||||
"files": [
|
||||
"lib",
|
||||
"bin",
|
||||
"templates"
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@nocobase/utils": "^0.5.0-alpha.38",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/database",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"main": "./lib/index.js",
|
||||
"types": "./lib/index.d.ts",
|
||||
@ -11,7 +11,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/utils": "0.6.2-alpha.8",
|
||||
"@nocobase/utils": "0.6.2-alpha.12",
|
||||
"async-mutex": "^0.3.2",
|
||||
"deepmerge": "^4.2.2",
|
||||
"flat": "^5.0.2",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/resourcer",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"main": "./lib/index.js",
|
||||
"types": "./lib/index.d.ts",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/server",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"types": "./lib/index.d.ts",
|
||||
"license": "MIT",
|
||||
@ -12,10 +12,10 @@
|
||||
"dependencies": {
|
||||
"@koa/cors": "^3.1.0",
|
||||
"@koa/router": "^9.4.0",
|
||||
"@nocobase/acl": "0.6.2-alpha.8",
|
||||
"@nocobase/actions": "0.6.2-alpha.8",
|
||||
"@nocobase/database": "0.6.2-alpha.8",
|
||||
"@nocobase/resourcer": "0.6.2-alpha.8",
|
||||
"@nocobase/acl": "0.6.2-alpha.12",
|
||||
"@nocobase/actions": "0.6.2-alpha.12",
|
||||
"@nocobase/database": "0.6.2-alpha.12",
|
||||
"@nocobase/resourcer": "0.6.2-alpha.12",
|
||||
"commander": "^8.1.0",
|
||||
"dotenv": "^8.2.0",
|
||||
"find-package-json": "^1.2.0",
|
||||
|
@ -10,6 +10,7 @@ const configurationDir = path.join(__dirname, './config');
|
||||
describe('config', () => {
|
||||
it('should read configuration from directory', async () => {
|
||||
const config = await readConfig(configurationDir);
|
||||
expect(config['fake']).toBeUndefined();
|
||||
expect(config['not-exists']).toBeUndefined();
|
||||
expect(config['database']).toEqual(databaseConfiguration);
|
||||
expect(config['database']).toEqual(databaseConfiguration);
|
||||
|
1
packages/core/server/src/__tests__/config/fake.d.ts
vendored
Normal file
1
packages/core/server/src/__tests__/config/fake.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
||||
type a = number;
|
@ -41,6 +41,10 @@ export async function loadConfiguration(configurationDir: string, repository: Co
|
||||
if (file.isDirectory()) {
|
||||
await getConfigurationFiles(path.join(dir, file.name), [...prefix, file.name]);
|
||||
} else {
|
||||
if (!['ts', 'js'].includes(file.name.split('.').slice(1).join('.'))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const filePath = path.join(dir, file.name);
|
||||
const keyName = path.parse(filePath).name;
|
||||
const configuration = require(filePath).default;
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/test",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"types": "./lib/index.d.ts",
|
||||
"license": "MIT",
|
||||
@ -10,7 +10,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/server": "0.6.2-alpha.8",
|
||||
"@nocobase/server": "0.6.2-alpha.12",
|
||||
"@types/supertest": "^2.0.11",
|
||||
"mockjs": "^1.1.0",
|
||||
"mysql2": "^2.1.0",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/utils",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"types": "./lib/index.d.ts",
|
||||
"license": "MIT",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-acl",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"main": "./lib/index.js",
|
||||
@ -11,9 +11,9 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/acl": "0.6.2-alpha.8",
|
||||
"@nocobase/database": "0.6.2-alpha.8",
|
||||
"@nocobase/server": "0.6.2-alpha.8"
|
||||
"@nocobase/acl": "0.6.2-alpha.12",
|
||||
"@nocobase/database": "0.6.2-alpha.12",
|
||||
"@nocobase/server": "0.6.2-alpha.12"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-action-logs",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,7 +9,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-china-region",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -12,7 +12,7 @@
|
||||
"china-division": "^2.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-client",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,10 +9,10 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/server": "0.6.2-alpha.8"
|
||||
"@nocobase/server": "0.6.2-alpha.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-collection-manager",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,7 +9,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-error-handler",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"main": "./lib/index.js",
|
||||
@ -11,7 +11,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/server": "0.6.2-alpha.8"
|
||||
"@nocobase/server": "0.6.2-alpha.12"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-file-manager",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -10,7 +10,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@koa/multer": "^3.0.0",
|
||||
"@nocobase/server": "0.6.2-alpha.8",
|
||||
"@nocobase/server": "0.6.2-alpha.12",
|
||||
"aws-sdk": "^2.2.32",
|
||||
"koa-static": "^5.0.0",
|
||||
"mime-match": "^1.0.2",
|
||||
@ -19,7 +19,7 @@
|
||||
"multer-s3": "^2.10.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8",
|
||||
"@nocobase/test": "0.6.2-alpha.12",
|
||||
"@types/koa-multer": "^1.0.1",
|
||||
"@types/multer": "^1.4.5"
|
||||
},
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-multiple-apps",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,6 +9,6 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/server": "0.6.2-alpha.8"
|
||||
"@nocobase/server": "0.6.2-alpha.12"
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-notifications",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -12,7 +12,7 @@
|
||||
"nodemailer": "^6.6.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8",
|
||||
"@nocobase/test": "0.6.2-alpha.12",
|
||||
"@types/nodemailer": "6.4.4",
|
||||
"nodemailer-mock": "^1.5.11"
|
||||
},
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-system-settings",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,7 +9,7 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-ui-routes-storage",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -12,7 +12,7 @@
|
||||
"flat-to-nested": "^1.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-ui-schema-storage",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -10,7 +10,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@formily/json-schema": "^2.0.15",
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-users",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -12,7 +12,7 @@
|
||||
"jsonwebtoken": "^8.5.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8",
|
||||
"@nocobase/test": "0.6.2-alpha.12",
|
||||
"@types/jsonwebtoken": "^8.5.8"
|
||||
},
|
||||
"gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nocobase/plugin-workflow",
|
||||
"version": "0.6.2-alpha.8",
|
||||
"version": "0.6.2-alpha.12",
|
||||
"main": "lib/index.js",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
@ -9,14 +9,14 @@
|
||||
"build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nocobase/actions": "0.6.2-alpha.8",
|
||||
"@nocobase/database": "0.6.2-alpha.8",
|
||||
"@nocobase/server": "0.6.2-alpha.8",
|
||||
"@nocobase/utils": "0.6.2-alpha.8",
|
||||
"@nocobase/actions": "0.6.2-alpha.12",
|
||||
"@nocobase/database": "0.6.2-alpha.12",
|
||||
"@nocobase/server": "0.6.2-alpha.12",
|
||||
"@nocobase/utils": "0.6.2-alpha.12",
|
||||
"json-templates": "^4.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nocobase/test": "0.6.2-alpha.8"
|
||||
"@nocobase/test": "0.6.2-alpha.12"
|
||||
},
|
||||
"gitHead": "f0b335ac30f29f25c95d7d137655fa64d8d67f1e"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user