diff --git a/shared/db/AccuseRec.ts b/shared/db/AccuseRec.ts
index 31f126af0..865fe9678 100644
--- a/shared/db/AccuseRec.ts
+++ b/shared/db/AccuseRec.ts
@@ -6,8 +6,7 @@ import { genCode } from '../pubUtils/util';
   * 举报记录
 **/
 @modelOptions({ schemaOptions: { id: false } })
-@index({ roleId: 1 })
-@index({ targetRoleId: 1 })
+@index({ code: 1 })
 export default class AccuseRec extends BaseModel {
   @prop({ required: true, default: '' })
   code: string; // 唯一标识
diff --git a/shared/db/Activity.ts b/shared/db/Activity.ts
index 63acdac22..6983aab5e 100644
--- a/shared/db/Activity.ts
+++ b/shared/db/Activity.ts
@@ -9,6 +9,7 @@ import { UpdateActivityParam } from '../domain/backEndField/params';
   * 活动系统 
 */
 @index({ activityId: 1 })
+@index({ type: 1 })
 
 export default class Activity extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityBuyRecords.ts b/shared/db/ActivityBuyRecords.ts
index 1db18d2db..e3445cbe4 100644
--- a/shared/db/ActivityBuyRecords.ts
+++ b/shared/db/ActivityBuyRecords.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动购买记录
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Buy_Records extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyChallenges.ts b/shared/db/ActivityDailyChallenges.ts
index 706d5201e..9c8a2a39e 100644
--- a/shared/db/ActivityDailyChallenges.ts
+++ b/shared/db/ActivityDailyChallenges.ts
@@ -5,7 +5,7 @@ import { UpdateTaskParam } from '../domain/roleField/task';
 /**
   * 活动系统 - 今日挑战活动
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_Challenges extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyCoin.ts b/shared/db/ActivityDailyCoin.ts
index 079061100..333cddee3 100644
--- a/shared/db/ActivityDailyCoin.ts
+++ b/shared/db/ActivityDailyCoin.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 每日兑换铜币
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_Coin extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyGK.ts b/shared/db/ActivityDailyGK.ts
index 40d4b0a3b..976b920a1 100644
--- a/shared/db/ActivityDailyGK.ts
+++ b/shared/db/ActivityDailyGK.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 每日关卡活动
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_GK extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyGifts.ts b/shared/db/ActivityDailyGifts.ts
index b10e5415f..df2e6eaaf 100644
--- a/shared/db/ActivityDailyGifts.ts
+++ b/shared/db/ActivityDailyGifts.ts
@@ -5,7 +5,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
   * 活动系统 - 每日活动
   * 1.每日特惠礼包（游戏币）
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_Gifts extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyMeal.ts b/shared/db/ActivityDailyMeal.ts
index a99e8116f..6c11dd338 100644
--- a/shared/db/ActivityDailyMeal.ts
+++ b/shared/db/ActivityDailyMeal.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 每日免费午餐、晚餐
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_Meal extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityDailyRMBGifts.ts b/shared/db/ActivityDailyRMBGifts.ts
index f6a7e90b2..76bcba793 100644
--- a/shared/db/ActivityDailyRMBGifts.ts
+++ b/shared/db/ActivityDailyRMBGifts.ts
@@ -18,7 +18,7 @@ export class BuyRecord {
 */
 
 
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Daily_RMB_Gifts extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityFirstGift.ts b/shared/db/ActivityFirstGift.ts
index 83d61a25a..0ce7e717c 100644
--- a/shared/db/ActivityFirstGift.ts
+++ b/shared/db/ActivityFirstGift.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 首个礼包
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_First_Gift extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityGroupShopUserRec.ts b/shared/db/ActivityGroupShopUserRec.ts
index db13fd05d..e4087db39 100644
--- a/shared/db/ActivityGroupShopUserRec.ts
+++ b/shared/db/ActivityGroupShopUserRec.ts
@@ -6,8 +6,7 @@ import { GroupShopDiscount } from '../domain/activityField/groupShopField';
 /**
   * 活动系统 - 团购玩家记录
 */
-@index({ activityId: 1 })
-@index({ activityId: 1, roleId: 1 })
+@index({ roleId: 1, activityId: 1,  })
 @index({ activityId: 1, id: 1, 'records.price': 1 })
 
 export class GroupShopBuyRecord {
diff --git a/shared/db/ActivityGroupType.ts b/shared/db/ActivityGroupType.ts
index 6c6962961..2edb299c3 100644
--- a/shared/db/ActivityGroupType.ts
+++ b/shared/db/ActivityGroupType.ts
@@ -6,7 +6,6 @@ import { COUNTER, ACTIVITY_TYPE } from '../consts';
 /**
   * 活动合集
 */
-@index({ activityId: 1 })
 
 class ActivityType {
     @prop({ required: true })
@@ -16,6 +15,7 @@ class ActivityType {
     activityType: ACTIVITY_TYPE;     // 活动类型
 }
 
+@index({ groupType: 1 })
 export default class Activity_GroupType extends BaseModel {
     @prop({ required: true })
     groupType: number;				// 类型id，创建时自增
diff --git a/shared/db/ActivityGrowth.ts b/shared/db/ActivityGrowth.ts
index 07da2d984..5ecc2f8cb 100644
--- a/shared/db/ActivityGrowth.ts
+++ b/shared/db/ActivityGrowth.ts
@@ -5,7 +5,7 @@ import { UpdateTaskParam } from '../domain/roleField/task';
 /**
   * 活动系统 - 成长任务活动
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Growth extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityGrowthFund.ts b/shared/db/ActivityGrowthFund.ts
index 3a4125bfb..d2b9f1fe5 100644
--- a/shared/db/ActivityGrowthFund.ts
+++ b/shared/db/ActivityGrowthFund.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 成长基金活动
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Growth_Fund extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityGrowthPoint.ts b/shared/db/ActivityGrowthPoint.ts
index 080cd8665..c1815b5c9 100644
--- a/shared/db/ActivityGrowthPoint.ts
+++ b/shared/db/ActivityGrowthPoint.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 成长任务活动积分点兑换奖励
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Growth_Point extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityGuildPay.ts b/shared/db/ActivityGuildPay.ts
index e41fa3c1d..d157596fd 100644
--- a/shared/db/ActivityGuildPay.ts
+++ b/shared/db/ActivityGuildPay.ts
@@ -16,7 +16,7 @@ class MemberRecord {
 /**
   * 活动系统 - 成长任务活动积分点兑换奖励
 */
-@index({ serverId: 1, guildCode: 1, activityId: 1, roundIndex: 1 })
+@index({ guildCode: 1, activityId: 1, roundIndex: 1 })
 
 export default class Activity_Guild_Pay extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityGuildPayRecord.ts b/shared/db/ActivityGuildPayRecord.ts
index 113db5383..fc144ac5f 100644
--- a/shared/db/ActivityGuildPayRecord.ts
+++ b/shared/db/ActivityGuildPayRecord.ts
@@ -5,7 +5,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 成长任务活动积分点兑换奖励
 */
-@index({ serverId: 1, guildCode: 1, activityId: 1, roundIndex: 1 })
+@index({ guildCode: 1, activityId: 1, roundIndex: 1 })
 
 export default class Activity_Guild_Pay_Record extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityMonopoly.ts b/shared/db/ActivityMonopoly.ts
index 6327ba807..22a03544d 100644
--- a/shared/db/ActivityMonopoly.ts
+++ b/shared/db/ActivityMonopoly.ts
@@ -6,7 +6,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 大富翁
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Monopoly extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityMonopolyLand.ts b/shared/db/ActivityMonopolyLand.ts
index 84d320823..e647a4334 100644
--- a/shared/db/ActivityMonopolyLand.ts
+++ b/shared/db/ActivityMonopolyLand.ts
@@ -20,7 +20,7 @@ export class Record {
 /**
   * 活动系统 - 大富翁
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Monopoly_Land extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityMonthlyTicket.ts b/shared/db/ActivityMonthlyTicket.ts
index 04e021345..7e788f59a 100644
--- a/shared/db/ActivityMonthlyTicket.ts
+++ b/shared/db/ActivityMonthlyTicket.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 月卡 
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Monthly_Ticket extends BaseModel {
 
diff --git a/shared/db/ActivityNewHeroGK.ts b/shared/db/ActivityNewHeroGK.ts
index 123789264..92d05a7ac 100644
--- a/shared/db/ActivityNewHeroGK.ts
+++ b/shared/db/ActivityNewHeroGK.ts
@@ -12,7 +12,7 @@ export class Record {
 /**
   * 活动系统 - 新将演绎活动
 */
-@index({ serverId: 1, activityId: 1, roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_New_Hero_GK extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityNewHeroGift.ts b/shared/db/ActivityNewHeroGift.ts
index bfb80e9b5..f7c1c958f 100644
--- a/shared/db/ActivityNewHeroGift.ts
+++ b/shared/db/ActivityNewHeroGift.ts
@@ -18,7 +18,7 @@ export class ActivityNewHeroGiftRecord {
 /**
   * 活动系统 -  新将好礼(很多红包，用积分兑换一遍结束),点数兑换奖品记录
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_New_Hero_Gift extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityPopUpShop.ts b/shared/db/ActivityPopUpShop.ts
index 3a483a84b..673da36d2 100644
--- a/shared/db/ActivityPopUpShop.ts
+++ b/shared/db/ActivityPopUpShop.ts
@@ -27,7 +27,8 @@ export class PopUpShopItem {
 /**
   * 活动系统 - 弹出商店
 */
-@index({ roleId: 1, code: 1 })
+@index({ roleId: 1, activityId: 1 })
+@index({ code: 1 })
 
 export default class Activity_Pop_Up_Shop extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityPopUpShopRec.ts b/shared/db/ActivityPopUpShopRec.ts
index 03bb58b00..be37d38a3 100644
--- a/shared/db/ActivityPopUpShopRec.ts
+++ b/shared/db/ActivityPopUpShopRec.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 弹出商店的记录
 */
-@index({ roleId: 1, effectBeginTime: 1, effectEndTime: 1 })
+@index({ roleId: 1, effectBeginTime: 1 })
 
 export default class Activity_Pop_Up_Shop_Rec extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityRechargeMoney.ts b/shared/db/ActivityRechargeMoney.ts
index 728e8635b..08e720fbf 100644
--- a/shared/db/ActivityRechargeMoney.ts
+++ b/shared/db/ActivityRechargeMoney.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 累计充值活动 
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Recharge_Money extends BaseModel {
 
diff --git a/shared/db/ActivityRefreshShop.ts b/shared/db/ActivityRefreshShop.ts
index d4f572b8b..e648a231a 100644
--- a/shared/db/ActivityRefreshShop.ts
+++ b/shared/db/ActivityRefreshShop.ts
@@ -30,7 +30,7 @@ export class GoodsInfo {
 /**
   * 活动系统 - 新手限定、每日限购、每周限购
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Refresh_Shop extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityRefreshTask.ts b/shared/db/ActivityRefreshTask.ts
index 1eb7dc9af..ef5afd025 100644
--- a/shared/db/ActivityRefreshTask.ts
+++ b/shared/db/ActivityRefreshTask.ts
@@ -5,7 +5,7 @@ import { UpdateTaskParam } from '../domain/roleField/task';
 /**
   * 活动系统 - 通用的刷新任务（分页，可刷新，限制领取次数）
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Refresh_Task extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityRefreshTaskPoint.ts b/shared/db/ActivityRefreshTaskPoint.ts
index f73aa5c92..9ab9f2db2 100644
--- a/shared/db/ActivityRefreshTaskPoint.ts
+++ b/shared/db/ActivityRefreshTaskPoint.ts
@@ -16,7 +16,7 @@ export class Record {
 /**
   * 活动系统 - 通用的刷新任务（分页，可刷新，限制领取次数），点数兑换奖品记录
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Refresh_Task_Point extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivitySelfService.ts b/shared/db/ActivitySelfService.ts
index 329d6e6e7..a17122d41 100644
--- a/shared/db/ActivitySelfService.ts
+++ b/shared/db/ActivitySelfService.ts
@@ -12,7 +12,7 @@ export class ChallengeRecord {
 /**
   * 糜家商队活动数据
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Self_Service extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivitySelfServiceGoods.ts b/shared/db/ActivitySelfServiceGoods.ts
index 3b3d80694..f0332a28a 100644
--- a/shared/db/ActivitySelfServiceGoods.ts
+++ b/shared/db/ActivitySelfServiceGoods.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 自助商店货架上的商品
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Self_Service_Goods extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivitySelfServiceShop.ts b/shared/db/ActivitySelfServiceShop.ts
index 76373ca16..1012d96da 100644
--- a/shared/db/ActivitySelfServiceShop.ts
+++ b/shared/db/ActivitySelfServiceShop.ts
@@ -5,7 +5,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 自助商店
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Self_Service_Shop extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityShop.ts b/shared/db/ActivityShop.ts
index c14cf957c..de2910032 100644
--- a/shared/db/ActivityShop.ts
+++ b/shared/db/ActivityShop.ts
@@ -17,7 +17,7 @@ export class BuyRecord {
 /**
   * 活动系统 - 新手限定、每日限购、每周限购
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Shop extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivitySignIn.ts b/shared/db/ActivitySignIn.ts
index 2c7b4da8e..1b7e41ed6 100644
--- a/shared/db/ActivitySignIn.ts
+++ b/shared/db/ActivitySignIn.ts
@@ -16,7 +16,7 @@ export class Activity_Sign_In_Record {
 /**
   * 签到
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Sign_In extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityTaskPass.ts b/shared/db/ActivityTaskPass.ts
index 93bacd425..7eba00651 100644
--- a/shared/db/ActivityTaskPass.ts
+++ b/shared/db/ActivityTaskPass.ts
@@ -15,7 +15,7 @@ export class ReceivedReward {
 /**
   * 30天目标活动
 */
-@index({ roleId: 1, activityId: 1, serverId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Task_Pass extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityTaskPoint.ts b/shared/db/ActivityTaskPoint.ts
index e47540fc9..e990efff8 100644
--- a/shared/db/ActivityTaskPoint.ts
+++ b/shared/db/ActivityTaskPoint.ts
@@ -5,7 +5,7 @@ import { index, getModelForClass, prop, DocumentType, ReturnModelType, mongoose
 /**
   * 游戏中的任务完成后，增加的积分点数关联到活动数据
 */
-@index({ taskId: 1 })
+@index({ taskId: 1, activityId: 1 })
 
 export default class Activity_Task_Point extends BaseModel {
     // @prop({ required: true })
diff --git a/shared/db/ActivityThirtyDays.ts b/shared/db/ActivityThirtyDays.ts
index 67463bfd6..aa82305d8 100644
--- a/shared/db/ActivityThirtyDays.ts
+++ b/shared/db/ActivityThirtyDays.ts
@@ -5,7 +5,7 @@ import { UpdateTaskParam } from '../domain/roleField/task';
 /**
   * 30天目标活动
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Thirty_Days extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityThirtyDaysPointReward.ts b/shared/db/ActivityThirtyDaysPointReward.ts
index f85442703..5ffe7c621 100644
--- a/shared/db/ActivityThirtyDaysPointReward.ts
+++ b/shared/db/ActivityThirtyDaysPointReward.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 30天目标活动-点数兑换奖励记录
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Thirty_Days_Point_Reward extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ActivityTreasureHuntChallenge.ts b/shared/db/ActivityTreasureHuntChallenge.ts
index 34979a8dc..b388055ab 100644
--- a/shared/db/ActivityTreasureHuntChallenge.ts
+++ b/shared/db/ActivityTreasureHuntChallenge.ts
@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 寻宝骑兵-挑战
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Treasure_Hunt_Challenge {
   @prop({ required: true })
diff --git a/shared/db/ActivityTreasureHuntFirstPage.ts b/shared/db/ActivityTreasureHuntFirstPage.ts
index 3ba459e76..cf17b317d 100644
--- a/shared/db/ActivityTreasureHuntFirstPage.ts
+++ b/shared/db/ActivityTreasureHuntFirstPage.ts
@@ -6,7 +6,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 寻宝骑兵-首页奖励
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Treasure_Hunt_First_Page {
   @prop({ required: true })
diff --git a/shared/db/ActivityTreasureHuntShop.ts b/shared/db/ActivityTreasureHuntShop.ts
index 79833a4e2..d70255279 100644
--- a/shared/db/ActivityTreasureHuntShop.ts
+++ b/shared/db/ActivityTreasureHuntShop.ts
@@ -7,7 +7,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 活动系统 - 寻宝猎人-商店
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Treasure_Hunt_Shop extends ActivityShop {
   @prop({ required: true })
diff --git a/shared/db/ActivityTreasureHuntTask.ts b/shared/db/ActivityTreasureHuntTask.ts
index 0241cc838..6933a7e07 100644
--- a/shared/db/ActivityTreasureHuntTask.ts
+++ b/shared/db/ActivityTreasureHuntTask.ts
@@ -5,7 +5,7 @@ import { UpdateTaskParam } from '../domain/roleField/task';
 /**
   * 活动系统 - 寻宝骑兵-备战任务
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Treasure_Hunt_Task extends ActivityGrowth {
 
diff --git a/shared/db/ActivityTreasureHuntTreasureShop.ts b/shared/db/ActivityTreasureHuntTreasureShop.ts
index dc37c96e9..28082e1c2 100644
--- a/shared/db/ActivityTreasureHuntTreasureShop.ts
+++ b/shared/db/ActivityTreasureHuntTreasureShop.ts
@@ -7,7 +7,7 @@ import { index, getModelForClass, DocumentType } from '@typegoose/typegoose';
 /**
   * 活动系统 - 寻宝骑兵-天子宝库商店
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Treasure_Hunt_Treasure_Shop extends ActivityShop {
 
diff --git a/shared/db/ActivityTurntableRec.ts b/shared/db/ActivityTurntableRec.ts
index 36720dab3..a36206079 100644
--- a/shared/db/ActivityTurntableRec.ts
+++ b/shared/db/ActivityTurntableRec.ts
@@ -15,7 +15,7 @@ export class TurntableRecord {
 /**
   * 幸运转盘活动 
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Turntable_Rec extends BaseModel {
 
diff --git a/shared/db/ActivityVipRechargeMoney.ts b/shared/db/ActivityVipRechargeMoney.ts
index ee911e0f7..41d174490 100644
--- a/shared/db/ActivityVipRechargeMoney.ts
+++ b/shared/db/ActivityVipRechargeMoney.ts
@@ -11,7 +11,7 @@ class RewardRecord {
 /**
   * Vip累计充值活动 
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, activityId: 1 })
 
 export default class Activity_Vip_Recharge_Money extends BaseModel {
 
diff --git a/shared/db/BattleDrop.ts b/shared/db/BattleDrop.ts
index ec2f6f3c6..0ffbede5e 100644
--- a/shared/db/BattleDrop.ts
+++ b/shared/db/BattleDrop.ts
@@ -4,7 +4,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
 /**
   * 战斗记录接口
   */
-@index({ roleId: 1, battleId: 1 })
+@index({ roleId: 1, battleId: 1, gid: 1 })
 
 export default class BattleDrop extends BaseModel {
   @prop({ required: true })
diff --git a/shared/db/BattleRecord.ts b/shared/db/BattleRecord.ts
index fe389b971..d459fc594 100644
--- a/shared/db/BattleRecord.ts
+++ b/shared/db/BattleRecord.ts
@@ -5,8 +5,6 @@ import { LineupParam } from '../domain/rank';
 /**
   * 战斗记录接口
   */
-@index({ roleId: 1, battleId: 1 })
-@index({ battleCode: 1 })
 
 class Record {
     @prop({ required: true, type: Number })
@@ -39,6 +37,8 @@ class Record {
     encourageCnt?: number;
 }
 
+@index({ roleId: 1, battleId: 1 })
+@index({ battleCode: 1 })
 export default class BattleRecord extends BaseModel {
     @prop({ required: true })
     roleId: string;					// 角色 id
diff --git a/shared/db/BossInstance.ts b/shared/db/BossInstance.ts
index 7ede0a22c..a83e97e9d 100644
--- a/shared/db/BossInstance.ts
+++ b/shared/db/BossInstance.ts
@@ -15,6 +15,7 @@ class Rank {
     job: number;
 }
 
+@index({ code: 1 })
 @index({ guildCode: 1 })
 export default class BossInstance extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/Dividend.ts b/shared/db/Dividend.ts
index 0ee1fe6b4..e10bcf6ab 100644
--- a/shared/db/Dividend.ts
+++ b/shared/db/Dividend.ts
@@ -9,8 +9,7 @@ import { DIVIDEND_STATUS, ROLE_RECEIVE_STATUS } from '../consts';
 **/
 @modelOptions({ schemaOptions: { id: false } })
 @index({ code: 1 })
-@index({ begin: -1, guildCode: 1 })
-@index({ begin: -1, serverId: 1 })
+@index({ begin: -1, guildCode: 1, serverId: 1 })
 @index({ 'lots.code': 1 })
 export default class Dividend extends BaseModel {
     @prop({ required: true, default: 0 })
diff --git a/shared/db/Donation.ts b/shared/db/Donation.ts
index 1545e5cbe..bfa3c9c42 100644
--- a/shared/db/Donation.ts
+++ b/shared/db/Donation.ts
@@ -1,5 +1,5 @@
 import BaseModel from './BaseModel';
-import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { getModelForClass, prop, DocumentType, index } from '@typegoose/typegoose';
 
 export class Report {
     @prop({ required: true })
@@ -15,6 +15,7 @@ export class Report {
     fund: number;//捐献数
 }
 
+@index({ guildCode: 1 })
 export default class Donation extends BaseModel {
     
     @prop({ required: true })
diff --git a/shared/db/DungeonFirst.ts b/shared/db/DungeonFirst.ts
index ae1698b5d..2c770a704 100644
--- a/shared/db/DungeonFirst.ts
+++ b/shared/db/DungeonFirst.ts
@@ -2,9 +2,10 @@
  * 秘境首通
  */
 import BaseModel from './BaseModel';
-import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { getModelForClass, prop, DocumentType, index } from '@typegoose/typegoose';
 import { RankParam, LineupParam } from '../domain/rank';
 
+@index({ serverId: 1, movePoint: 1 })
 export default class DungeonFirst extends BaseModel {
     
     @prop({ required: true })
diff --git a/shared/db/EventRecord.ts b/shared/db/EventRecord.ts
index 03fd81376..886fb7106 100644
--- a/shared/db/EventRecord.ts
+++ b/shared/db/EventRecord.ts
@@ -14,8 +14,7 @@ class Question {
 /**
   * 战斗记录接口
   */
-@index({ roleId: 1, eventId: 1 })
-@index({ roleId: 1, eventCode: 1 })
+@index({ roleId: 1, eventCode: 1, eventId: 1 })
 
 export default class EventRecord extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/ExpeditionWarRecord.ts b/shared/db/ExpeditionWarRecord.ts
index cf5c9fc45..86866cfa8 100644
--- a/shared/db/ExpeditionWarRecord.ts
+++ b/shared/db/ExpeditionWarRecord.ts
@@ -16,7 +16,7 @@ class EnemiesCurHPAP {
 /**
   * 远征记录
   */
-@index({ expeditionCode: 1, expeditionId: 1 })
+@index({ expeditionCode: 1 })
 
 export default class ExpeditionWarRecord extends BaseModel {
     @prop({ required: true, default: '' })
diff --git a/shared/db/FriendApply.ts b/shared/db/FriendApply.ts
index a21d16f5b..235cd9cb8 100644
--- a/shared/db/FriendApply.ts
+++ b/shared/db/FriendApply.ts
@@ -7,7 +7,8 @@ import { ROLE_SELECT } from '../consts';
 /**
   * 好友系统关系表
   */
-@index({ roleId: 1, createdAt: -1 })
+@index({ roleId: 1, frdRoleId: 1 })
+@index({ applyCode: 1 })
 
 export default class FriendApply extends BaseModel {
 
diff --git a/shared/db/FriendPresentLog.ts b/shared/db/FriendPresentLog.ts
index 638f251cb..d66846f1e 100644
--- a/shared/db/FriendPresentLog.ts
+++ b/shared/db/FriendPresentLog.ts
@@ -5,8 +5,7 @@ import { ItemReward } from '../domain/dbGeneral';
 /**
   * GM用户组接口
 */
-@index({ uid: 1 })
-@index({ api: 1 })
+@index({ roleId: 1, hisRoleId: 1 })
 
 export default class FriendPresentLog extends BaseModel {
 
diff --git a/shared/db/GMMailRecord.ts b/shared/db/GMMailRecord.ts
index 6db4516f3..254db40a4 100644
--- a/shared/db/GMMailRecord.ts
+++ b/shared/db/GMMailRecord.ts
@@ -14,8 +14,6 @@ class Reward {
     count: number;
 }
 
-@index({ roleId: 1 })
-
 export default class GMMailRecord extends BaseModel {
 
     @prop({ required: true })
diff --git a/shared/db/GiftCodeDetail.ts b/shared/db/GiftCodeDetail.ts
index 783170afc..5088bb76c 100644
--- a/shared/db/GiftCodeDetail.ts
+++ b/shared/db/GiftCodeDetail.ts
@@ -24,7 +24,7 @@ class RoleRecord {
   * 领取记录
 **/
 @modelOptions({ schemaOptions: { id: false } })
-@index({ code: 1 })
+@index({ code: 1, giftId: 1 })
 export default class GiftCodeDetail extends BaseModel {
 
     @prop({ required: true, default: '' })
diff --git a/shared/db/GuildActivityCity.ts b/shared/db/GuildActivityCity.ts
index 0f610c4e7..9ec63430e 100644
--- a/shared/db/GuildActivityCity.ts
+++ b/shared/db/GuildActivityCity.ts
@@ -1,7 +1,7 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 
-@index({ serverId: 1, cityId: 1, createdAt: 1   })
+@index({ createdAt: 1, cityId: 1, serverId: 1,  })
 export default class GuildActivityCity extends BaseModel {
 
     @prop({ required: true })
diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts
index 7ce718876..1bd54e543 100644
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -98,8 +98,7 @@ export class EPlace {
     } 
 }
 
-@index({ roleId: 1, hid: 1 })
-@index({ roleId: 1, seqId: 1 })
+@index({ seqId: 1, roleId: 1, hid: 1 })
 export default class Hero extends BaseModel {
 
     @prop({ required: true })
diff --git a/shared/db/HistoryOrder.ts b/shared/db/HistoryOrder.ts
index 41076da66..5ddd0009a 100644
--- a/shared/db/HistoryOrder.ts
+++ b/shared/db/HistoryOrder.ts
@@ -5,6 +5,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
   * 累计充值活动 
 */
 @index({ channelId: 1 })
+@index({ id: 1 })
 
 export default class HistoryOrder extends BaseModel {
 
diff --git a/shared/db/Jewel.ts b/shared/db/Jewel.ts
index ac38b55cb..5a4851947 100644
--- a/shared/db/Jewel.ts
+++ b/shared/db/Jewel.ts
@@ -35,7 +35,7 @@ export class RandSe extends JewelSe {
     quenchCnt: number = 0;				// 淬炼次数
 }
 
-@index({ roleId: 1, hid: 1, id: 1 })
+@index({ roleId: 1, id: 1 })
 @index({ seqId: 1 })
 @modelOptions({ schemaOptions: { id: false } })
 export default class Jewel extends BaseModel {
diff --git a/shared/db/Notice.ts b/shared/db/Notice.ts
index 93965f2c7..3bc3dc894 100644
--- a/shared/db/Notice.ts
+++ b/shared/db/Notice.ts
@@ -6,8 +6,8 @@ import { CounterModel } from './Counter';
 /**
   * 游戏字段接口
 */
-@index({ id: 1 })
 @modelOptions({schemaOptions: {id: false}})
+@index({ id: 1 })
 export default class Notice extends BaseModel {
 
   @prop({ required: true })
diff --git a/shared/db/PvpHistoryOpp.ts b/shared/db/PvpHistoryOpp.ts
index 6aed26228..6e092947f 100644
--- a/shared/db/PvpHistoryOpp.ts
+++ b/shared/db/PvpHistoryOpp.ts
@@ -11,7 +11,7 @@ export class HeroScores {
     score: number;
 }
 
-@index({ roleId: 1 })
+@index({ roleId: 1, oppRoleId: 1 })
 export default class PvpHistoryOpp extends BaseModel {
     @prop({ required: true })
     roleId: string;					// 玩家id
diff --git a/shared/db/PvpSaveData.ts b/shared/db/PvpSaveData.ts
index 4b5a71929..97cf81f04 100644
--- a/shared/db/PvpSaveData.ts
+++ b/shared/db/PvpSaveData.ts
@@ -2,7 +2,6 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { DefenseHeroInSaveData, } from '../domain/battleField/pvp';
 
-@index({ roleId: 1 })
 @index({ roleId: 1, warId: 1 })
 export default class PvpSaveData extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/RankFirst.ts b/shared/db/RankFirst.ts
index 708aca69a..34b27bb1c 100644
--- a/shared/db/RankFirst.ts
+++ b/shared/db/RankFirst.ts
@@ -2,9 +2,10 @@
  * 秘境首通
  */
  import BaseModel from './BaseModel';
- import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+ import { getModelForClass, prop, DocumentType, index } from '@typegoose/typegoose';
  import { RankParam, GuildRankParam } from '../domain/rank';
  
+@index({ id: 1 })
  export default class RankFirst extends BaseModel {
      
      @prop({ required: true })
diff --git a/shared/db/Role.ts b/shared/db/Role.ts
index 45b5fbe97..311a3c26c 100644
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -105,9 +105,8 @@ export class Teraph {
 /**
   * 角色字段接口
 */
-@index({ roleId: 1 })
+@index({ roleId: 1, serverId: 1 })
 @index({ roleName: 1 })
-@index({ serverId: 1, roleId: 1 })
 @index({ towerLv: -1, towerUpTime: 1 })
 @index({ topLineupCe: 1, updatedAt: 1 })
 @index({ ce: -1 })
diff --git a/shared/db/RoleCe.ts b/shared/db/RoleCe.ts
index 0f328e39b..7c979a406 100644
--- a/shared/db/RoleCe.ts
+++ b/shared/db/RoleCe.ts
@@ -77,7 +77,6 @@ export class Attribute {
   * 属性表
 */
 
-@index({ roleId: 1 })
 @index({ roleId: 1 })
 
 export default class RoleCe extends BaseModel {
diff --git a/shared/db/School.ts b/shared/db/School.ts
index d12d7bd58..8a87d3780 100644
--- a/shared/db/School.ts
+++ b/shared/db/School.ts
@@ -5,7 +5,6 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
   * 百家学宫表
 */
 
-@index({ roleId: 1 })
 @index({ roleId: 1, schoolId: 1, positionId: 1 })
 
 export default class School extends BaseModel {
diff --git a/shared/db/ScriptBarrage.ts b/shared/db/ScriptBarrage.ts
index eb6e05d1b..d9b0224b3 100644
--- a/shared/db/ScriptBarrage.ts
+++ b/shared/db/ScriptBarrage.ts
@@ -5,7 +5,8 @@ import { genCode } from '../pubUtils/util';
 /**
   * 派遣任务记录表
   */
-@index({ roleId: 1, type: 1 })
+@index({ rid: 1 })
+@index({ code: 1 })
 
 export default class ScriptBarrage extends BaseModel {
   @prop({ required: true })
diff --git a/shared/db/ServerMail.ts b/shared/db/ServerMail.ts
index eda880d2c..65380bd9b 100644
--- a/shared/db/ServerMail.ts
+++ b/shared/db/ServerMail.ts
@@ -13,7 +13,7 @@ class RoleStatus {
     status: number;
 }
 
-@index({ sendRoles: 1 })
+@index({ sendTime: 1 })
 export default class ServerMail extends MailTemp {
     @prop({ required: true })
     serverId: number;			
diff --git a/shared/db/ServerRecords.ts b/shared/db/ServerRecords.ts
index 91f123a3a..66d437587 100644
--- a/shared/db/ServerRecords.ts
+++ b/shared/db/ServerRecords.ts
@@ -31,7 +31,7 @@ export class GuildRecord {
 /**
   * 游戏字段接口
 */
-@index({ serverId: 1, date: 1 })
+@index({ serverId: 1, today: 1 })
 @modelOptions({ schemaOptions: { id: false } })
 export default class ServerRecord extends BaseModel {
 
diff --git a/shared/db/Skin.ts b/shared/db/Skin.ts
index c41784d24..38448beb7 100644
--- a/shared/db/Skin.ts
+++ b/shared/db/Skin.ts
@@ -1,9 +1,9 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
 import { gameData } from '../pubUtils/data';
+@modelOptions({ schemaOptions: { id: false } })
 @index({ roleId: 1, id: 1 })
 @index({ seqId: 1 })
-@modelOptions({ schemaOptions: { id: false } })
 export default class Skin extends BaseModel {
     @prop({ required: true, default: '' })
     roleId: string;					// 角色 id
diff --git a/shared/db/Survery.ts b/shared/db/Survery.ts
index e47e083a2..a16b56fc1 100644
--- a/shared/db/Survery.ts
+++ b/shared/db/Survery.ts
@@ -5,8 +5,7 @@ import { Reward } from '../domain/battleField/pvp';
 import { genCode } from '../pubUtils/util';
 import { nowSeconds } from '../pubUtils/timeUtil';
 
-@index({ id: 1 })
-@index({ seasonNum: 1 })
+@index({ surveyId: 1 })
 export default class Survey extends BaseModel {
 
     @prop({ required: true })
diff --git a/shared/db/SurveyRec.ts b/shared/db/SurveyRec.ts
index 074a60898..72b7fce5e 100644
--- a/shared/db/SurveyRec.ts
+++ b/shared/db/SurveyRec.ts
@@ -2,8 +2,7 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { genCode } from '../pubUtils/util';
 
-@index({ id: 1 })
-@index({ seasonNum: 1 })
+@index({ id: 1, surveyId: 1 })
 export default class SurveyRec extends BaseModel {
 
     @prop({ required: true, default: 1 })
diff --git a/shared/db/UserGacha.ts b/shared/db/UserGacha.ts
index d8d05ec2b..c88c52a1e 100644
--- a/shared/db/UserGacha.ts
+++ b/shared/db/UserGacha.ts
@@ -41,7 +41,7 @@ class Turntable {
   * 玩家抽卡表
 **/
 @modelOptions({ schemaOptions: { id: false } })
-@index({ roleId: 1, itemId: 1 })
+@index({ roleId: 1, gachaId: 1 })
 
 export default class UserGacha extends BaseModel {
 
diff --git a/shared/db/UserGuild.ts b/shared/db/UserGuild.ts
index 97f9fd892..6c9f79f43 100644
--- a/shared/db/UserGuild.ts
+++ b/shared/db/UserGuild.ts
@@ -36,6 +36,7 @@ class RefineRecord {
 }
 
 @index({ roleId: 1 })
+@index({ guildCode: 1 })
 export default class UserGuild extends BaseModel {
     @prop({ required: true })
     guildCode: string;            
diff --git a/shared/db/UserGuildActivityRec.ts b/shared/db/UserGuildActivityRec.ts
index bd95c56aa..b7e2f67bf 100644
--- a/shared/db/UserGuildActivityRec.ts
+++ b/shared/db/UserGuildActivityRec.ts
@@ -30,7 +30,7 @@ export class DamageRecord {
 }
 
 @index({ code: 1 })
-@index({ roleId: 1, sourceCode: 1 })
+@index({ sourceCode: 1, roleId: 1 })
 export default class UserGuildActivityRec extends BaseModel {
 
     @prop({ required: true })
diff --git a/shared/db/UserGuildApply.ts b/shared/db/UserGuildApply.ts
index 4e119292b..3430f6197 100644
--- a/shared/db/UserGuildApply.ts
+++ b/shared/db/UserGuildApply.ts
@@ -5,6 +5,8 @@ import Guild, { GuildType } from './Guild';
 import { GUILD_APPLY_TYPE, GUILD_PER_PAGE } from '../consts';
 import { genCode } from '../pubUtils/util';
 
+@index({ applyCode: 1 })
+@index({ guildCode: 1 })
 @index({ roleId: 1 })
 export default class UserGuildApply extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/UserLog.ts b/shared/db/UserLog.ts
index d978f43c7..44d61d2bf 100644
--- a/shared/db/UserLog.ts
+++ b/shared/db/UserLog.ts
@@ -52,7 +52,6 @@ export class BossHpLog {
 /**
   * 玩家充值订单 
 */
-@index({ localOrderID: 1 })
 @index({ createdAt: -1, type: 1 })
 @index({ roleId: 1 })
 
diff --git a/shared/db/UserShop.ts b/shared/db/UserShop.ts
index e2d6d6597..3236a8410 100644
--- a/shared/db/UserShop.ts
+++ b/shared/db/UserShop.ts
@@ -8,7 +8,7 @@ import { SHOP_REFRESH_TYPE } from '../consts';
   * 玩家购买商店记录表，每个商品一条，每次刷新新建一条
 **/
 @modelOptions({ schemaOptions: { id: false } })
-@index({ roleId: 1, itemId: 1 })
+@index({ roleId: 1, shop: 1, type: 1 })
 
 export default class UserShop extends BaseModel {
     @prop({ required: true })
diff --git a/shared/db/UserTask.ts b/shared/db/UserTask.ts
index f71dceecb..8753345fe 100644
--- a/shared/db/UserTask.ts
+++ b/shared/db/UserTask.ts
@@ -7,7 +7,7 @@ import { SHOP_REFRESH_TYPE } from '../consts';
   * 玩家购买商店记录表，每个商品一条，每次刷新新建一条
 **/
 @modelOptions({ schemaOptions: { id: false } })
-@index({ roleId: 1, itemId: 1 })
+@index({ roleId: 1 })
 
 export default class UserTask extends BaseModel {
 
diff --git a/shared/db/WishPoolReport.ts b/shared/db/WishPoolReport.ts
index 2a701adfa..11dacac71 100644
--- a/shared/db/WishPoolReport.ts
+++ b/shared/db/WishPoolReport.ts
@@ -2,7 +2,7 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds, getTimeFun } from '../pubUtils/timeUtil';
 
-@index({ guildCode: 1 })
+@index({ guildCode: 1, dntTime: -1 })
 
 export default class WishPoolReport extends BaseModel {
     @prop({ required: true })