zhanwencai před 1 rokem
rodič
revize
cc32175358

+ 21 - 12
webServer/src/controller/ApiController.ts

@@ -134,7 +134,8 @@ const googleCallPay = async (ctx) => {
         return ret;
     }
 
-    Msg.connect(url, Account);
+    let sendMsg = new Msg()
+    sendMsg.connect(url, Account);
     let orgMemId = orderInfo.uid
     let orgOderId = orderId
     let orgProductId = orderInfo.product_id
@@ -145,7 +146,7 @@ const googleCallPay = async (ctx) => {
     return new Promise((resolve) => {
         setTimeout(async () => {
 
-            const send_res = Msg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
+            const send_res = sendMsg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
             if (!send_res) {
                 resolve(ret);
                 return;
@@ -280,7 +281,8 @@ const appleCallPay = async (ctx) => {
         return ret
     }
 
-    Msg.connect(url, Account);
+    let sendMsg = new Msg()
+    sendMsg.connect(url, Account);
     let orgMemId = orderInfo.uid
     let orgOderId = orderId
     let orgProductId = orderInfo.product_id
@@ -293,7 +295,7 @@ const appleCallPay = async (ctx) => {
 
             logger.info(`订单${orderId}通知游戏发货开始`)
 
-            const send_res = Msg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
+            const send_res = sendMsg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
             if (!send_res) {
                 resolve(ret);
                 return;
@@ -373,7 +375,8 @@ const CallPay360 = async (ctx) => {
     }
     //发货
     // 使用 Msg 类的 connect 方法连接到 WebSocket 服务器
-    Msg.connect(url, Account);
+    let sendMsg = new Msg()
+    sendMsg.connect(url, Account);
     logger.info(`订单${orderId} ${url}`)
 
     let orgMemId = data.uid
@@ -386,7 +389,7 @@ const CallPay360 = async (ctx) => {
     return new Promise((resolve) => {
         setTimeout(async () => {
             console.log("这个消息将在3秒后打印出来");
-            const send_res = Msg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
+            const send_res = sendMsg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
             if (!send_res) {
                 resolve(ret);
                 return;
@@ -875,11 +878,13 @@ class ApiController {
         // 测试是否可以调用过去
         // 通知给服务器,发放道具
         // "ws://43.143.193.23:18192"
-        Msg.connect(url, Account);
+        // Msg.connect(url, Account);
+        let sendMsg = new Msg()
+        sendMsg.connect(url, Account);
         logger.info(`code ${data.code} id ${data.serverId} ${url}`)
         new Promise((resolve) => {
             setTimeout(async () => {
-                Msg.CG_TEST_PROTO(data.account, param)
+                sendMsg.CG_TEST_PROTO(data.account, param)
             }, 500);
         });
         ctx.body = {
@@ -920,10 +925,12 @@ class ApiController {
         let param = JSON.stringify({
             type: "kickAllUser"
         })
-        Msg.connect(url, Account);
+        // Msg.connect(url, Account);
+        let sendMsg = new Msg()
+        sendMsg.connect(url, Account);
         new Promise((resolve) => {
             setTimeout(async () => {
-                Msg.CG_TEST_PROTO("test", param)
+                sendMsg.CG_TEST_PROTO("test", param)
             }, 500);
         });
         ctx.body = {
@@ -952,10 +959,12 @@ class ApiController {
                 expire:data.expire
             })
         })
-        Msg.connect(url, Account);
+        // Msg.connect(url, Account);
+        let sendMsg = new Msg()
+        sendMsg.connect(url, Account);
         new Promise((resolve) => {
             setTimeout(async () => {
-                Msg.CG_TEST_PROTO("test", param)
+                sendMsg.CG_TEST_PROTO("test", param)
             }, 500);
         });
         ctx.body = {

+ 3 - 3
webServer/src/utils/msg.ts

@@ -14,7 +14,7 @@ export default class Msg {
 	static handler;
 	static account;
 
-	static connect(url, inputAccount) {
+	connect(url, inputAccount) {
 		console.log("开始连接 url ============== ", url);
 		if (Msg.isConnect) {
 			console.log("msg connect 连接已存在");
@@ -192,7 +192,7 @@ export default class Msg {
 	    Msg.isConnectingM = false;
 	}
   
-    static 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)
 	{
 		console.log("发送登录消息",Msg.websocket.readyState,Msg.isConnect);
 		if (Msg.isConnect != true || Msg.websocket.readyState != 1) return false;
@@ -212,7 +212,7 @@ export default class Msg {
         return true;
 	}
 
-	static CG_TEST_PROTO(account:string,param:string) {
+	 CG_TEST_PROTO(account:string,param:string) {
 		console.log("发送CDK道具消息",Msg.websocket.readyState,Msg.isConnect);
 		if (Msg.isConnect != true || Msg.websocket.readyState != 1) return false;
 		Msg.sendBufLen = 4;