Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

setting: 优化默认值插入

Browse Source
This commit is contained in:
undefined committed 2020-10-28 21:55:35 +08:00
1 parent 06ff754af3
commit f3be3fc787
3 files changed
+8 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.13.26", "version": "2.13.27",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "dist/loader.js", "main": "dist/loader.js",
"typings": "dist/loader.d.ts", "typings": "dist/loader.d.ts",
@@ -55,4 +55,4 @@
"build": "tsc", "build": "tsc",
"build:watch": "tsc --watch" "build:watch": "tsc --watch"
} }
} }
packages/hydrooj/src/model/setting.ts
+5 -6
View File
@@ -128,9 +128,9 @@ SystemSetting(
Setting('setting_smtp', 'smtp.secure', null, false, 'boolean', 'SSL'), Setting('setting_smtp', 'smtp.secure', null, false, 'boolean', 'SSL'),
Setting('setting_server', 'server.name', null, 'Hydro', 'text', 'Server Name'), Setting('setting_server', 'server.name', null, 'Hydro', 'text', 'Server Name'),
Setting('setting_server', 'server.worker', null, 1, 'number', 'Server Workers Number'), Setting('setting_server', 'server.worker', null, 1, 'number', 'Server Workers Number'),
Setting('setting_server', 'server.hostname', null, null, 'text', 'Server Hostname'), Setting('setting_server', 'server.hostname', null, 'oj.undefined.moe', 'text', 'Server Hostname'),
Setting('setting_server', 'server.host', null, null, 'text', 'Server Host'), Setting('setting_server', 'server.host', null, 'oj.undefined.moe', 'text', 'Server Host'),
Setting('setting_server', 'server.url', null, null, 'text', 'Server BaseURL'), Setting('setting_server', 'server.url', null, '/', 'text', 'Server BaseURL'),
Setting('setting_server', 'server.cdn', null, '/', 'text', 'CDN Prefix', 'Ends with /'), Setting('setting_server', 'server.cdn', null, '/', 'text', 'CDN Prefix', 'Ends with /'),
Setting('setting_server', 'server.port', null, 8888, 'number', 'Server Port'), Setting('setting_server', 'server.port', null, 8888, 'number', 'Server Port'),
Setting('setting_server', 'server.xff', null, null, 'text', 'IP Header', 'e.g. x-forwarded-for (lowercase)'), Setting('setting_server', 'server.xff', null, null, 'text', 'IP Header', 'e.g. x-forwarded-for (lowercase)'),
@@ -146,9 +146,8 @@ bus.once('app/started', async () => {
logger.debug('Ensuring settings'); logger.debug('Ensuring settings');
for (const setting of SYSTEM_SETTINGS) { for (const setting of SYSTEM_SETTINGS) {
if (setting.value) { if (setting.value) {
// @ts-ignore const current = await global.Hydro.service.db.collection('system').findOne({ _id: setting.key });
const current = await global.Hydro.model.system.get(setting.key); if (!current || current.value == null || current.value === '') {
if (current === null || current === '') {
// @ts-ignore // @ts-ignore
await global.Hydro.model.system.set(setting.key, setting.value); await global.Hydro.model.system.set(setting.key, setting.value);
} }
packages/hydrooj/src/model/user.ts
+1 -1
View File
@@ -199,7 +199,7 @@ export async function inc(_id: number, field: string, n = 1) {
export async function create( export async function create(
mail: string, uname: string, password: string, mail: string, uname: string, password: string,
uid?: number, regip = '127.0.0.1', priv = PRIV.PRIV_DEFAULT, uid = 0, regip = '127.0.0.1', priv = PRIV.PRIV_DEFAULT,
) { ) {
const salt = String.random(); const salt = String.random();
if (!uid) uid = await system.inc('user'); if (!uid) uid = await system.inc('user');