From a754f255ff811c34ecf5ad31cc391642f89bfea6 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 7 Dec 2021 11:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=BA=94=E4=BB=98web-server?=
 =?UTF-8?q?=E7=9A=84tsc=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/domain/sdk.ts           | 6 +++---
 web-server/app/service/Auth.ts | 6 +++---
 web-server/app/service/Sdk.ts  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/shared/domain/sdk.ts b/shared/domain/sdk.ts
index bb0b0290d..b47bd70b3 100644
--- a/shared/domain/sdk.ts
+++ b/shared/domain/sdk.ts
@@ -228,7 +228,7 @@ export class RoleNameCallBackParam {
     time: number;        // 时间戳
     sign: string;
 
-    constructor(param: RoleNameCallBackParam) {
+    constructor(param: any) {
         this.username = param.username;
         this.game_key = param.game_key;
         this.sid = param.sid;
@@ -256,7 +256,7 @@ export class GuildNameCallBackParam {
     time: number;        // 时间戳
     sign: string;
 
-    constructor(param: GuildNameCallBackParam) {
+    constructor(param: any) {
         this.game_key = param.game_key;
         this.sid = param.sid;
         this.type = param.type;
@@ -282,7 +282,7 @@ export class GetGuildInfoByUserParam {
     sid: number;         // 区服id
     sign: string;
 
-    constructor(param: GetGuildInfoByUserParam) {
+    constructor(param: any) {
         this.game_key = param.game_key;
         this.uid = param.uid;
         this.time = param.time;
diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts
index f596bb33a..399e70ddf 100644
--- a/web-server/app/service/Auth.ts
+++ b/web-server/app/service/Auth.ts
@@ -11,7 +11,7 @@ import { isString } from 'underscore';
 import { getAge } from '../pubUtils/timeUtil';
 import { resResult } from '../pubUtils/util';
 import { checkTeeanAgerTime } from '../pubUtils/authenticateUtil';
-import { authenticate } from '../pubUtils/httpUtil';
+// import { authenticate } from '../pubUtils/httpUtil';
 import { checkTask } from 'app/pubUtils/taskUtil';
 import { getChannelId, loginValidata } from '../pubUtils/sdkUtil';
 import { LoginValidateData37 } from 'app/domain/sdk';
@@ -368,8 +368,8 @@ export default class Auth extends Service {
         const ctx = this.ctx;
         // TODO 接SDK
         console.log(name, idNum);
-        let result = await authenticate(name, idNum, ctx.userCode, ctx.pkgName);
-        if (!result) return ctx.service.utils.resResult(STATUS.AUTHEN_FAIL);
+        // let result = await authenticate(name, idNum, ctx.userCode, ctx.pkgName);
+        // if (!result) return ctx.service.utils.resResult(STATUS.AUTHEN_FAIL);
 
         let birthday = this.getBirthdayByIdCard(idNum);
         let user = await UserModel.authentication(ctx.uid, birthday, '');
diff --git a/web-server/app/service/Sdk.ts b/web-server/app/service/Sdk.ts
index ea96f96cc..a831db5ab 100644
--- a/web-server/app/service/Sdk.ts
+++ b/web-server/app/service/Sdk.ts
@@ -29,7 +29,7 @@ export default class Sdk extends Service {
     public async pay37Callback(params: PayCallback37Data) {
         const { ctx } = this;
         const { app } = ctx;
-        let ip = ctx.header['x-real-ip'];
+        let ip = typeof ctx.header['x-real-ip'] == 'string'? ctx.header['x-real-ip']: ctx.header['x-real-ip'][0];
         console.log('*****pay37Callback', ip)
 
         let checkResult = this.check37Sign(params);