File tree Expand file tree Collapse file tree 3 files changed +16
-6
lines changed
src/main/java/cn/jsmod2/client Expand file tree Collapse file tree 3 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ public static Client getInstance(){
2727 private ChannelFuture cf ;
2828 private ClientInitializer clientInitializer ;
2929 private CountDownLatch lathc ;
30+
3031 private Client (){
3132 lathc = new CountDownLatch (0 );
3233 clientInitializer = new ClientInitializer (lathc );
@@ -37,7 +38,6 @@ private Client(){
3738 .handler (clientInitializer );
3839 }
3940 public void connect (String ip ,int port ){
40- //192.168.43.51测试端口8766 192.168.43.102 线上端口8765
4141 try {
4242 this .cf = b .connect (ip , port ).sync ();
4343 } catch (InterruptedException e ) {
@@ -67,13 +67,13 @@ public String setMessage(String msg) {
6767 return JSON .toJSONString (new HashMap <String ,String >(){
6868 {
6969 put ("status" ,"500" );
70- put ("message" ,"unknown ipAddress " );
70+ put ("message" ,"null " );
7171 put ("value" ,"null" );
7272 }
7373 });
7474 }
7575 try {
76- ChannelFuture cf = getInstance () .getChannelFuture (ipAddress ,port );//单例模式获取ChannelFuture对象
76+ ChannelFuture cf = this .getChannelFuture (ipAddress ,port );//单例模式获取ChannelFuture对象
7777 cf .channel ().writeAndFlush (msg );
7878 //发送数据控制门闩加一
7979 lathc = new CountDownLatch (1 );
Original file line number Diff line number Diff line change @@ -21,6 +21,8 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
2121 @ Override
2222 public void channelRead (ChannelHandlerContext ctx , Object msg ) {
2323 result = (String ) msg ;
24+ System .out .println (result );
25+ System .out .println (result );
2426 lathc .countDown ();// 消息接收后释放同步锁,lathc是从Client加一传回来的
2527 }
2628
Original file line number Diff line number Diff line change @@ -56,8 +56,16 @@ private void initialize(){
5656 stream .setTextArea (consoleTextArea );
5757 new Thread (()->{
5858 while (true ){
59- Response response = new JsonRequester ().append ("type" ,"log" ).sendOut ();
60- stream .write (response .getMessage ());
59+ try {
60+ Response response = new JsonRequester ().append ("type" ,"log" ).sendOut ();
61+ if (response != null ) {
62+ if (!response .getMessage ().equals ("null" )) {
63+ stream .write (response .getMessage ());
64+ }
65+ }
66+ }catch (Exception e ){
67+ e .printStackTrace ();
68+ }
6169 }
6270 }).start ();
6371 }
@@ -67,7 +75,7 @@ public void onIpOK(){
6775 String text = ipText .getText ();
6876 if (text .contains (":" )){
6977 String [] map = text .split (":" );
70- Client .getInstance ().ipAddress = map [0 ];
78+ Client .getInstance ().ipAddress = map [0 ]. trim () ;
7179 Client .getInstance ().port = Integer .parseInt (map [1 ]);
7280 }else {
7381 Client .getInstance ().ipAddress = text ;
You can’t perform that action at this time.
0 commit comments