From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index bb0cf5a..4e73906 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -1,6 +1,7 @@
package com.ld.igds.protocol.bhzn;
import com.ld.igds.data.ConfigData;
+import com.ld.igds.protocol.bhzn.grainv1.server.BhznGrainV1ServerEngine;
import com.ld.igds.protocol.bhzn.grainv2.server.BhznGrainV2ServerEngine;
import com.ld.igds.protocol.bhzn.verb.server.BhznVerbServerEngine;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,19 +21,21 @@
@Autowired
private ConfigData configData;
@Autowired
- private BhznGrainV2ServerEngine bhznGrainServerEngine;
+ private BhznGrainV2ServerEngine bhznGrainServerEngine2;
+ @Autowired
+ private BhznGrainV1ServerEngine bhznGrainServerEngine1;
@Autowired
private BhznVerbServerEngine bhznVerbServerEngine;
@Override
public void run(String... strings) throws Exception {
if (configData.getActive().indexOf("pro") >= 0) {
- bhznGrainServerEngine.start(BhznGrainV2ServerEngine.PORT);
- bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+ // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
}
if (configData.getActive().indexOf("dev") >= 0) {
- bhznGrainServerEngine.start(BhznGrainV2ServerEngine.PORT);
- bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+ //bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
}
}
}
--
Gitblit v1.9.3