Skip to content

Commit 83b4d70

Browse files
author
Evan Hu
committed
upgrade to 3.1.4
1 parent 8c44681 commit 83b4d70

File tree

9 files changed

+65
-103
lines changed

9 files changed

+65
-103
lines changed

‎game-cluster/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,12 +20,12 @@
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
2222
<artifactId>g-engine</artifactId>
23-
<version>3.1.3</version>
23+
<version>3.1.4</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>info.xiaomo</groupId>
2727
<artifactId>game-protocol</artifactId>
28-
<version>3.1.3</version>
28+
<version>3.1.4</version>
2929
<scope>compile</scope>
3030
</dependency>
3131
</dependencies>

‎game-gate/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,12 +20,12 @@
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
2222
<artifactId>g-engine</artifactId>
23-
<version>3.1.3</version>
23+
<version>3.1.4</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>info.xiaomo</groupId>
2727
<artifactId>game-protocol</artifactId>
28-
<version>3.1.3</version>
28+
<version>3.1.4</version>
2929
<scope>compile</scope>
3030
</dependency>
3131
</dependencies>

‎game-hall/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,12 +20,12 @@
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
2222
<artifactId>game-protocol</artifactId>
23-
<version>3.1.3</version>
23+
<version>3.1.4</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>info.xiaomo</groupId>
2727
<artifactId>g-engine</artifactId>
28-
<version>3.1.3</version>
28+
<version>3.1.4</version>
2929
</dependency>
3030
</dependencies>
3131

‎game-log/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎game-protocol/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
2222
<artifactId>g-engine</artifactId>
23-
<version>3.1.3</version>
23+
<version>3.1.4</version>
2424
</dependency>
2525
</dependencies>
2626

‎game-server/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>3.1.3</version>
8+
<version>3.1.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -16,24 +16,24 @@
1616
<dependency>
1717
<groupId>info.xiaomo</groupId>
1818
<artifactId>g-engine</artifactId>
19-
<version>3.1.3</version>
19+
<version>3.1.4</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>org.projectlombok</groupId>
2323
<artifactId>lombok</artifactId>
2424
<scope>compile</scope>
2525
</dependency>
2626
<dependency>
27-
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-web</artifactId>
27+
<groupId>com.google.guava</groupId>
28+
<artifactId>guava</artifactId>
2929
</dependency>
3030
<dependency>
31-
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-starter-security</artifactId>
31+
<groupId>org.slf4j</groupId>
32+
<artifactId>slf4j-api</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.google.guava</groupId>
36-
<artifactId>guava</artifactId>
35+
<groupId>org.slf4j</groupId>
36+
<artifactId>slf4j-simple</artifactId>
3737
</dependency>
3838
</dependencies>
3939

‎game-server/src/main/java/info/xiaomo/server/StopServerClient.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎game-server/src/main/java/info/xiaomo/server/event/EventUtil.java‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,52 @@
11
package info.xiaomo.server.event;
22

3-
import org.slf4j.Logger;
4-
import org.slf4j.LoggerFactory;
5-
63
import java.util.ArrayList;
74
import java.util.HashMap;
85
import java.util.List;
96
import java.util.Map;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
109

1110
/**
1211
* 由于事件都是预先注册好的，所以这里不考虑多线程问题，不允许在游戏运行过成中动态添加观察者
1312
*
1413
* @author 张力
15-
* @date 2014-12-6 上午11:19:00
14+
* 2014-12-6 上午11:19:00
1615
*/
1716
public class EventUtil {
1817

19-
/**
20-
* 游戏启动就初始化的监听者列表
21-
*/
22-
private final static Map<EventType, List<IEventListener>> PREPARED_LISTENERS = new HashMap<>(10);
23-
24-
/**
25-
* 游戏运行中动态添加的监听者列表
26-
*/
27-
private final static Logger LOGGER = LoggerFactory.getLogger(EventUtil.class);
28-
29-
static void addListener(IEventListener listener, EventType type) {
30-
List<IEventListener> listenerList = PREPARED_LISTENERS.computeIfAbsent(type, k -> new ArrayList<>());
31-
listenerList.add(listener);
32-
}
33-
34-
public static void fireEvent(EventType type) {
35-
fireEvent(type, null);
36-
}
37-
38-
public static void fireEvent(EventType type, Object obj) {
39-
40-
List<IEventListener> listenerList = PREPARED_LISTENERS.get(type);
41-
if (listenerList != null) {
42-
for (IEventListener listener : listenerList) {
43-
try {
44-
listener.update(type, obj);
45-
} catch (Exception e) {
46-
LOGGER.error("事件执行错误", e);
47-
}
48-
}
49-
}
50-
}
18+
/**
19+
* 游戏启动就初始化的监听者列表
20+
*/
21+
private final static Map<EventType, List<IEventListener>> PREPARED_LISTENERS = new HashMap<>(10);
22+
23+
/**
24+
* 游戏运行中动态添加的监听者列表
25+
*/
26+
private final static Logger LOGGER = LoggerFactory.getLogger(EventUtil.class);
27+
28+
static void addListener(IEventListener listener, EventType type) {
29+
List<IEventListener> listenerList = PREPARED_LISTENERS.computeIfAbsent(type, k -> new ArrayList<>());
30+
listenerList.add(listener);
31+
}
32+
33+
public static void fireEvent(EventType type) {
34+
fireEvent(type, null);
35+
}
36+
37+
public static void fireEvent(EventType type, Object obj) {
38+
39+
List<IEventListener> listenerList = PREPARED_LISTENERS.get(type);
40+
if (listenerList != null) {
41+
for (IEventListener listener : listenerList) {
42+
try {
43+
listener.update(type, obj);
44+
} catch (Exception e) {
45+
LOGGER.error("事件执行错误", e);
46+
}
47+
}
48+
}
49+
}
5150

5251

5352
}

‎pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>info.xiaomo</groupId>
88
<artifactId>g-engine-server</artifactId>
99
<packaging>pom</packaging>
10-
<version>3.1.3</version>
10+
<version>3.1.4</version>
1111
<modules>
1212
<module>game-server</module>
1313
<module>game-log</module>
@@ -23,14 +23,14 @@
2323
<maven.compiler.source>1.8</maven.compiler.source>
2424
<maven.compiler.target>1.8</maven.compiler.target>
2525
<!--核心包start-->
26-
<GEngine.version>3.1.3</GEngine.version>
26+
<GEngine.version>3.1.4</GEngine.version>
2727
<!--核心包end-->
2828
<netty.version>[4.1.42,)</netty.version>
2929
<apache-commons-codec.version>1.10</apache-commons-codec.version>
3030
<kryo.version>3.0.3</kryo.version>
3131
<fastjson.version>1.2.29</fastjson.version>
3232
<httpclient.version>4.5.2</httpclient.version>
33-
<slf4j.version>1.7.25</slf4j.version>
33+
<slf4j.version>1.7.30</slf4j.version>
3434
<dom4j.version>1.6.1</dom4j.version>
3535
<logback.version>1.1.3</logback.version>
3636
<commons-lang3.version>3.10</commons-lang3.version>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>info.xiaomo</groupId>
5252
<artifactId>g-engine</artifactId>
53-
<version>3.1.3</version>
53+
<version>3.1.4</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.google.guava</groupId>
@@ -73,7 +73,12 @@
7373
<dependency>
7474
<groupId>org.slf4j</groupId>
7575
<artifactId>slf4j-api</artifactId>
76-
<version>${slf4j.version}</version>
76+
<version>1.7.30</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.slf4j</groupId>
80+
<artifactId>slf4j-simple</artifactId>
81+
<version>1.7.30</version>
7782
</dependency>
7883
<!--httpclient-->
7984
<dependency>

0 commit comments

Comments
 (0)