新增 传递空值检测

This commit is contained in:
Suwings 2020-07-18 15:23:23 +08:00
parent f4273c66c5
commit de58ec1bb4
2 changed files with 12 additions and 4 deletions

View File

@ -56,10 +56,10 @@ class MinecraftServer extends ServerProcess {
this.dataModel.addCmd = args.addCmd || [];
this.dataModel.java = args.java || 'java';
this.dataModel.jarName = args.jarName;
this.dataModel.jarName = args.jarName || '';
this.dataModel.Xmx = args.Xmx;
this.dataModel.Xms = args.Xms;
this.dataModel.Xmx = args.Xmx || '';
this.dataModel.Xms = args.Xms || '';
this.dataModel.ie = args.ie || SYSTEM_CODE;
this.dataModel.oe = args.oe || SYSTEM_CODE;
@ -70,7 +70,7 @@ class MinecraftServer extends ServerProcess {
this.dataModel.cwd = args.cwd || './server/' + this.dataModel.name + '/';
//自定义参数
let tmpCommandeStart = args.highCommande || "";
let tmpCommandeStart = args.highCommande || '';
//自定义参数去掉所有两个空格
tmpCommandeStart = tmpCommandeStart.replace(/ /igm, ' ');
this.dataModel.highCommande = tmpCommandeStart;

View File

@ -8,6 +8,7 @@ const requestLimit = require('../helper/RequestLimit');
const tools = require('../core/tools');
const fs = require('fs');
const { add } = require('../core/counter');
@ -77,10 +78,17 @@ router.post('/create_server', function (req, res) {
// 解析请求参数
try {
const params = req.body;
// 创建名判定
if (!tools.between(params.serverName, 6, 32)) {
apiResponse.error(res, new Error('名字格式不正确'));
return;
}
// 附加参数解析
const addList = (params.addCmd || '').split(' ');
params.addCmd = addList;
// 工作目录确定
params.cwd = params.cwd || '';
// 创建
const result = serverModel.createServer(params.serverName, params);
// 返回状态码
result ? apiResponse.ok(res) : apiResponse.error(res);