mirror/MCSManager
2
0
Fork 1
mirror of https://github.com/MCSManager/MCSManager.git synced 2025-02-05 15:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Last time 引用错误修复

Browse Source
This commit is contained in:
suwings 2018-03-04 20:45:53 +08:00
parent 8b93584dfa
commit ac65533cf8
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/User/UserCenter.js
View File

@ -1,5 +1,12 @@
const { User, USER_SAVE_PATH } = require('./User');
const { md5, createPassword, randomString } = require('./CryptoMine');
const {
User,
USER_SAVE_PATH
} = require('./User');
const {
md5,
createPassword,
randomString
} = require('./CryptoMine');
const fs = require('fs');
const USER_DIR = './' + USER_SAVE_PATH;
@ -119,6 +126,8 @@ class UserCenter {
let data = {};
let tmp = null;
for (let k in this.userList) {
data = {}; //BUG Note: 引用初始化
if (!this.userList[k]) continue;
tmp = this.userList[k].dataModel;
//删除掉一些不可泄露的信息

2
public/common/js/websocket.js
View File

@ -1,7 +1,7 @@
//Websocket 层
(function () {
var DEBUG = false; //Websocket DEBUG
var DEBUG = true; //Websocket DEBUG
//from @BBleae
function wsHeartBeatPackage(ws) {

20
route/websocket/user.js
View File

@ -1,5 +1,10 @@
const { WebSocketObserver } = require('../../model/WebSocketModel');
const { userCenter, deleteUser } = require('../../model/UserModel');
const {
WebSocketObserver
} = require('../../model/WebSocketModel');
const {
userCenter,
deleteUser
} = require('../../model/UserModel');
const response = require('../../helper/Response');
const permssion = require('../../helper/Permission');
const tools = require('../../core/tools');
@ -28,7 +33,7 @@ WebSocketObserver().listener('userset/create', (data) => {
let password = newUserConfig.password.trim();
var uPattern = /^[a-zA-Z0-9_#\$]{4,18}$/;
//输出 true
if (!uPattern.test(username) && tools.between(password, 6, 18)) {
response.wsMsgWindow(data.ws, '用户账号或密码格式不正确');
return;
@ -49,7 +54,7 @@ WebSocketObserver().listener('userset/create', (data) => {
response.wsMsgWindow(data.ws, '用户建立完成√');
return;
} catch (e) {
MCSERVER.error('用户建立失败',e);
MCSERVER.error('用户建立失败', e);
response.wsSend(data.ws, 'userset/create', null);
response.wsMsgWindow(data.ws, '用户建立失败: ' + e);
}
@ -71,7 +76,7 @@ WebSocketObserver().listener('userset/delete', (data) => {
});
return;
} catch (e) {
MCSERVER.error('删除用户失败',e);
MCSERVER.error('删除用户失败', e);
response.wsSend(data.ws, 'userset/delete', null);
response.wsMsgWindow(data.ws, '删除用户失败:' + e);
}
@ -87,11 +92,12 @@ WebSocketObserver().listener('userset/reload', (data) => {
response.wsMsgWindow(data.ws, '用户重新导入完成√');
return;
} catch (e) {
MCSERVER.error('用户重新导入失败',e);
MCSERVER.error('用户重新导入失败', e);
response.wsSend(data.ws, 'userset/reload', null);
response.wsMsgWindow(data.ws, '错误：用户重新导入失败' + e);
}
})
//查看某個用戶信息
WebSocketObserver().listener('userset/view', (data) => {
if (!permssion.isMaster(data.WsSession)) return;
@ -131,7 +137,7 @@ WebSocketObserver().listener('userset/upinfo', (data) => {
userCenter().get(username).allowedServer(allowedServerList);
//如果需求，则更改密码
if (newPW != '<未更改>') {
if (newPW != '<未更改>' || newPW.trim() != '') {
if (newPW.length < 6 || newPW.length > 18) {
response.wsMsgWindow(data.ws, '新的密码格式不正确，已舍弃密码的更改');
} else {