Merge branch 'master' into feature/backend

# Conflicts: # game-server/app/servers/connector/filter/global.ts
2021-12-03 18:36:39 +08:00
parent 11bba498ce 5bd6eb573c
commit b505381fa9
25 changed files with 3682 additions and 1674 deletions
@@ -26,7 +26,7 @@ import { getActivities } from '../../../services/activity/activityService';
 import * as dicParam from '../../../pubUtils/dicParam';
 import Counter from '../../../db/Counter';
 import { UserModel } from '../../../db/User';
-import { checkFilterWords, reportTAEvent } from '../../../services/sdkService';
+import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService';

 export default function (app: Application) {
    new HandlerService(app, {});
@@ -614,4 +614,16 @@ export class RoleHandler {
        return resResult(STATUS.SUCCESS);

    }
+
+    async debugTreatRoleName(msg: { magicWord: string }, session: BackendSession) {
+        let roleId: string = session.get('roleId');
+
+        let { magicWord } = msg;
+        if (magicWord !== DEBUG_MAGIC_WORD) {
+            return resResult(STATUS.TOKEN_ERR);
+        }
+
+        await treatRoleName(roleId, true);
+        return resResult(STATUS.SUCCESS);
+    }
 }