From 2b6986bd58e83aeaa3d7ea02978577e1409cddeb Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 26 Mar 2021 16:43:36 +0800 Subject: [PATCH] core: fix database connection --- packages/hydrooj/bin/hydrooj.js | 2 +- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/service/db.ts | 2 +- packages/hydrooj/src/service/server.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/hydrooj/bin/hydrooj.js b/packages/hydrooj/bin/hydrooj.js index 8269b934f..6fa957244 100755 --- a/packages/hydrooj/bin/hydrooj.js +++ b/packages/hydrooj/bin/hydrooj.js @@ -23,7 +23,7 @@ if (!cluster.isMaster) { if (argv._[0] === 'db') { function buildUrl(opts) { - let mongourl = `${opts.protocol}://`; + let mongourl = `${opts.protocol || 'mongodb'}://`; if (opts.username) mongourl += `${opts.username}:${opts.password}@`; mongourl += `${opts.host}:${opts.port}/${opts.name}`; if (opts.url) mongourl = opts.url; diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 7c99d784a..0b4727a8c 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.20.33", + "version": "2.20.34", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/service/db.ts b/packages/hydrooj/src/service/db.ts index 460d064a4..f8782e715 100644 --- a/packages/hydrooj/src/service/db.ts +++ b/packages/hydrooj/src/service/db.ts @@ -21,7 +21,7 @@ class MongoService { private opts: MongoConfig; static buildUrl(opts: MongoConfig) { - let mongourl = `${opts.protocol}://`; + let mongourl = `${opts.protocol || 'mongodb'}://`; if (opts.username) mongourl += `${opts.username}:${opts.password}@`; mongourl += `${opts.host}:${opts.port}/${opts.name}`; if (opts.url) mongourl = opts.url; diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 590e732a2..35f43f887 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -289,8 +289,8 @@ export class HandlerCommon { ...this.user, gravatar: misc.gravatar(this.user.gravatar || '', 128), perm: this.user.perm.toString(), + viewLang: this.translate('__id'), }; - UserContext.viewLang = this.translate('__id'); if (!global.Hydro.lib.template) return JSON.stringify(context); const res = await global.Hydro.lib.template.render(name, { handler: this,