Skip to content

Commit 37ef433

Browse files
crossoverJiecrossoverJie
authored
Merge pull request #27 from crossoverJie/cim-1.0.3
cim 1.0.3
2 parents 845cc2d + 7015fed commit 37ef433

File tree

17 files changed

+527
-59
lines changed

17 files changed

+527
-59
lines changed

‎cim-client/src/main/java/com/crossoverjie/cim/client/client/CIMClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ public void reconnect() throws Exception {
209209
* @throws InterruptedException
210210
*/
211211
public void close() throws InterruptedException {
212-
channel.close();
212+
if (channel != null){
213+
channel.close();
214+
}
213215
}
214216
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/InnerCommand.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.crossoverjie.cim.client.service;
2+
3+
/**
4+
* Function:
5+
*
6+
* @author crossoverJie
7+
* Date: 2019-01-27 19:26
8+
* @since JDK 1.8
9+
*/
10+
public interface InnerCommand {
11+
12+
/**
13+
* 执行
14+
* @param msg
15+
*/
16+
void process(String msg) ;
17+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/InnerCommandContext.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.crossoverjie.cim.client.service;
2+
3+
import com.crossoverjie.cim.client.service.impl.command.PrintAllCommand;
4+
import com.crossoverjie.cim.client.util.SpringBeanFactory;
5+
import com.crossoverjie.cim.common.enums.SystemCommandEnum;
6+
import com.crossoverjie.cim.common.util.StringUtil;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
import org.springframework.stereotype.Component;
10+
11+
import java.util.Map;
12+
13+
/**
14+
* Function:
15+
*
16+
* @author crossoverJie
17+
* Date: 2019-01-27 19:39
18+
* @since JDK 1.8
19+
*/
20+
@Component
21+
public class InnerCommandContext {
22+
private final static Logger LOGGER = LoggerFactory.getLogger(InnerCommandContext.class);
23+
24+
/**
25+
* 获取执行器实例
26+
* @param command 执行器实例
27+
* @return
28+
*/
29+
public InnerCommand getInstance(String command) {
30+
31+
Map<String, String> allClazz = SystemCommandEnum.getAllClazz();
32+
33+
//兼容需要命令后接参数的数据 :q cross
34+
String[] trim = command.trim().split(" ");
35+
String clazz = allClazz.get(trim[0]);
36+
InnerCommand innerCommand = null;
37+
try {
38+
if (StringUtil.isEmpty(clazz)){
39+
clazz = PrintAllCommand.class.getName() ;
40+
}
41+
innerCommand = (InnerCommand) SpringBeanFactory.getBean(Class.forName(clazz));
42+
} catch (Exception e) {
43+
LOGGER.error("Exception", e);
44+
}
45+
46+
return innerCommand;
47+
}
48+
49+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/MsgHandle.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,14 @@ public interface MsgHandle {
5454
* 关闭系统
5555
*/
5656
void shutdown() ;
57+
58+
/**
59+
* 开启 AI 模式
60+
*/
61+
void openAIModel() ;
62+
63+
/**
64+
* 关闭 AI 模式
65+
*/
66+
void closeAIModel() ;
5767
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/MsgHandler.java‎

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.crossoverjie.cim.client.service.impl;
22

3-
import com.alibaba.fastjson.JSON;
43
import com.crossoverjie.cim.client.client.CIMClient;
54
import com.crossoverjie.cim.client.config.AppConfiguration;
6-
import com.crossoverjie.cim.client.service.MsgHandle;
7-
import com.crossoverjie.cim.client.service.MsgLogger;
8-
import com.crossoverjie.cim.client.service.RouteRequest;
5+
import com.crossoverjie.cim.client.service.*;
96
import com.crossoverjie.cim.client.vo.req.GroupReqVO;
107
import com.crossoverjie.cim.client.vo.req.P2PReqVO;
118
import com.crossoverjie.cim.client.vo.res.OnlineUsersResVO;
129
import com.crossoverjie.cim.common.data.construct.TrieTree;
13-
import com.crossoverjie.cim.common.enums.SystemCommandEnumType;
10+
import com.crossoverjie.cim.common.enums.SystemCommandEnum;
1411
import com.crossoverjie.cim.common.util.StringUtil;
1512
import org.slf4j.Logger;
1613
import org.slf4j.LoggerFactory;
@@ -49,7 +46,10 @@ public class MsgHandler implements MsgHandle {
4946
private MsgLogger msgLogger;
5047

5148
@Autowired
52-
private ClientInfo clientInfo ;
49+
private ClientInfo clientInfo;
50+
51+
@Autowired
52+
private InnerCommandContext innerCommandContext ;
5353

5454
private boolean aiModel = false;
5555

@@ -130,42 +130,10 @@ public boolean checkMsg(String msg) {
130130
@Override
131131
public boolean innerCommand(String msg) {
132132

133-
// TODO: 2019-01-22 判断逻辑过多，需要重构。
134133
if (msg.startsWith(":")) {
135-
Map<String, String> allStatusCode = SystemCommandEnumType.getAllStatusCode();
136-
137-
if (SystemCommandEnumType.QUIT.getCommandType().trim().equals(msg)) {
138-
//关闭系统
139-
shutdown();
140-
} else if (SystemCommandEnumType.ALL.getCommandType().trim().equals(msg)) {
141-
printAllCommand(allStatusCode);
142-
143-
} else if (SystemCommandEnumType.ONLINE_USER.getCommandType().toLowerCase().trim().equals(msg.toLowerCase())) {
144-
//打印在线用户
145-
printOnlineUsers();
146-
147-
} else if (msg.startsWith(SystemCommandEnumType.QUERY.getCommandType().trim() + " ")) {
148-
//查询聊天记录
149-
queryChatHistory(msg);
150-
} else if (SystemCommandEnumType.AI.getCommandType().trim().equals(msg.toLowerCase())) {
151-
//开启 AI 模式
152-
aiModel = true;
153-
System.out.println("\033[31;4m" + "Hello,我是估值两亿的 AI 机器人！" + "\033[0m");
154-
} else if (SystemCommandEnumType.QAI.getCommandType().trim().equals(msg.toLowerCase())) {
155-
//关闭 AI 模式
156-
aiModel = false;
157-
System.out.println("\033[31;4m" + "｡ﾟ(ﾟ´ω`ﾟ)ﾟ｡ AI 下线了！" + "\033[0m");
158-
} else if (msg.startsWith(SystemCommandEnumType.PREFIX.getCommandType().trim() + " ")) {
159-
//模糊匹配
160-
prefixSearch(msg);
161-
} else if (SystemCommandEnumType.INFO.getCommandType().trim().equals(msg.toLowerCase())) {
162-
LOGGER.info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
163-
LOGGER.info("client info=[{}]", JSON.toJSONString(clientInfo.get()));
164-
LOGGER.info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
165-
166-
} else {
167-
printAllCommand(allStatusCode);
168-
}
134+
135+
InnerCommand instance = innerCommandContext.getInstance(msg);
136+
instance.process(msg) ;
169137

170138
return true;
171139

@@ -253,6 +221,16 @@ public void shutdown() {
253221
System.exit(0);
254222
}
255223

224+
@Override
225+
public void openAIModel() {
226+
aiModel = true;
227+
}
228+
229+
@Override
230+
public void closeAIModel() {
231+
aiModel = false ;
232+
}
233+
256234
private void printAllCommand(Map<String, String> allStatusCode) {
257235
LOGGER.warn("====================================");
258236
for (Map.Entry<String, String> stringStringEntry : allStatusCode.entrySet()) {

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/command/CloseAIModelCommand.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.crossoverjie.cim.client.service.impl.command;
2+
3+
import com.crossoverjie.cim.client.service.InnerCommand;
4+
import com.crossoverjie.cim.client.service.MsgHandle;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.stereotype.Service;
9+
10+
/**
11+
* Function:
12+
*
13+
* @author crossoverJie
14+
* Date: 2019-01-27 19:37
15+
* @since JDK 1.8
16+
*/
17+
@Service
18+
public class CloseAIModelCommand implements InnerCommand {
19+
private final static Logger LOGGER = LoggerFactory.getLogger(CloseAIModelCommand.class);
20+
21+
22+
@Autowired
23+
private MsgHandle msgHandle ;
24+
25+
@Override
26+
public void process(String msg) {
27+
msgHandle.closeAIModel();
28+
System.out.println("\033[31;4m" + "｡ﾟ(ﾟ´ω`ﾟ)ﾟ｡ AI 下线了！" + "\033[0m");
29+
}
30+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/command/EchoInfoCommand.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.crossoverjie.cim.client.service.impl.command;
2+
3+
import com.alibaba.fastjson.JSON;
4+
import com.crossoverjie.cim.client.service.InnerCommand;
5+
import com.crossoverjie.cim.client.service.impl.ClientInfo;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.stereotype.Service;
10+
11+
/**
12+
* Function:
13+
*
14+
* @author crossoverJie
15+
* Date: 2019-01-27 19:37
16+
* @since JDK 1.8
17+
*/
18+
@Service
19+
public class EchoInfoCommand implements InnerCommand {
20+
private final static Logger LOGGER = LoggerFactory.getLogger(EchoInfoCommand.class);
21+
22+
23+
@Autowired
24+
private ClientInfo clientInfo;
25+
26+
@Override
27+
public void process(String msg) {
28+
LOGGER.info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
29+
LOGGER.info("client info=[{}]", JSON.toJSONString(clientInfo.get()));
30+
LOGGER.info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
31+
}
32+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/command/OpenAIModelCommand.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.crossoverjie.cim.client.service.impl.command;
2+
3+
import com.crossoverjie.cim.client.service.InnerCommand;
4+
import com.crossoverjie.cim.client.service.MsgHandle;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.stereotype.Service;
9+
10+
/**
11+
* Function:
12+
*
13+
* @author crossoverJie
14+
* Date: 2019-01-27 19:37
15+
* @since JDK 1.8
16+
*/
17+
@Service
18+
public class OpenAIModelCommand implements InnerCommand {
19+
private final static Logger LOGGER = LoggerFactory.getLogger(OpenAIModelCommand.class);
20+
21+
22+
@Autowired
23+
private MsgHandle msgHandle ;
24+
25+
@Override
26+
public void process(String msg) {
27+
msgHandle.openAIModel();
28+
System.out.println("\033[31;4m" + "Hello,我是估值两亿的 AI 机器人！" + "\033[0m");
29+
}
30+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/command/PrefixSearchCommand.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.crossoverjie.cim.client.service.impl.command;
2+
3+
import com.crossoverjie.cim.client.service.InnerCommand;
4+
import com.crossoverjie.cim.client.service.RouteRequest;
5+
import com.crossoverjie.cim.client.vo.res.OnlineUsersResVO;
6+
import com.crossoverjie.cim.common.data.construct.TrieTree;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.stereotype.Service;
11+
12+
import java.util.List;
13+
14+
/**
15+
* Function:
16+
*
17+
* @author crossoverJie
18+
* Date: 2019-01-27 19:37
19+
* @since JDK 1.8
20+
*/
21+
@Service
22+
public class PrefixSearchCommand implements InnerCommand {
23+
private final static Logger LOGGER = LoggerFactory.getLogger(PrefixSearchCommand.class);
24+
25+
26+
@Autowired
27+
private RouteRequest routeRequest ;
28+
29+
@Override
30+
public void process(String msg) {
31+
try {
32+
List<OnlineUsersResVO.DataBodyBean> onlineUsers = routeRequest.onlineUsers();
33+
TrieTree trieTree = new TrieTree();
34+
for (OnlineUsersResVO.DataBodyBean onlineUser : onlineUsers) {
35+
trieTree.insert(onlineUser.getUserName());
36+
}
37+
38+
String[] split = msg.split(" ");
39+
String key = split[1];
40+
List<String> list = trieTree.prefixSearch(key);
41+
42+
for (String res : list) {
43+
res = res.replace(key, "\033[31;4m" + key + "\033[0m");
44+
System.out.println(res);
45+
}
46+
47+
} catch (Exception e) {
48+
LOGGER.error("Exception", e);
49+
}
50+
}
51+
}

‎cim-client/src/main/java/com/crossoverjie/cim/client/service/impl/command/PrintAllCommand.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.crossoverjie.cim.client.service.impl.command;
2+
3+
import com.crossoverjie.cim.client.service.InnerCommand;
4+
import com.crossoverjie.cim.common.enums.SystemCommandEnum;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
import org.springframework.stereotype.Service;
8+
9+
import java.util.Map;
10+
11+
/**
12+
* Function:
13+
*
14+
* @author crossoverJie
15+
* Date: 2019-01-27 19:37
16+
* @since JDK 1.8
17+
*/
18+
@Service
19+
public class PrintAllCommand implements InnerCommand {
20+
private final static Logger LOGGER = LoggerFactory.getLogger(PrintAllCommand.class);
21+
22+
@Override
23+
public void process(String msg) {
24+
Map<String, String> allStatusCode = SystemCommandEnum.getAllStatusCode();
25+
LOGGER.warn("====================================");
26+
for (Map.Entry<String, String> stringStringEntry : allStatusCode.entrySet()) {
27+
String key = stringStringEntry.getKey();
28+
String value = stringStringEntry.getValue();
29+
LOGGER.warn(key + "----->" + value);
30+
}
31+
LOGGER.warn("====================================");
32+
}
33+
}

0 commit comments

Comments
 (0)