From 89998a245a558fa1f5b1e764355aceacd6de0669 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Wed, 7 Nov 2018 14:56:38 +0800
Subject: [PATCH] Fix config default value not deep merged

---
 app.js       | 2 +-
 package.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 4f22dac..3e0b6c2 100644
--- a/app.js
+++ b/app.js
@@ -31,7 +31,7 @@ const options = commandLineArgs(optionDefinitions);
 
 global.syzoj = {
   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,
   models: [],
   modules: [],
diff --git a/package.json b/package.json
index 9783a35..ff8eed6 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "mysql2": "^1.6.2",
     "node-7z": "^0.4.0",
     "nodemailer": "^4.1.0",
+    "object-assign-deep": "^0.4.0",
     "pygmentize-bundled-cached": "^1.1.0",
     "randomstring": "^1.1.5",
     "request": "^2.74.0",