Browse Source

Fix config default value not deep merged

master
Menci 6 years ago
parent
commit
89998a245a
  1. 2
      app.js
  2. 1
      package.json

2
app.js

@ -31,7 +31,7 @@ const options = commandLineArgs(optionDefinitions);
global.syzoj = { global.syzoj = {
rootDir: __dirname, rootDir: __dirname,
config: Object.assign({}, require('./config-example.json'), require(options.config)), config: require('object-assign-deep')({}, require('./config-example.json'), require(options.config)),
configDir: options.config, configDir: options.config,
models: [], models: [],
modules: [], modules: [],

1
package.json

@ -52,6 +52,7 @@
"mysql2": "^1.6.2", "mysql2": "^1.6.2",
"node-7z": "^0.4.0", "node-7z": "^0.4.0",
"nodemailer": "^4.1.0", "nodemailer": "^4.1.0",
"object-assign-deep": "^0.4.0",
"pygmentize-bundled-cached": "^1.1.0", "pygmentize-bundled-cached": "^1.1.0",
"randomstring": "^1.1.5", "randomstring": "^1.1.5",
"request": "^2.74.0", "request": "^2.74.0",

Loading…
Cancel
Save