zhanwencai 1 жил өмнө
parent
commit
0b61a9cbab

+ 8 - 4
webServer/src/controller/ApiController.ts

@@ -171,7 +171,8 @@ const googleCallPay = async (ctx) => {
         "cn",
         "CN",
         ctx.request.ip,
-        params
+        params,
+        orderInfo.server_id
       );
       if (!send_res) {
         resolve(ret);
@@ -364,7 +365,8 @@ const appleCallPay = async (ctx) => {
         "cn",
         "CN",
         ctx.request.ip,
-        params
+        params,
+        orderInfo.server_id
       );
       if (!send_res) {
         resolve(ret);
@@ -481,7 +483,8 @@ const CallPayQuick = async (ctx) => {
         "cn",
         "CN",
         ctx.request.ip,
-        params
+        params,
+        serverId
       );
       if (!send_res) {
         resolve(ret);
@@ -583,7 +586,8 @@ const CallPay360 = async (ctx) => {
         "cn",
         "CN",
         ctx.request.ip,
-        params
+        params,
+        serverId
       );
       if (!send_res) {
         resolve(ret);

+ 2 - 1
webServer/src/utils/msg.ts

@@ -197,7 +197,7 @@ export default class Msg {
         this.isConnectingM = false;
     }
 
-    CG_ASK_LOGIN(account: string, timestamp: number, authkey: string, lang: string, region: string, ip: string, params: string) {
+    CG_ASK_LOGIN(account: string, timestamp: number, authkey: string, lang: string, region: string, ip: string, params: string, server_id: number) {
         console.log("发送登录消息", this.websocket.readyState, this.isConnect);
         if (this.isConnect != true || this.websocket.readyState != 1) return false;
         this.sendBufLen = 4;
@@ -208,6 +208,7 @@ export default class Msg {
         this.writeString(region);
         this.writeString(ip);
         this.writeString(params);
+        this.writeInt(server_id);
         this.sendBufDV.setInt16(2, 62);
         this.sendBufDV.setInt16(0, this.sendBufLen - 4);
         this.send(62);