Commit e0f83695 authored by qinhaitao's avatar qinhaitao

perf: ️ 接口优化

parent 3ab1ec49
......@@ -167,12 +167,6 @@
"type": "common",
"behave": "check",
"name": "checkExchangeCreditsTask"
},
{
"type": "common",
"behave": "check",
"name": "checkUserInfo",
"params": 3
}
]
}
......@@ -787,11 +781,7 @@
{
"type": "common",
"behave": "update",
"name": "updateVip",
"params": [
"1",
"2"
]
"name": "updateVip"
},
{
"type": "common",
......
......@@ -51,6 +51,7 @@ gulp.task('build', function () {
return codeGenerate.run(gulp, nunjucksRender, rename, nunjucksRenderConfig)
})
console.log(nunjucksRenderConfig.ServerFullPath + '/**/*.ts')
gulp.task('format', () => {
return gulp
.src(nunjucksRenderConfig.ServerFullPath + '/**/*.ts')
......@@ -58,4 +59,4 @@ gulp.task('format', () => {
.pipe(gulp.dest(nunjucksRenderConfig.ServerFullPath + '/'))
})
gulp.task('code', gulp.series('build'))
gulp.task('code', gulp.series('build', 'format'))
/** @format */
import { services,checkParams,noCheckUser } from '../../decorator/common'
import { services, checkParams, noCheckUser } from '../../decorator/common'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonBaseService } from '../../service/common'
export default class BaseController {
/**
* 活动基本信息
......@@ -18,7 +14,7 @@ export default class BaseController {
async getActivityBaseInfoById(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonBaseService]: [CommonBaseService],
[commonBaseService]: [CommonBaseService]
) {
const commonBaseGetBaseInfoResult1 = await commonBaseService.getBaseInfo(context.data.activityId)
return resultsModel.success({
......
/** @format */
import { services,checkParams,noCheckUser,registeInfos } from '../../decorator/common'
import { services, checkParams, noCheckUser, registeInfos } from '../../decorator/common'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonUserService, CommonAccessService } from '../../service/common'
export default class LoginController {
/**
* 登录接口, 初始化/更新用户信息
......@@ -19,7 +15,7 @@ export default class LoginController {
async login(
context: IContext<IParams>,
{ activityInfo, userInfo, vipInfo }: IControllerInfos,
[commonUserService, commonAccessService]: [CommonUserService, CommonAccessService],
[commonUserService, commonAccessService]: [CommonUserService, CommonAccessService]
) {
const commonUserDoLoginResult1 = await commonUserService.doLogin(userInfo, vipInfo, activityInfo)
const commonAccessAddAccessResult2 = await commonAccessService.addAccess(commonUserDoLoginResult1, vipInfo)
......
/** @format */
import { services,checkParams,registeInfos,preCheck } from '../../decorator/common'
import { checkActivityTime,checkInviteId,checkNewVip,checkHelpRecord } from '../../utils/common/check'
import { services, checkParams, registeInfos, preCheck } from '../../decorator/common'
import { checkActivityTime, checkInviteId, checkNewVip, checkHelpRecord } from '../../utils/common/check'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonUserService, CommonTaskService, CommonStatService } from '../../service/common'
export default class ShareController {
/**
* 获取邀请信息
......@@ -18,9 +14,13 @@ export default class ShareController {
async getShareInfo(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonUserService]: [CommonUserService],
[commonUserService]: [CommonUserService]
) {
const commonUserQueryDataByKeyResult1 = await commonUserService.queryDataByKey('remainTimes.invites', userInfo, 'rewards')
const commonUserQueryDataByKeyResult1 = await commonUserService.queryDataByKey(
'remainTimes.invites',
userInfo,
'rewards'
)
return resultsModel.success({
...commonUserQueryDataByKeyResult1
})
......
/** @format */
import { services,checkParams } from '../../decorator/common'
import { services, checkParams } from '../../decorator/common'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonStatService } from '../../service/common'
export default class StatController {
/**
* 增加埋点记录
......@@ -17,7 +13,7 @@ export default class StatController {
async addStat(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService]: [CommonStatService],
[commonStatService]: [CommonStatService]
) {
const commonStatAddStatResult1 = await commonStatService.addStat(context.data.type, userInfo)
return resultsModel.success({
......@@ -32,10 +28,18 @@ export default class StatController {
async getStats(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService]: [CommonStatService],
[commonStatService]: [CommonStatService]
) {
const commonStatGetStatsResult1 = await commonStatService.getStats(context.data.activityId, context.data.startDay, context.data.endDay)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(context.data.startDay, context.data.endDay, commonStatGetStatsResult1)
const commonStatGetStatsResult1 = await commonStatService.getStats(
context.data.activityId,
context.data.startDay,
context.data.endDay
)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(
context.data.startDay,
context.data.endDay,
commonStatGetStatsResult1
)
return resultsModel.success({
...commonStatBuildExcelResult2
})
......
/** @format */
import { services,checkParams,registeInfos,preCheck,preUpdate } from '../../decorator/common'
import { checkActivityTime,checkTaskLimit,checkExchangeCreditsTask,checkUserInfo,checkRemainTimes } from '../../utils/common/check'
import { updateVip,updateSignTask,updateOrderGoods } from '../../utils/common/update'
import { services, checkParams, registeInfos, preCheck, preUpdate } from '../../decorator/common'
import { checkActivityTime, checkTaskLimit, checkExchangeCreditsTask, checkRemainTimes } from '../../utils/common/check'
import { updateVip, updateSignTask, updateOrderGoods } from '../../utils/common/update'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonTaskService, CommonBaseService } from '../../service/common'
export default class TaskController {
/**
* 任务列表
......@@ -22,7 +18,7 @@ export default class TaskController {
async getTaskList(
context: IContext<IParams>,
{ activityInfo, userInfo, vipInfo }: IControllerInfos,
[commonTaskService]: [CommonTaskService],
[commonTaskService]: [CommonTaskService]
) {
const commonTaskInitTaskListResult1 = await commonTaskService.initTaskList(userInfo, activityInfo)
return resultsModel.success({
......@@ -35,13 +31,17 @@ export default class TaskController {
@checkParams(['activityId', 'taskType'])
@registeInfos(['session'])
@services([CommonTaskService])
@preCheck([checkActivityTime, checkTaskLimit, checkExchangeCreditsTask, checkUserInfo()])
@preCheck([checkActivityTime, checkTaskLimit, checkExchangeCreditsTask])
async doCompleteTask(
context: IContext<IParams>,
{ activityInfo, userInfo, session }: IControllerInfos,
[commonTaskService]: [CommonTaskService],
[commonTaskService]: [CommonTaskService]
) {
const commonTaskCompleteTaskResult1 = await commonTaskService.completeTask(context.data.taskType, activityInfo, userInfo)
const commonTaskCompleteTaskResult1 = await commonTaskService.completeTask(
context.data.taskType,
activityInfo,
userInfo
)
return resultsModel.success({
...commonTaskCompleteTaskResult1
})
......@@ -55,9 +55,13 @@ export default class TaskController {
async receiveTaskRewards(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonTaskService]: [CommonTaskService],
[commonTaskService]: [CommonTaskService]
) {
const commonTaskReceiveTaskRewardsResult1 = await commonTaskService.receiveTaskRewards(context.data.taskType, context.data.rewardsKey, userInfo)
const commonTaskReceiveTaskRewardsResult1 = await commonTaskService.receiveTaskRewards(
context.data.taskType,
context.data.rewardsKey,
userInfo
)
return resultsModel.success({
...commonTaskReceiveTaskRewardsResult1
})
......@@ -71,10 +75,13 @@ export default class TaskController {
async getCollectGoodsList(
context: IContext<IParams>,
{ activityInfo, userInfo, session }: IControllerInfos,
[commonBaseService, commonTaskService]: [CommonBaseService, CommonTaskService],
[commonBaseService, commonTaskService]: [CommonBaseService, CommonTaskService]
) {
const commonBaseGetItemListByIdsResult1 = await commonBaseService.getItemListByIds(context.data.itemIds, session)
const commonTaskGetItemListWithCollectStatusResult2 = await commonTaskService.getItemListWithCollectStatus(commonBaseGetItemListByIdsResult1, userInfo)
const commonTaskGetItemListWithCollectStatusResult2 = await commonTaskService.getItemListWithCollectStatus(
commonBaseGetItemListByIdsResult1,
userInfo
)
return resultsModel.success({
...commonTaskGetItemListWithCollectStatusResult2
})
......
/** @format */
import { services,checkParams } from '../../decorator/common'
import { services, checkParams } from '../../decorator/common'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonUserService } from '../../service/common'
export default class UserController {
/**
* 获取会员信息
......@@ -17,7 +13,7 @@ export default class UserController {
async getVipInfo(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonUserService]: [CommonUserService],
[commonUserService]: [CommonUserService]
) {
const commonUserGetShopVipResult1 = await commonUserService.getShopVip(context, activityInfo)
return resultsModel.success({
......@@ -32,10 +28,18 @@ export default class UserController {
async getRankList(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonUserService]: [CommonUserService],
[commonUserService]: [CommonUserService]
) {
const commonUserGetMyRankInfoResult1 = await commonUserService.getMyRankInfo(context.data.key, context.data.timeKey, userInfo)
const commonUserGetRankResult2 = await commonUserService.getRank(context.data.key, context.data.timeKey, context.data.limit)
const commonUserGetMyRankInfoResult1 = await commonUserService.getMyRankInfo(
context.data.key,
context.data.timeKey,
userInfo
)
const commonUserGetRankResult2 = await commonUserService.getRank(
context.data.key,
context.data.timeKey,
context.data.limit
)
return resultsModel.success({
...commonUserGetMyRankInfoResult1,
...commonUserGetRankResult2
......
/** @format */
import { services,checkParams } from '../../decorator/common'
import { services, checkParams } from '../../decorator/common'
import { test1 } from '../../decorator/custom'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonStatService } from '../../service/common'
import { CustomTestService } from '../../service/custom'
export default class Test1Controller {
/**
* 增加埋点记录
......@@ -20,7 +16,7 @@ export default class Test1Controller {
async testAddStat(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService, customTestService]: [CommonStatService, CustomTestService],
[commonStatService, customTestService]: [CommonStatService, CustomTestService]
) {
const commonStatAddStatResult1 = await commonStatService.addStat(context.data.type, userInfo)
const customTestTest1Result2 = await customTestService.test1()
......@@ -37,10 +33,18 @@ export default class Test1Controller {
async testGetStats(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService]: [CommonStatService],
[commonStatService]: [CommonStatService]
) {
const commonStatGetStatsResult1 = await commonStatService.getStats(context.data.activityId, context.data.startDay, context.data.endDay)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(context.data.startDay, context.data.endDay, commonStatGetStatsResult1)
const commonStatGetStatsResult1 = await commonStatService.getStats(
context.data.activityId,
context.data.startDay,
context.data.endDay
)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(
context.data.startDay,
context.data.endDay,
commonStatGetStatsResult1
)
return resultsModel.success({
...commonStatBuildExcelResult2
})
......
/** @format */
import { services,checkParams,preUpdate } from '../../decorator/common'
import { updateVip,updateSignTask,updateOrderGoods } from '../../utils/common/update'
import { services, checkParams, preUpdate } from '../../decorator/common'
import { updateVip, updateSignTask, updateOrderGoods } from '../../utils/common/update'
import customUtil from '../../utils/custom'
import { resultsModel } from '../../sdk'
import { CommonStatService } from '../../service/common'
export default class Test2Controller {
/**
* 增加埋点记录
......@@ -18,7 +14,7 @@ export default class Test2Controller {
async test2addStat(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService]: [CommonStatService],
[commonStatService]: [CommonStatService]
) {
const commonStatAddStatResult1 = await commonStatService.addStat(context.data.type, userInfo)
return resultsModel.success({
......@@ -30,14 +26,22 @@ export default class Test2Controller {
*/
@checkParams(['activityId', 'startDay', 'endDay'])
@services([CommonStatService])
@preUpdate([updateVip(1, 2), updateSignTask, updateOrderGoods])
@preUpdate([updateVip, updateSignTask, updateOrderGoods])
async test2getStats(
context: IContext<IParams>,
{ activityInfo, userInfo }: IControllerInfos,
[commonStatService]: [CommonStatService],
[commonStatService]: [CommonStatService]
) {
const commonStatGetStatsResult1 = await commonStatService.getStats(context.data.activityId, context.data.startDay, context.data.endDay)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(context.data.startDay, context.data.endDay, commonStatGetStatsResult1)
const commonStatGetStatsResult1 = await commonStatService.getStats(
context.data.activityId,
context.data.startDay,
context.data.endDay
)
const commonStatBuildExcelResult2 = await commonStatService.buildExcel(
context.data.startDay,
context.data.endDay,
commonStatGetStatsResult1
)
return resultsModel.success({
...commonStatBuildExcelResult2
})
......
......@@ -55,7 +55,9 @@ export default class Game {
[gameService]: [CommonGameService]
) {
const { id, score } = context.data
const result = await gameService.submitGame(id, score, userInfo, joinInfo)
const rankKey = 'totalScore'
const rankTime = 'updateScoreTime'
const result = await gameService.submitGame(id, score, rankKey, rankTime, userInfo, joinInfo)
return resultsModel.success(result)
}
......
......@@ -8,6 +8,4 @@ const custom = {
export default custom
export {
test1
}
export { test1 }
......@@ -42,12 +42,19 @@ export default class GameService extends UserService {
return { id }
}
async submitGame(id: string, score: number, userInfo: IUserInfo, joinInfo: IJoinRecord) {
async submitGame(
id: string,
score: number,
rankKey: string,
rankTime: string,
userInfo: IUserInfo,
joinInfo: IJoinRecord
) {
const { duration } = await this.updateJoinRecord(id, score, userInfo, joinInfo)
const { maxScore, totalScore } = await this.updateUserScore(score, userInfo)
const myRankInfo = await this.getMyRankInfo('maxScore', 'updateScoreTime', userInfo)
const myRankInfo = await this.getMyRankInfo(rankKey, rankTime, userInfo)
const { gameTimes, avatar, userNick } = userInfo
......
......@@ -7,6 +7,4 @@ const custom = {
export default custom
export {
CustomTestService
}
export { CustomTestService }
/** @format */
const custom = {
}
const custom = {}
export default custom
export {
}
export {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment