1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-14 02:35:41 +08:00

fix(chat): fix chatting server port

This commit is contained in:
Shidong Wang 2021-10-24 21:33:03 +08:00
parent 7916f8067a
commit 7797732b37
No known key found for this signature in database
GPG Key ID: 41BB7053E835C848
3 changed files with 381 additions and 376 deletions

View File

@ -29,7 +29,7 @@ endif
let s:chat_address = '127.0.0.1' let s:chat_address = '127.0.0.1'
let s:chat_port = 8080 let s:chat_port = 8080
let s:chat_client_jar = fnamemodify(expand('<sfile>:p:h:h:h:h') . 'bundle\Chatting-server\target\Chatting-1.0-SNAPSHOT.jar', ':gs?[\\/]?/?') let s:chat_client_jar = fnamemodify(expand('<sfile>:p:h:h:h:h') . '/bundle/Chatting-server/target/Chatting-1.0-SNAPSHOT.jar', ':gs?[\\/]?/?')
function! SpaceVim#layers#chat#plugins() abort function! SpaceVim#layers#chat#plugins() abort
return [ return [

View File

@ -45,6 +45,7 @@ public class Server extends ServerSocket {
public Server() throws IOException { public Server() throws IOException {
super(SERVER_PORT); super(SERVER_PORT);
System.out.println("Server started on port:" + SERVER_PORT);
try { try {
while (true) { while (true) {
Socket socket = accept(); Socket socket = accept();

View File

@ -16,6 +16,8 @@ let s:opened_channels = []
let s:unread_msg_num = {} let s:unread_msg_num = {}
let s:st_sep = '' let s:st_sep = ''
let s:JOB = SpaceVim#api#import('job')
function! s:push_message(msg) abort function! s:push_message(msg) abort
if type(a:msg) == type([]) if type(a:msg) == type([])
for m in a:msg for m in a:msg
@ -63,20 +65,22 @@ endfunction
function! chat#chatting#start() abort function! chat#chatting#start() abort
if s:server_job_id == 0 if s:server_job_id == 0
call chat#logger#info('startting server, server_lib is ' . s:server_lib . '(' . (empty(glob(s:server_lib)) ? 'no such file' : 'file exists' ). ')') call chat#logger#info('startting server, server_lib is ' . s:server_lib . '(' . (filereadable(s:server_lib) ? 'no such file' : 'file exists' ). ')')
if has('nvim') let s:server_job_id = s:JOB.start(['java', '-cp', s:server_lib, 'com.wsdjeg.chat.Server', '-D', s:server_port],{
let s:server_job_id = jobstart(['java', '-cp', s:server_lib, 'com.wsdjeg.chat.Server'],{
\ 'on_stdout' : function('s:server_handler'), \ 'on_stdout' : function('s:server_handler'),
\ 'on_exit' : function('s:server_exit'),
\ }) \ })
elseif exists('*job#start') && !has('nvim')
let s:server_job_id = job#start(['java', '-cp', s:server_lib, 'com.wsdjeg.chat.Server'],{
\ 'on_stdout' : function('s:server_handler'),
\ })
endif
endif endif
endfunction endfunction
function! s:server_handler(id, data, event) abort function! s:server_handler(id, data, event) abort
for data in a:data
call chat#logger#info('server stdout:' . data)
endfor
endfunction
function! s:server_exit(id, data, event) abort
call chat#logger#info('server exit with code:' . a:data)
endfunction endfunction
function! s:client_handler(id, data, event) abort function! s:client_handler(id, data, event) abort