xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

网安：修改手机存储

Browse Source
This commit is contained in:
luying
2021-04-09 10:43:53 +08:00
parent ad2b62d426
commit a02ee04a5b
11 changed files with 4504 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/db/Sms.ts
+17 -10
View File
@@ -1,6 +1,8 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { generateNum } from '../pubUtils/util';
import { generateNum, aesEncryptcfb, aesDecryptcfb } from '../pubUtils/util';
import { ENCRYPT_KEY, ENCRYPT_IV } from './../consts';
const moment = require('moment');
/**
@@ -9,7 +11,7 @@ const moment = require('moment');
@index({ tel: 1 })
export default class Sms extends BaseModel {
@prop({ required: true })
@prop({ required: true, set: (val: string) => aesEncryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV), get: (val: string) => aesDecryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV) })
tel: string;
@prop({ required: true })
@@ -31,17 +33,20 @@ export default class Sms extends BaseModel {
isFixed: boolean;
public static async findByTel(tel: string, lean = true) {
const sms: SmsType = await smsModel.findOne({ tel }).lean(lean);
let _tel = aesEncryptcfb(tel, ENCRYPT_KEY, ENCRYPT_IV);
const sms: SmsType = await smsModel.findOne({ tel: _tel }).lean(lean);
return sms;
}
public static async updateByTel(tel: string, code: string, used: boolean, updateTime: Date, countToday: number, lean = true) {
const sms: SmsType = await smsModel.findOneAndUpdate({ tel }, { code, used, updateTime, countToday }, { upsert: true }).lean(lean);
public static async updateByTel(tel: string, code: string, used: boolean, updateTime: Date, countToday: number) {
const sms: SmsType = await smsModel.findOneAndUpdate({ tel }, { tel, code, used, updateTime, countToday }, { upsert: true }).lean({ getters: true });
return sms;
}
public static async validateSms(tel: string, code: string, lean = true) {
const record: SmsType = await smsModel.findOneAndUpdate({ tel, code, used: false }, { used: true }).lean(lean);
public static async validateSms(tel: string, code: string) {
const record: SmsType = await smsModel.findOneAndUpdate({ tel, code, used: false }, { used: true }).lean({ getters: true });
return !!record;
}
@@ -66,14 +71,16 @@ export default class Sms extends BaseModel {
return moment(this.updateTime).format('YYYY-MM-DD') === moment(Date.now()).format('YYYY-MM-DD');
}
public static async fixSms(tel: string, lean = true) {
const sms: SmsType = await smsModel.findOneAndUpdate({ tel }, { $setOnInsert: {
public static async fixSms(tel: string) {
let _tel = aesEncryptcfb(tel, ENCRYPT_KEY, ENCRYPT_IV);
const sms: SmsType = await smsModel.findOneAndUpdate({ tel: _tel }, { $setOnInsert: {
tel,
code: generateNum(6),
used: false,
updateTime: new Date(),
countToday: 1
}, $set: { isFixed: true } }, {new: true, upsert: true}).lean(lean);
}, $set: { isFixed: true } }, {new: true, upsert: true}).lean({ getters: true });
return sms;
}
}
shared/db/User.ts
+40 -33
View File
@@ -1,8 +1,8 @@
import { COUNTER } from './../consts';
import { COUNTER, ENCRYPT_KEY, ENCRYPT_IV } from './../consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { genCode } from '../pubUtils/util';
import { genCode, aesEncryptcfb, aesDecryptcfb } from '../pubUtils/util';
const bcrypt = require('bcrypt');
const SALT_WORK_FACTOR = 5
@@ -25,7 +25,7 @@ export default class User extends BaseModel {
@prop({ required: true })
token: string;
@prop({ required: true })
@prop({ required: true, set: (val: string) => aesEncryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV), get: (val: string) => aesDecryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV) })
tel: string; // 账号
@prop({ required: true, default: '' })
@@ -102,6 +102,7 @@ export default class User extends BaseModel {
auth: number;
public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime: number = 0) {
let _tel = aesEncryptcfb(tel, ENCRYPT_KEY, ENCRYPT_IV);
const curTime: Date = new Date();
const uid = await CounterModel.getNewCounter(COUNTER.UID);
@@ -109,27 +110,30 @@ export default class User extends BaseModel {
const doc = new UserModel();
let update = {};
update = Object.assign(update, doc.toJSON(), { platform, pkgName, serverType, createTime: curTime, uid, userCode, username: `用户${uid}`, isGuest, token, lastLoginTime: curTime, guestTime });
if(isGuest) update["guestId"] = tel;
if(isGuest) update["guestId"] = _tel;
delete update["device"];
const user: UserType = await UserModel.findOneAndUpdate({ tel }, { $set: update, $addToSet: {device: deviceId}}, { upsert: true, new: true }).lean();
const user: UserType = await UserModel.findOneAndUpdate({ tel }, { $set: update, $addToSet: {device: deviceId}}, { upsert: true, new: true }).lean({ getters: true });
return user;
}
public static async getLastDeviceGuest(deviceId: string, token: string) {
const user: UserType = await UserModel.findOneAndUpdate({ device: { $elemMatch: { $eq: deviceId } }, isGuest: true }, { token }, { new: true }).sort({createTime: -1}).lean();
const user: UserType = await UserModel.findOneAndUpdate({ device: { $elemMatch: { $eq: deviceId } }, isGuest: true }, { token }, { new: true }).sort({createTime: -1}).lean({ getters: true });
return user;
}
public static async updateToken(tel: string, token: string, deviceId: string, lean = true) {
public static async updateToken(tel: string, token: string, deviceId: string) {
const curTime: Date = new Date();
let user = await UserModel.findOneAndUpdate({ tel }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean(lean);
let user = await UserModel.findOneAndUpdate({ tel }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean({ getters: true });
return user;
}
public static async createOrUpdate(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string) {
let user: UserType = await UserModel.findOne({ tel }).lean();
console.log(tel);
let user: UserType = await UserModel.findOne({ tel }).lean({ getters: true });
if (!user) {
user = await UserModel.createUser(isGuest, tel, token, platform, pkgName, serverType, deviceId);
} else {
@@ -146,73 +150,76 @@ export default class User extends BaseModel {
return { npassword, salt };
}
public static async setPass(uid: number, password: string, lean = true) {
public static async setPass(uid: number, password: string) {
let r = await this.encryptPass(password);
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { $set: { password: r.npassword, salt: r.salt, hasSetPw: true }}, {new: true}).lean(lean);
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { $set: { password: r.npassword, salt: r.salt, hasSetPw: true }}, {new: true}).lean({ getters: true });
return user;
}
public static async bindTel(uid: number, tel: string, lean = true) {
const user: UserType = await UserModel.findOneAndUpdate({ uid, isGuest: true }, { $set: { tel, isGuest: false }}, {new: true}).lean(lean);
public static async bindTel(uid: number, tel: string) {
const user: UserType = await UserModel.findOneAndUpdate({ uid, isGuest: true }, { $set: { tel, isGuest: false }}, {new: true}).lean({ getters: true });
return user;
}
public static async checkPass(tel: string, password: string, token: string, deviceId: string, lean = true) {
const user: UserType = await UserModel.findOne({ tel }).select('salt').lean();
public static async checkPass(tel: string, password: string, token: string, deviceId: string) {
const user: UserType = await UserModel.findOne({ tel }).select('salt').lean({ getters: true });
if (user) {
const curTime: Date = new Date();
let { salt } = user;
let { npassword } = await this.encryptPass(password, salt);
const checkUser: UserType = await UserModel.findOneAndUpdate({ tel, password: npassword }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean(lean);
const checkUser: UserType = await UserModel.findOneAndUpdate({ tel, password: npassword }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean({ getters: true });
return checkUser;
} else {
return null
}
}
public static async findUserByToken(token: string, lean = true) {
const user: UserType = await UserModel.findOne({ token }).select('uid token serverType auth tel userCode pkgName').lean(lean);
public static async findUserByToken(token: string) {
const user: UserType = await UserModel.findOne({ token }).select('uid token serverType auth tel userCode pkgName').lean({ getters: true });
return user;
}
public static async findTokenByTel(tel: string, lean = true) {
const { token } = await UserModel.findOne({ tel }).select('token').lean(lean);
public static async findTokenByTel(tel: string) {
const { token } = await UserModel.findOne({ tel }).select('token').lean({ getters: true });
return token;
}
public static async findUserByTel(tel: string, lean = true) {
const user: UserType = await UserModel.findOne({ tel }).select('uid tel hasSetPw').lean(lean);
public static async findUserByTel(tel: string) {
const user: UserType = await UserModel.findOne({ tel }).select('uid tel hasSetPw').lean({ getters: true });
return user;
}
public static async findUserByUid(uid: number, lean = true) {
const user: UserType = await UserModel.findOne({ uid }).select('uid tel').lean(lean);
public static async findUserByUid(uid: number) {
const user: UserType = await UserModel.findOne({ uid }).select('uid tel').lean({ getters: true });
return user;
}
public static async findUserByUserCode(userCode: string, lean = true) {
const user: UserType = await UserModel.findOne({ userCode }).lean(lean);
public static async findUserByUserCode(userCode: string) {
const user: UserType = await UserModel.findOne({ userCode }).lean({ getters: true });
return user;
}
public static async addAuth(uid: number, auth: number, lean = true) {
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }, {new: true}).select('uid tel').lean(lean);
public static async addAuth(uid: number, auth: number) {
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }, {new: true}).select('uid tel').lean({ getters: true });
return user;
}
public static async authentication(uid: number, birthday: string, pi: string, lean = true) {
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { hasAuthenticated: true, birthday, pi }, {new: true}).lean(lean);
public static async authentication(uid: number, birthday: string, pi: string) {
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { hasAuthenticated: true, birthday, pi }, {new: true}).lean({ getters: true });
return user;
}
public static async findUserByField(field: string, value?: Array<number|string>, lean = true) {
public static async findUserByField(field: string, value?: Array<number|string>) {
let searchObj = {};
if(field != 'all') {
searchObj[field] = {
$in: value
};
}
const user: UserType[] = await UserModel.find(searchObj).select('uid tel username serverType auth').lean(lean);
const user: UserType[] = await UserModel.find(searchObj).select('uid tel username serverType auth').lean({ getters: true });
return user;
}
@@ -220,7 +227,7 @@ export default class User extends BaseModel {
public static async updatePlayTime(userCode: string, guestTimeInc: number, todayPlayTime: number, todayPlayType?: number) {
let update = { todayPlayTime, todayPlayType, reportTime: new Date() };
if(todayPlayType) update.todayPlayType;
const user: UserType = await UserModel.findOneAndUpdate({ userCode }, { $inc: { guestTime: guestTimeInc }, $set: update}, { new: true }).lean();
const user: UserType = await UserModel.findOneAndUpdate({ userCode }, { $inc: { guestTime: guestTimeInc }, $set: update}, { new: true }).lean({ getters: true });
return user;
}
}
shared/db/UserShop.ts
-1
View File
@@ -1,7 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
import { genCode } from '../pubUtils/util';
import { ShopItem } from '../domain/dbGeneral';
import { getCurWeekDate, getCurMonthDate, getTodayZeroDate } from '../pubUtils/timeUtil';
import { SHOP_REFRESH_TYPE } from '../consts';
import { DicShop } from '../pubUtils/dictionary/DicShop';