update config

README.md

@@ -21,19 +21,16 @@
 ### 使用方法
 * 可参考[wiki](https://github.com/mercury233/ygopro-server/wiki)安装
 * 手动安装：
-  * 安装修改后的YGOPro服务端：https://github.com/moecube/ygopro/tree/server
   * `git clone https://github.com/moecube/srvpro.git`
   * `cd srvpro`
   * `npm install`
-* 将`config.json`复制为`config.user.json`并进行修改
-  * `port`为你想要的端口
-  * ~~更多选项参见wiki~~
+  * 安装修改后的YGOPro服务端：https://github.com/moecube/ygopro/tree/server
 * `node ygopro-server.js`即可运行
-* 简易的控制台在 http://mercury233.me/ygosrv233/dashboard.html
+* 简易的控制台在 http://srvpro.ygo233.com/dashboard.html
 
 ### 高级功能
 * 待补充说明
-* 简易的先行卡更新控制台在 http://mercury233.me/ygosrv233/pre-dashboard.html
+* 简易的先行卡更新控制台在 http://srvpro.ygo233.com/pre-dashboard.html
 
 ### 开发计划
 * 重做CTOS和STOC部分
@@ -64,7 +61,7 @@
 ### License
 SRVPro
 
-Copyright (C) 2013-2017  MoeCube Team
+Copyright (C) 2013-2018  MoeCube Team
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

data/default_config.json

 {
   "file": "./config/config.json",
   "port": 7911,
-  "version": 4924,
+  "version": 4930,
   "hostinfo": {
     "lflist": 0,
     "rule": 0,
@@ -114,7 +114,9 @@
       "cdn": {
         "enabled": false,
         "exe": "upx",
-        "params": ["sync"],
+        "params": [
+          "sync"
+        ],
         "local": "./ygosrv233",
         "remote": "/ygosrv233",
         "pics_remote": "/ygopro/"
@@ -127,11 +129,18 @@
       "html_gits": [
         {
           "name": "GitHub",
-          "push": ["push", "origin"]
+          "push": [
+            "push",
+            "origin"
+          ]
         },
         {
           "name": "Coding",
-          "push": ["push", "coding", "master:master"]
+          "push": [
+            "push",
+            "coding",
+            "master:master"
+          ]
         }
       ]
     },
@@ -145,11 +154,18 @@
       "html_gits": [
         {
           "name": "GitHub",
-          "push": ["push", "origin"]
+          "push": [
+            "push",
+            "origin"
+          ]
         },
         {
           "name": "Coding",
-          "push": ["push", "coding", "master:master"]
+          "push": [
+            "push",
+            "coding",
+            "master:master"
+          ]
         }
       ]
     },
@@ -172,7 +188,12 @@
   "ban": {
     "banned_user": [],
     "banned_ip": [],
-    "illegal_id": ["^Lv\\.-*\\d+\\s*(.*)", "^VIP\\.\\d+\\s*(.*)"],
-    "spam_word": ["——"]
+    "illegal_id": [
+      "^Lv\\.-*\\d+\\s*(.*)",
+      "^VIP\\.\\d+\\s*(.*)"
+    ],
+    "spam_word": [
+      "——"
+    ]
   }
 }
\ No newline at end of file

ygopro-pre.js

@@ -18,11 +18,7 @@ moment.locale('zh-cn');
 
 var constants = require('./data/constants.json');
 
-var nconf = require('nconf');
-nconf.file('./config.user.json');
-var defaultconfig = require('./config.json');
-nconf.defaults(defaultconfig);
-var settings = nconf.get();
+var settings = require('./config/config.json');
 config=settings.modules.pre_util;
 
 //全卡HTML列表

ygopro-tournament.js

@@ -15,11 +15,7 @@ var _ = require('underscore');
 _.str = require('underscore.string');
 _.mixin(_.str.exports());
 
-var nconf = require('nconf');
-nconf.file('./config/config.json');
-var defaultconfig = require('./data/default_config.json');
-nconf.defaults(defaultconfig);
-var settings = nconf.get();
+var settings = require('./config/config.json');
 config=settings.modules.tournament_mode;
 
 //http长连接

ygopro-update.js

@@ -19,11 +19,7 @@ moment.locale('zh-cn');
 
 var constants = require('./data/constants.json');
 
-var nconf = require('nconf');
-nconf.file('./config/config.json');
-var defaultconfig = require('./data/default_config.json');
-nconf.defaults(defaultconfig);
-var settings = nconf.get();
+var settings = require('./config/config.json');
 config=settings.modules.update_util;
 
 //全卡名称列表