From 32f34ba1871c9d935d7ce492cbfadb41e13d0eeb Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 2 Dec 2021 22:30:07 +0800 Subject: [PATCH] core: restore: fix database name parse --- packages/hydrooj/bin/hydrooj.js | 4 ++-- packages/hydrooj/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/bin/hydrooj.js b/packages/hydrooj/bin/hydrooj.js index b8fa413cb..bb7eed728 100755 --- a/packages/hydrooj/bin/hydrooj.js +++ b/packages/hydrooj/bin/hydrooj.js @@ -72,7 +72,7 @@ require.extensions['.ts'] = require.extensions['.tsx'] = function loader(module, function buildUrl(opts) { let mongourl = `${opts.protocol || 'mongodb'}://`; if (opts.username) mongourl += `${opts.username}:${opts.password}@`; - mongourl += `${opts.host}:${opts.port}/${opts.db}`; + mongourl += `${opts.host}:${opts.port}/${opts.name}`; if (opts.url) mongourl = opts.url; return mongourl; } @@ -115,7 +115,7 @@ if (argv.args[0] === 'restore') { return; } exec('unzip', [argv.args[1], '-d', dir], { stdio: 'inherit' }); - exec('mongorestore', [`--uri=${url}`, `--dir=${dir}/dump/${JSON.parse(dbConfig).db}`, '--drop'], { stdio: 'inherit' }); + exec('mongorestore', [`--uri=${url}`, `--dir=${dir}/dump/${JSON.parse(dbConfig).name}`, '--drop'], { stdio: 'inherit' }); if (fs.existsSync(`${dir}/file`)) { exec('rm', ['-rf', '/data/file/*'], { stdio: 'inherit' }); exec('mv', [`${dir}/file/*`, '/data/file'], { stdio: 'inherit' }); diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index c8bcc7897..4cf73d583 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.2.3", + "version": "3.2.4", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader",