后台：记录最新更新人

gm-server/app/service/Activity.ts

@@ -81,7 +81,7 @@ export default class Activity extends Service {
     
     public async deleteActivity(activityId: number) {
         const { ctx } = this;
-        const result = await ActivityModel.deleteActivity(activityId);
+        const result = await ActivityModel.deleteActivity(activityId, ctx.user?.uid);
         if (result) {
             return ctx.service.utils.resResult(STATUS.SUCCESS);
         } else {
@@ -125,7 +125,7 @@ export default class Activity extends Service {
     public async saveActivitiesToGroup(groupId: number, activityIds: number[]) {
         const { ctx } = this;
         try {
-            await ActivityGroupModel.setActivitiesToGroupData(groupId, activityIds);
+            await ActivityGroupModel.setActivitiesToGroupData(groupId, activityIds, ctx.user?.uid);
     
         } catch(e) {
             return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, null, e.stack);

shared/db/Activity.ts

@@ -84,15 +84,15 @@ export default class Activity extends BaseModel {
                 let newGroup = await ActivityGroupModel.createGroup();
                 groupId = newGroup.groupId;
             }
-            await ActivityGroupModel.addActivitiesToGroupData(groupId, aids);
+            await ActivityGroupModel.addActivitiesToGroupData(groupId, aids, uid);
         }
         return result;
     }
 
     //删除活动
-    public static async deleteActivity(activityId: number) {
+    public static async deleteActivity(activityId: number, uid = 1) {
         let result = await ActivityModel.deleteMany({ activityId });
-        await ActivityGroupModel.pullByActivityIds([activityId]);
+        await ActivityGroupModel.pullByActivityIds([activityId], uid);
         return result;
     }
 
@@ -140,7 +140,6 @@ export default class Activity extends BaseModel {
 
     public static async updateGroupId(activityIds: number[], groupId: number, uid = 1) {
         let result = await ActivityModel.updateMany({ activityId: { $in: activityIds } }, { $set: { groupId, updatedBy: uid }, $setOnInsert: { createdBy: uid } });
-        console.log(result)
         return result;
     }
 }

shared/db/ActivityGroup.ts

@@ -48,21 +48,21 @@ export default class Activity_Group extends BaseModel {
     }
 
     //更新询组
-    public static async setActivitiesToGroupData(groupId: number, activities: number[]) {
+    public static async setActivitiesToGroupData(groupId: number, activities: number[], uid = 1) {
-        await this.pullByActivityIds(activities); // 先将原先的删除
+        await this.pullByActivityIds(activities, uid); // 先将原先的删除
         let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
             { $set: { activities } }, { new: true }).lean(true);
-        await ActivityModel.updateGroupId(activities, groupId);
+        await ActivityModel.updateGroupId(activities, groupId, uid);
         result = await this.updateTime(result.groupId, result.activities);
         return result;
     }
 
     //更新询组
-    public static async addActivitiesToGroupData(groupId: number, activities: number[]) {
+    public static async addActivitiesToGroupData(groupId: number, activities: number[], uid = 1) {
-        await this.pullByActivityIds(activities); // 先将原先的删除
+        await this.pullByActivityIds(activities, uid); // 先将原先的删除
         let result: ActivityGroupModelType = await ActivityGroupModel.findOneAndUpdate({ groupId },
             { $addToSet: { activities: { $each: activities } } }, { new: true }).lean(true);
-        await ActivityModel.updateGroupId(activities, groupId);
+        await ActivityModel.updateGroupId(activities, groupId, uid);
         result = await this.updateTime(result.groupId, result.activities);
         return result;
     }
@@ -82,8 +82,8 @@ export default class Activity_Group extends BaseModel {
 
 
     // 删除活动id
-    public static async pullByActivityIds(activities: number[]) {
+    public static async pullByActivityIds(activities: number[], uid = 1) {
-        await ActivityModel.updateGroupId(activities, 0);
+        await ActivityModel.updateGroupId(activities, 0, uid);
         let activityGroups = await ActivityGroupModel.find({ activities: { $in: activities } });
         for(let { groupId } of activityGroups) {
             let result = await ActivityGroupModel.findOneAndUpdate({ groupId }, { $pull: { activities: { $in: activities } } }, { new: true }).lean(true);

shared/db/ActivityPopUpShop.ts

@@ -1,6 +1,6 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
-import moment = require('moment');
+// import moment = require('moment');
 
 
 /**

shared/db/ActivitySelfService.ts

@@ -37,7 +37,7 @@ export default class Activity_Self_Service extends BaseModel {
     }
 
     //添加挑战记录
-    public static async addChallengeRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, count: number, time: Date) {
+    public static async addChallengeRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, count: number, _time: Date) {
         let result: ActivitySelfServiceModelType = await ActivitySelfServiceModel.findOneAndUpdate(
             { serverId, roleId, activityId, roundIndex, },
             { $push: { challengeRecords: { count, time: new Date() } } }, { upsert: true, new: true }).lean(true);

shared/db/Serverlist.ts

@@ -14,7 +14,14 @@ export default class Serverlist extends BaseModel {
   gameId: number;            // 游戏id Game表的id
 
   @prop({ required: true })
-  id: number;                // 小区id
+  id: number;                // 小区id 自增
+
+  @prop({ required: true })
+  serverId: string;              // 显示id，不同serverType下id一定不同，但是serverId可能相同
+
+  public get serverStr() {
+    return `S${this.serverId}`;
+  }
 
   @prop({ required: true })
   name: string;              // 小区区名

web-server/config/plugin.ts

@@ -16,7 +16,7 @@ const plugin: EggPlugin = {
     package: 'egg-alinode',
   },
   xtransit: {
-    enable: true,
+    enable: false,
     package: 'egg-xtransit',
   }
 };

web-server/typings/config/plugin.d.ts

@@ -17,7 +17,6 @@ import 'egg-view';
 import 'egg-view-nunjucks';
 import 'egg-cors';
 import 'egg-alinode';
-import 'egg-xtransit';
 import { EggPluginItem } from 'egg';
 declare module 'egg' {
   interface EggPlugin {