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

添加查询和创建角色功能；建立长连接后返回部分初始数据

Browse Source
This commit is contained in:
liangtongchuan
2020-09-01 22:15:31 +08:00
parent 2617efa6ad
commit dbdb11692c
23 changed files with 466 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web-server/app/controller/account.ts
+12
View File
@@ -12,4 +12,16 @@ export default class AccountController extends Controller {
const { tel, code, platform, pkgName, serverType } = ctx.request.body;
ctx.body = await ctx.service.auth.smsLogin(tel, code, platform, pkgName, serverType);
}
public async checkRole() {
const { ctx } = this;
const { serverId } = ctx.request.body;
ctx.body = await ctx.service.auth.checkRole(serverId);
}
public async createRole() {
const { ctx } = this;
const { serverId, roleName } = ctx.request.body;
ctx.body = await ctx.service.auth.createRole(serverId, roleName);
}
}
web-server/app/db/Equip.ts
-2
View File
@@ -1,5 +1,3 @@
import { COUNTER } from './../consts/consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
web-server/app/db/Hero.ts
-2
View File
@@ -1,5 +1,3 @@
import { COUNTER } from './../consts/consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
web-server/app/db/Role.ts
+32 -16
View File
@@ -1,5 +1,3 @@
import { COUNTER } from './../consts/consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import User from './User';
@@ -10,7 +8,6 @@ import User from './User';
@index({ roleId: 1 })
// @index({ userInfo.uid: 1, serverId: 1 })
export default class Role extends BaseModel {
@prop({ required: true })
userInfo: User;
@@ -25,68 +22,87 @@ export default class Role extends BaseModel {
serverType: string; // 服务器类型
@prop({ required: true })
serverId: number; // 区服 id
@prop({ required: true })
@prop({ required: true, default: false })
blocked: boolean; // 是否屏蔽
@prop({ required: true })
code: string; // 邀请码
@prop({ required: true })
@prop({ required: true, default: 0 })
exp: number; // 经验值
@prop({ required: true })
@prop({ required: true, default: 1 })
lv: number; // 主公等级
@prop({ required: true })
@prop({ required: true, default: 0 })
ce: number; // 总战力
@prop({ required: true })
@prop({ required: true, default: 100 })
tili: number; // 体力值
@prop({ required: true })
@prop({ required: true, default: 0 })
vLv: number; // VIP 等级
@prop({ required: true })
@prop({ required: true, default: 100 })
gold: number; // 总金币
@prop({ required: true, default: 0 })
paidGold: number; // 支付所得金币
@prop({ required: true, default: 100 })
giftGold: number; // 赠送所得金币
@prop({ required: true, default: 0 })
totalPay: number; // 总支付金额
@prop({ required: true, default: 0 })
totalBuy: number; // 总金币购买
@prop({ required: true, default: 0 })
totalCost: number; // 金币总花费
@prop({ required: true, default: [] })
payRecord: [{ // 支付记录
id: string; // 购买项 product id
cnt: number; // 购买次数
}];
@prop({ required: true })
@prop({ required: true, default: [] })
consumeGoods: [{ // 消耗品
id: number; // id
cnt: number; // 数量
}];
@prop({ required: true })
@prop({ required: true, default: [] })
souls: [{ // 将魂
id: number; // 武将 id
cnt: number; // 数量
}];
@prop({ required: true })
@prop({ required: true, default: [] })
pieces: [{ // 装备碎片
id: number; // 装备 id
cnt: number; // 数量
}];
@prop({ required: true })
@prop({ required: true, default: [] })
jewels: [{ // 珠宝
id: number; // 待定，也可能是 type + lv
cnt: number; // 数量
}];
@prop({ required: true })
@prop({ required: true, default: [] })
warStar: [{ // 关卡星级
id: number; // 关卡 id
star: number; // 星级
}];
@prop({ required: true })
@prop({ required: true, default: 1 })
loginCnt: number; // 登录次数
@prop({ required: true })
createTime: Date; // 创建时间
@prop({ required: true })
loginTime: Date; // 更新 / 登录时间
public static async findByUid(uid: number, serverId: number, lean = true) {
const role = await RoleModel.findOne({ 'userInfo.uid': uid, serverId }).lean(lean);
return role;
}
public static async createRole(uid: number, serverId: number, roleInfo: {roleId: string; roleName: string; seqId: number; code: string}, lean = true) {
const user = await User.findUserByUid(uid);
if (!user) return null;
const info = Object.assign(roleInfo, { userInfo: user, serverType: user.serverType, serverId });
const role = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, info, { upsert: true, new: true }).lean(lean);
return role;
}
}
export const RoleModel = getModelForClass(Role);
web-server/app/db/User.ts
-1
View File
@@ -2,7 +2,6 @@ import { COUNTER } from './../consts/consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import Sms from './Sms';
/**
* 用户字段接口
web-server/app/middleware/tokenParser.ts
+1
View File
@@ -14,6 +14,7 @@ module.exports = () => {
ctx.body = ctx.service.utils.exceptionResult(STATUS_TOKEN_ERR);
return;
}
ctx.uid = user.uid;
await next();
};
};
web-server/app/router.ts
+2
View File
@@ -6,5 +6,7 @@ export default (app: Application) => {
router.get('/', controller.home.index);
router.post('/user/getsms', controller.account.getSms);
router.post('/user/smslogin', controller.account.smsLogin);
router.post('/user/checkrole', tokenParser, controller.account.checkRole);
router.post('/user/createrole', tokenParser, controller.account.createRole);
router.post('/game/getserverlist', tokenParser, controller.game.getServerList);
};
web-server/app/service/Auth.ts
+28 -2
View File
@@ -1,7 +1,9 @@
import { RoleModel } from './../db/Role';
import { UserModel } from './../db/User';
import { SMS_IN_60S, SMS_CNT_LIMIT, STATUS_SUC, STATUS_WRONG_PARMS, SMS_INVALID } from './../../../shared/statusCode';
import { SMS_IN_60S, SMS_CNT_LIMIT, STATUS_SUC, STATUS_WRONG_PARMS, SMS_INVALID, ROLE_NOT_FOUND } from './../../../shared/statusCode';
import { smsModel } from './../db/Sms';
import { Service } from 'egg';
import Counter from '../db/Counter';
const _ = require('underscore');
/**
@@ -98,6 +100,30 @@ export default class Auth extends Service {
// 用户注册登录
const token = ctx.service.utils.generateStr(256);
const user = await UserModel.updateToken(tel, token, platform, pkgName, serverType);
return { status: STATUS_SUC, data: { token, uid: user?.uid } };
return { status: STATUS_SUC.code, data: { token, uid: user?.uid } };
}
public async checkRole(serverId: number) {
const ctx = this.ctx;
const { uid } = ctx;
const role = await RoleModel.findByUid(uid, serverId);
if (role) {
return { status: STATUS_SUC.code, data: { roleId: role.roleId } };
}
return ctx.service.utils.exceptionResult(ROLE_NOT_FOUND);
}
public async createRole(serverId: number, roleName: string) {
console.log('enter Auth createRole');
const ctx = this.ctx;
const { uid } = ctx;
const roleId = ctx.service.utils.genCode(10);
const code = ctx.service.utils.genCode(6);
const seqId = await Counter.getNewCounter('role') || -1;
const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName, seqId });
if (role) {
return { status: STATUS_SUC.code, data: { roleId: role.roleId } };
}
return ctx.service.utils.exceptionResult(ROLE_NOT_FOUND);
}
}
web-server/app/service/Utils.ts
+11 -1
View File
@@ -10,7 +10,17 @@ export default class Utils extends Service {
* @param radix 基数
*/
public generateStr(len: number, radix = 36) {
return csprng(len, radix);
return `${csprng(len, radix)}`;
}
public genCode(len) {
const chars = '123456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijklmnopqrstuvwxyz';
const charArr = chars.split('');
let code = '';
for (let i = 0; i < len; i++) {
code += charArr[Math.floor(Math.random() * charArr.length)];
}
return code;
}
/**
web-server/package-lock.json
Generated
+2 -1
View File
@@ -8643,7 +8643,8 @@
"version": "2.2.2",
"resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
"integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
"dev": true
"dev": true,
"optional": true
},
"pify": {
"version": "3.0.0",
web-server/typings/config/plugin.d.ts
Vendored
+4
View File
@@ -14,6 +14,8 @@ import 'egg-schedule';
import 'egg-static';
import 'egg-jsonp';
import 'egg-view';
import 'egg-cors';
import 'egg-alinode';
import { EggPluginItem } from 'egg';
declare module 'egg' {
interface EggPlugin {
@@ -29,5 +31,7 @@ declare module 'egg' {
static?: EggPluginItem;
jsonp?: EggPluginItem;
view?: EggPluginItem;
cors?: EggPluginItem;
alinode?: EggPluginItem;
}
}