p71924506
/
LuckyFrameClient
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

处理客户端无法重复获取错误截图问题及清理缓存图片

This commit is contained in:
fengjian 2020-03-03 23:01:40 +08:00
parent 2d828b0e97
commit 0ef1d4e77a
2 changed files with 89 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/main/java/luckyclient/netty/ClientHandler.java
View File

@ -4,6 +4,7 @@ import java.io.*;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
@ -36,21 +37,18 @@ public class ClientHandler extends ChannelHandlerAdapter {
private static String port = props.getProperty("server.port");
static final String ECHO_REQ = "$_";
private static final Logger log = LoggerFactory.getLogger(ClientHandler.class);
private static final String HOST_NAME= SysConfig.getConfiguration().getProperty("host.name");
private static final String HOST_NAME = SysConfig.getConfiguration().getProperty("host.name");
private static final String CLIENT_VERSION= SysConfig.getConfiguration().getProperty("client.verison");
private static final String CLIENT_VERSION = SysConfig.getConfiguration().getProperty("client.verison");
private static final String SERVER_IP= SysConfig.getConfiguration().getProperty("server.web.ip");
private static final String SERVER_IP = SysConfig.getConfiguration().getProperty("server.web.ip");
private static final String SERVER_PORT= SysConfig.getConfiguration().getProperty("server.web.port");
private static final String SERVER_PORT = SysConfig.getConfiguration().getProperty("server.web.port");
private int byteRead;
private volatile int start = 0;
private volatile int lastLength = 0;
@ -64,98 +62,90 @@ public class ClientHandler extends ChannelHandlerAdapter {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws UnsupportedEncodingException, InterruptedException {
//服务端消息处理,如果接收到测试任务方法，则直接产生一个http请求并发送请求到本地
String jsonStr=new String(msg.toString().getBytes(),"UTF-8");
JSONObject json=new JSONObject();
try
{
json= JSON.parseObject(jsonStr);
//服务端消息处理,如果接收到测试任务方法，则直接产生一个http请求并发送请求到本地
String jsonStr = new String(msg.toString().getBytes(), "UTF-8");
JSONObject json = new JSONObject();
try {
json = JSON.parseObject(jsonStr);
}catch (Exception e)
{
System.out.println("收到服务端非Json消息："+jsonStr);
} catch (Exception e) {
System.out.println("收到服务端非Json消息,但是异常：" + jsonStr);
return;
}
System.out.println("收到服务端消息："+json.toString());
System.out.println("收到服务端消息：" + json.toString());
//解析消息
if("run".equals(json.get("method"))){
if ("run".equals(json.get("method"))) {
try {
//返回请求
JSONObject re=new JSONObject();
re.put("method","return");
Result result=new Result(1,"同步等待消息返回",json.get("uuid").toString(),null);
JSONObject re = new JSONObject();
re.put("method", "return");
Result result = new Result(1, "同步等待消息返回", json.get("uuid").toString(), null);
//如果是调度请求，则发起一个HTTP请求
//获取是get方法还是post方法
String getOrPost=json.get("getOrPost").toString();
String urlParam="http://127.0.0.1:"+port+"/"+json.get("url").toString();
Integer socketTimeout=Integer.valueOf(json.get("socketTimeout").toString());
String tmpResult="";
if("get".equals(getOrPost))
{
String getOrPost = json.get("getOrPost").toString();
String urlParam = "http://127.0.0.1:" + port + "/" + json.get("url").toString();
Integer socketTimeout = Integer.valueOf(json.get("socketTimeout").toString());
String tmpResult = "";
if ("get".equals(getOrPost)) {
@SuppressWarnings("unchecked")
Map<String,Object> jsonparams = (Map<String,Object>)json.get("data");
Map<String, Object> jsonparams = (Map<String, Object>) json.get("data");
//get方法
try {
tmpResult=HttpRequest.httpClientGet(urlParam,jsonparams,socketTimeout);
tmpResult = HttpRequest.httpClientGet(urlParam, jsonparams, socketTimeout);
} catch (Exception e) {
System.out.println("转发服务端GET请求出错");
}
}
else
{
String jsonparams=json.get("data").toString();
} else {
String jsonparams = json.get("data").toString();
//post方法
try {
tmpResult=HttpRequest.httpClientPost(urlParam,jsonparams,socketTimeout);
tmpResult = HttpRequest.httpClientPost(urlParam, jsonparams, socketTimeout);
} catch (Exception e) {
System.out.println("转发服务端POST请求出错");
}
}
result.setMessage(tmpResult);
re.put("data",result);
re.put("data", result);
sendMessage(re.toString());
} catch (InterruptedException e) {
e.printStackTrace();
}
}
else if("download".equals(json.get("method"))){
String loadpath=json.get("path").toString();
String path = System.getProperty("user.dir")+loadpath;
String fileName=json.get("fileName").toString();
} else if ("download".equals(json.get("method"))) {
String loadpath = json.get("path").toString();
String path = System.getProperty("user.dir") + loadpath;
String fileName = json.get("fileName").toString();
//发出http请求下载文件
try {
HttpRequest.downLoadFromUrl("http://"+SERVER_IP+":"+SERVER_PORT+"/common/download?fileName="+fileName,fileName,path);
HttpRequest.downLoadFromUrl("http://" + SERVER_IP + ":" + SERVER_PORT + "/common/download?fileName=" + fileName, fileName, path);
//返回请求
JSONObject re=new JSONObject();
Result result=new Result(1,"上传成功",json.get("uuid").toString(),null);
re.put("method","return");
re.put("data",result);
JSONObject re = new JSONObject();
Result result = new Result(1, "上传成功", json.get("uuid").toString(), null);
re.put("method", "return");
re.put("data", result);
sendMessage(re.toString());
System.out.println("下载驱动包成功,路径为："+path+";文件名为："+fileName);
System.out.println("下载驱动包成功,路径为：" + path + ";文件名为：" + fileName);
} catch (Exception e) {
e.printStackTrace();
//返回请求
JSONObject re=new JSONObject();
Result result=new Result(0,"上传失败",json.get("uuid").toString(),null);
re.put("method","return");
re.put("data",result);
JSONObject re = new JSONObject();
Result result = new Result(0, "上传失败", json.get("uuid").toString(), null);
re.put("method", "return");
re.put("data", result);
sendMessage(re.toString());
System.out.println("下载驱动包失败,路径为："+path+";文件名为："+fileName);
System.out.println("下载驱动包失败,路径为：" + path + ";文件名为：" + fileName);
}
}
else if("upload".equals(json.get("method")))
{
//上传截图到服务器
Map<String,Object> jsonparams = (Map<String,Object>)json.get("data");
String fileName=jsonparams.get("imgName").toString();
String ctxPath = System.getProperty("user.dir")+File.separator+"log"+File.separator+"ScreenShot"+File.separator+fileName;
File file=new File(ctxPath);
int start=Integer.valueOf(json.get("start").toString());
FileUploadFile fileUploadFile=new FileUploadFile();
fileUploadFile.setFile(file);
if (start != -1) {
try {
if(start==0)
} else if ("upload".equals(json.get("method"))) {
try {
//上传截图到服务器
Map<String, Object> jsonparams = (Map<String, Object>) json.get("data");
String fileName = jsonparams.get("imgName").toString();
String ctxPath = System.getProperty("user.dir") + File.separator + "log" + File.separator + "ScreenShot" + File.separator + fileName;
File file = new File(ctxPath);
int start = Integer.valueOf(json.get("start").toString());
FileUploadFile fileUploadFile = new FileUploadFile();
fileUploadFile.setFile(file);
if (start != -1) {
if (start == 0)
lastLength = 1024 * 10;
randomAccessFile = new RandomAccessFile(fileUploadFile.getFile(), "r");
randomAccessFile.seek(start); //将文件定位到start
@ -167,18 +157,19 @@ public class ClientHandler extends ChannelHandlerAdapter {
}
System.out.println("文件长度：" + (randomAccessFile.length()) + ",start:" + start + ",a:" + a + ",b:" + b + ",lastLength:" + lastLength);
byte[] bytes = new byte[lastLength];
System.out.println("bytes的长度是="+bytes.length);
System.out.println("bytes的长度是=" + bytes.length);
if ((byteRead = randomAccessFile.read(bytes)) != -1 && (randomAccessFile.length() - start) > 0) {
System.out.println("byteRead = " + byteRead);
System.out.println("byteRead = " + byteRead);
fileUploadFile.setEndPos(byteRead);
fileUploadFile.setBytes(bytes);
//返回请求
JSONObject re=new JSONObject();
Result result=new Result(1,"上传成功",json.get("uuid").toString(),fileUploadFile);
re.put("method","upload");
re.put("data",result);
re.put("uuid",json.get("uuid").toString());
re.put("imgName",fileName);
JSONObject re = new JSONObject();
Result result = new Result(1, "上传成功", json.get("uuid").toString(), fileUploadFile);
re.put("method", "upload");
re.put("data", result);
re.put("uuid", json.get("uuid").toString());
re.put("imgName", fileName);
re.put("start", start);
sendMessage(re.toString());
try {
ctx.writeAndFlush(fileUploadFile);
@ -189,17 +180,22 @@ public class ClientHandler extends ChannelHandlerAdapter {
randomAccessFile.close();
System.out.println("文件已经读完channelRead()--------" + byteRead);
//返回请求
JSONObject re=new JSONObject();
Result result=new Result(1,"上传成功",json.get("uuid").toString(),null);
re.put("method","return");
re.put("data",result);
JSONObject re = new JSONObject();
Result result = new Result(1, "上传成功", json.get("uuid").toString(), null);
re.put("method", "return");
re.put("data", result);
sendMessage(re.toString());
}
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
//返回请求
JSONObject re = new JSONObject();
Result result = new Result(0, "异常错误", json.get("uuid").toString(), null);
re.put("method", "return");
re.put("data", result);
sendMessage(re.toString());
}
}
@ -209,17 +205,16 @@ public class ClientHandler extends ChannelHandlerAdapter {
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
//发送客户端登录消息
JSONObject json=new JSONObject();
json.put("hostName",HOST_NAME);
json.put("version",CLIENT_VERSION);
json.put("method","clientUp");
ClientHandler.ctx=ctx;
JSONObject json = new JSONObject();
json.put("hostName", HOST_NAME);
json.put("version", CLIENT_VERSION);
json.put("method", "clientUp");
ClientHandler.ctx = ctx;
sendMessage(json.toString());
}
@Override
public void channelInactive(ChannelHandlerContext ctx)
{
public void channelInactive(ChannelHandlerContext ctx) {
System.out.println("连接已断开，正在尝试重连...");
//使用过程中断线重连
final EventLoop eventLoop = ctx.channel().eventLoop();
@ -250,10 +245,11 @@ public class ClientHandler extends ChannelHandlerAdapter {
IdleStateEvent event = (IdleStateEvent) evt;
if (event.state().equals(IdleState.READER_IDLE)) {
/**发送心跳,保持长连接*/
JSONObject json=new JSONObject();
json.put("method","ping");
json.put("hostName",HOST_NAME);
ctx.channel().writeAndFlush(json.toString()+"$_").sync();
JSONObject json = new JSONObject();
json.put("method", "ping");
json.put("hostName", HOST_NAME);
//ctx.channel().writeAndFlush(json.toString() + "$_").sync();
sendMessage(json.toString());
//log.info("心跳发送成功!");
}
}
@ -262,6 +258,6 @@ public class ClientHandler extends ChannelHandlerAdapter {
public static void sendMessage(String json) throws InterruptedException {
ctx.channel().writeAndFlush(Unpooled.copiedBuffer((json+"$_").getBytes()));
ctx.channel().writeAndFlush(Unpooled.copiedBuffer((json + "$_").getBytes()));
}
}

2
src/main/java/luckyclient/netty/NettyClient.java
View File

@ -51,9 +51,9 @@ public class NettyClient {
public void initChannel(SocketChannel ch) throws Exception {
ByteBuf delimiter = Unpooled.copiedBuffer("$_".getBytes());
ChannelPipeline p = ch.pipeline();
p.addLast(new DelimiterBasedFrameDecoder(1024, delimiter));
p.addLast("decoder", new StringDecoder());
p.addLast("encoder", new StringEncoder());
p.addLast(new DelimiterBasedFrameDecoder(1024, delimiter));
p.addLast(new IdleStateHandler(1,0,0,TimeUnit.SECONDS));
p.addLast(clientHandler);
}