修改webserver发货逻辑

webServer/src/controller/ApiController.ts

@@ -61,7 +61,7 @@ const callPay = async (ctx) => {
         return ret
     }
 
-    let url = await getServerList(serverId,'default')
+    let url = await getServerList(serverId, 'default')
     if (!url) {
         logger.info(`区服id错误: serverId ${serverId}`)
         ret.msg = `区服id错误: serverId ${serverId}`
@@ -81,7 +81,11 @@ const callPay = async (ctx) => {
     return new Promise((resolve) => {
         setTimeout(async () => {
             console.log("这个消息将在3秒后打印出来");
-            Msg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
+            const send_res = Msg.CG_ASK_LOGIN(Account, 0, "", 'cn', 'CN', ctx.request.ip, params);
+            if (!send_res) {
+                resolve(ret);
+                return;
+            }
 
             const update_time = formatDate(new Date())
             const res = await Order.updateOrderStats(
@@ -95,12 +99,14 @@ const callPay = async (ctx) => {
                 logger.info(`订单${orderId} 发货失败`)
                 ret.msg = '发货失败'
                 resolve(ret);
+                return;
             }
+
             ret.code = 1
             ret.msg = '发货成功'
             resolve(ret);
 
-        }, 1000);
+        }, 2000);
     });
 
 }
@@ -109,17 +115,17 @@ const callPay = async (ctx) => {
 const compareVersions = (v1: string, v2: string) => {
     const parts1 = v1.split('.').map(Number);
     const parts2 = v2.split('.').map(Number);
-    
+
     for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
-      const num1 = parts1[i] || 0;
-      const num2 = parts2[i] || 0;
-      
-      if (num1 > num2) return 1;
-      if (num1 < num2) return -1;
+        const num1 = parts1[i] || 0;
+        const num2 = parts2[i] || 0;
+
+        if (num1 > num2) return 1;
+        if (num1 < num2) return -1;
     }
-    
+
     return 0;
-  }
+}
 
 const checkVersion = async (ctx) => {
     let ret = {
@@ -138,9 +144,9 @@ const checkVersion = async (ctx) => {
         return ret
     }
 
-    if (compareVersions(versionInfo.version,version) === 1) {
+    if (compareVersions(versionInfo.version, version) === 1) {
 
-        if(versionInfo.download_url){
+        if (versionInfo.download_url) {
             ret.code = 1
             ret.msg = '需要更新'
             ret.url = versionInfo.download_url

webServer/src/msg.ts

@@ -195,7 +195,7 @@ export default class Msg {
     static 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;
+		if (Msg.isConnect != true || Msg.websocket.readyState != 1) return false;
 		Msg.sendBufLen = 4;
 		Msg.writeString(account);
 		Msg.writeInt(timestamp);
@@ -209,5 +209,6 @@ export default class Msg {
 		Msg.send(62);
 		console.log("发送完了断开连接");
         Msg.close();  // 主动断开连接
+        return true
 	}
 }