diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java index feca73ae..a1ef6aaa 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java @@ -58,7 +58,7 @@ public class ProxyClient { logger.setLevel(level); } } catch (Exception e) { - log.error("日志级别设置失败", e); + log.error("logger level set failed", e); } } } diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java index a9256185..7dc39597 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java @@ -35,7 +35,7 @@ public class ProxyConfiguration implements LifecycleBean { @Override public void start() throws Throwable { List list = Solon.context().getBeansOfType(ProxyMessageHandler.class); - Dispatcher dispatcher = new DefaultDispatcher<>("消息调度器", list, + Dispatcher dispatcher = new DefaultDispatcher<>("MessageDispatcher", list, proxyMessage -> ProxyDataTypeEnum.of((int)proxyMessage.getType()) == null ? null : ProxyDataTypeEnum.of((int)proxyMessage.getType()).getName()); Solon.context().wrapAndPut(Dispatcher.class, dispatcher); diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java index 5d482fea..c5c153e9 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CmdChannelHandler.java @@ -49,7 +49,7 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - log.info("Client CmdChannel 与服务端断开连接"); + log.info("Client CmdChannel disconnect"); ProxyUtil.setCmdChannel(null); ProxyUtil.clearRealServerChannels(); @@ -69,14 +69,14 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler switch (event.state()) { case READER_IDLE: // 读超时，断开连接 - log.error("Client CmdChannel 读超时，断开连接"); + log.error("[Client CmdChannel] Read timeout disconnect"); ctx.channel().close(); break; case WRITER_IDLE: ctx.channel().writeAndFlush(ProxyMessage.buildHeartbeatMessage()); break; case ALL_IDLE: - log.error("Client CmdChannel 读写超时，断开连接"); + log.error("[Client CmdChannel] ReadWrite timeout disconnect"); ctx.close(); break; } diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java index 85e7b0f0..a8a17dd4 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelHandler.java @@ -64,14 +64,14 @@ public class ProxyChannelHandler extends SimpleChannelInboundHandler cache = Stream.of(values()).collect(Collectors.toMap(ProxyDataTypeEnum::getType, Function.identity())); private int type; diff --git a/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java index efc6959a..7d7a2896 100644 --- a/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java @@ -35,10 +35,10 @@ public class DefaultDispatcher implements Dispatcher matcher; public DefaultDispatcher(String name, List> handlerList, Function matcher) { - Assert.notNull(name, "名称不能为空!"); - Assert.notNull(matcher, "匹配器不能为空!"); + Assert.notNull(name, "name cannot empty!"); + Assert.notNull(matcher, "matcher cannot empty!"); if (CollectionUtil.isEmpty(handlerList)) { - log.error("{} 处理器列表为空.", name); + log.error("{} handler list empty.", name); return; } this.name = name == null ? "" : name; @@ -48,20 +48,20 @@ public class DefaultDispatcher implements Dispatcher implements Dispatcher handler = handlerMap.get(type); if (null == handler) { -// log.debug("{} 找不到匹配的处理器 type:{}", this.name, type); return; } String handlerName = handler.name(); if (StrUtil.isEmpty(handlerName)) { handlerName = TypeUtil.getSimpleName(handler.getClass()); } - log.debug("{} 处理器[{}]执行.", this.name, handlerName); + log.debug("{} handler[{}]execute.", this.name, handlerName); handler.handle(context, data); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java index e4fa7703..9bc95bc5 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java @@ -46,7 +46,7 @@ public class ProxyServer { logger.setLevel(level); } } catch (Exception e) { - log.error("日志级别设置失败", e); + log.error("logger level set failed", e); } } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java index 7d8ac075..a880798b 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java @@ -57,7 +57,7 @@ public class DBInitialize implements EventListener { dbTypeEnum = DbTypeEnum.of(dbConfig.getType()); Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!"); - log.info("{}数据库初始化...", dbConfig.getType()); + log.info("{} database init...", dbConfig.getType()); initDBStructure(); initDBData(); } @@ -82,7 +82,7 @@ public class DBInitialize implements EventListener { } sql += "\r\n" + line.trim(); if (sql.endsWith(";")) { - log.debug("初始化数据库表 sql:{}", sql); + log.debug("init database table sql:{}", sql); Db.update(sql); sql = ""; } @@ -116,7 +116,7 @@ public class DBInitialize implements EventListener { } sql += "\r\n" + line.trim(); if (sql.endsWith(";")) { - log.debug("初始化数据[table={}] sql:{}", tableName, sql); + log.debug("init database data[table={}] sql:{}", tableName, sql); Db.update(sql); sql = ""; } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java index 0976afa6..0228b462 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java @@ -38,7 +38,7 @@ public class ProxyConfiguration implements LifecycleBean { @Override public void start() throws Throwable { List list = Solon.context().getBeansOfType(ProxyMessageHandler.class); - Dispatcher dispatcher = new DefaultDispatcher<>("消息调度器", list, + Dispatcher dispatcher = new DefaultDispatcher<>("MessageDispatcher", list, proxyMessage -> ProxyDataTypeEnum.of((int)proxyMessage.getType()) == null ? null : ProxyDataTypeEnum.of((int)proxyMessage.getType()).getName()); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java index ab93f554..adb1cb68 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java @@ -74,7 +74,7 @@ public class BaseAuthInterceptor implements RouterInterceptor { } if (result instanceof Throwable) { - log.error("全局异常", (Throwable) result); + log.error("global error", (Throwable) result); if (result instanceof ServiceException) { ServiceException exception = (ServiceException) result; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java index c2f559bf..4ce17769 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java @@ -23,7 +23,7 @@ public class GlobalExceptionFilter implements Filter { try { chain.doFilter(ctx); } catch (Throwable e) { - log.error("全局异常", e); + log.error("global error", e); if (e instanceof ServiceException) { ServiceException serviceException = (ServiceException) e; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java index 181289da..8273b703 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java @@ -31,7 +31,7 @@ public class VisitLogInterceptor implements RouterInterceptor { } finally { Date now = new Date(); long elapsedTime = now.getTime() - startTime.getTime(); - log.debug("\n-----------------------------------------------------------------接口请求日志：\n{} url:{} 执行耗时:{}\n请求体参数:{}\n响应结果:{}\n客户端IP:{}\n", + log.debug("\n-----------------------------------------------------------------interface request log：\n{} url:{} elapsed time:{}\nrequest:{}\nresponse:{}\nclient ip:{}\n", ctx.method(), ctx.path(), getElapsedTimeStr(elapsedTime), JSONObject.toJSONString(ctx.paramMap()), JSONObject.toJSONString(JSONObject.toJSONString(ctx.result)), @@ -47,11 +47,11 @@ public class VisitLogInterceptor implements RouterInterceptor { */ private static String getElapsedTimeStr(long elapsedTime) { if (elapsedTime < 1000) { - return String.format("%s毫秒", elapsedTime); + return String.format("%sms", elapsedTime); } else if (elapsedTime < 60000) { - return String.format("%.2f秒", (elapsedTime * 1.0) / 1000); + return String.format("%.2fs", (elapsedTime * 1.0) / 1000); } - return String.format("%.2f分钟", (elapsedTime * 1.0) / 1000 / 60); + return String.format("%.2fm", (elapsedTime * 1.0) / 1000 / 60); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java index fb18839d..766b0495 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java @@ -70,37 +70,37 @@ public class DataCleanJob implements IJobHandler { { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getJobLogKeepDays()); - log.info("清理调度管理日志 date:{}", sdf.format(date)); + log.info("clean job log date:{}", sdf.format(date)); jobLogMapper.clean(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getUserLoginRecordKeepDays()); - log.info("清理用户登录日志 date:{}", sdf.format(date)); + log.info("clean user login record date:{}", sdf.format(date)); userLoginRecordMapper.clean(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getClientConnectRecordKeepDays()); - log.info("清理客户端连接日志 date:{}", sdf.format(date)); + log.info("clean client connect record date:{}", sdf.format(date)); clientConnectRecordMapper.clean(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowMinuteReportKeepDays()); - log.info("清理流通统计分钟报表日志 date:{}", sdf.format(date)); + log.info("clean flow report minute record date:{}", sdf.format(date)); flowReportMinuteMapper.clean(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowHourReportKeepDays()); - log.info("清理流通统计小时报表日志 date:{}", sdf.format(date)); + log.info("clean flow report hour record date:{}", sdf.format(date)); flowReportHourMapper.clean(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowDayReportKeepDays()); - log.info("清理流通统计日报表日志 date:{}", sdf.format(date)); + log.info("clean flow report day record date:{}", sdf.format(date)); flowReportDayMapper.clean(date); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java index a1f5927d..a3fc522e 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyTunnelChannelHandler.java @@ -136,7 +136,7 @@ public class ProxyTunnelChannelHandler extends SimpleChannelInboundHandler { }); try { bootstrap.bind(proxyConfig.getTunnel().getPort()).sync(); - log.info("代理服务启动，端口：{}", proxyConfig.getTunnel().getPort()); + log.info("proxy server started，port：{}", proxyConfig.getTunnel().getPort()); } catch (Exception e) { - log.error("代理服务异常", e); + log.error("proxy server error", e); } } @@ -80,9 +80,9 @@ public class ProxyTunnelServer implements EventListener { }); try { bootstrap.bind(proxyConfig.getTunnel().getSslPort()).sync(); - log.info("代理服务启动，SSL端口： {}", proxyConfig.getTunnel().getSslPort()); + log.info("proxy server started，SSL port： {}", proxyConfig.getTunnel().getSslPort()); } catch (Exception e) { - log.error("代理服务异常", e); + log.error("proxy server error", e); } } @@ -105,7 +105,7 @@ public class ProxyTunnelServer implements EventListener { return new SslHandler(sslEngine); } catch (Exception e) { - log.error("创建SSL处理器失败", e); + log.error("create SSL handler error", e); e.printStackTrace(); } return null; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java index 9c8716c9..85ccaeba 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java @@ -50,7 +50,7 @@ public class HttpProxy implements EventListener { } }); bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync(); - log.info("Http代理服务启动成功！port:{}", proxyConfig.getServer().getTcp().getHttpProxyPort()); + log.info("Http proxy server start success！port:{}", proxyConfig.getServer().getTcp().getHttpProxyPort()); } catch (Exception e) { log.error("http proxy start err!", e); } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java index 281cfda0..9b25ba10 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java @@ -59,7 +59,7 @@ public class HttpsProxy implements EventListener { } }); bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync(); - log.info("Https代理服务启动成功！port:{}", proxyConfig.getServer().getTcp().getHttpsProxyPort()); + log.info("Https proxy server started！port:{}", proxyConfig.getServer().getTcp().getHttpsProxyPort()); } catch (Exception e) { log.error("https proxy start err!", e); } @@ -84,7 +84,7 @@ public class HttpsProxy implements EventListener { return new SslHandler(sslEngine); } catch (Exception e) { - log.error("创建SSL处理器失败", e); + log.error("create SSL handler failed", e); e.printStackTrace(); } return null; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java index ce3509c8..2fc7a678 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java @@ -89,7 +89,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { } if (StrUtil.isEmpty(licenseKey)) { - log.warn("[客户端连接] license不能为空 info:{} ", info); + log.warn("[client connection] license cannot empty info:{} ", info); ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不能为空!", licenseKey)); ctx.channel().close(); clientConnectRecordService.add(new ClientConnectRecordDO() @@ -97,14 +97,14 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { .setType(ClientConnectTypeEnum.CONNECT.getType()) .setMsg(licenseKey) .setCode(SuccessCodeEnum.FAIL.getCode()) - .setErr("license不能为空!") + .setErr("license cannot empty!") .setCreateTime(now) ); return; } LicenseDO licenseDO = licenseService.findByKey(licenseKey); if (null == licenseDO) { - log.warn("[客户端连接] license不存在 info:{} ", info); + log.warn("[client connection] license notfound info:{} ", info); ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不存在!", licenseKey)); ctx.channel().close(); clientConnectRecordService.add(new ClientConnectRecordDO() @@ -112,14 +112,14 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { .setType(ClientConnectTypeEnum.CONNECT.getType()) .setMsg(licenseKey) .setCode(SuccessCodeEnum.FAIL.getCode()) - .setErr("license不存在!") + .setErr("license notfound!") .setCreateTime(now) ); return; } if (EnableStatusEnum.DISABLE.getStatus().equals(licenseDO.getEnable())) { - log.warn("[客户端连接] 当前license已被禁用 info:{} ", info); - ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被禁用!", licenseKey)); + log.warn("[client connection] the license disabled info:{} ", info); + ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "the license disabled!", licenseKey)); ctx.channel().close(); clientConnectRecordService.add(new ClientConnectRecordDO() .setIp(ip) @@ -127,14 +127,14 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { .setType(ClientConnectTypeEnum.CONNECT.getType()) .setMsg(licenseKey) .setCode(SuccessCodeEnum.FAIL.getCode()) - .setErr("当前license已被禁用!") + .setErr("the license disabled!") .setCreateTime(now)); return; } UserDO userDO = userService.findById(licenseDO.getUserId()); if (null == userDO || EnableStatusEnum.DISABLE.getStatus().equals(userDO.getEnable())) { - log.warn("[客户端连接] 当前license无效 info:{} ", info); - ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license无效!", licenseKey)); + log.warn("[client connection] the license invalid info:{} ", info); + ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "the license invalid!", licenseKey)); ctx.channel().close(); clientConnectRecordService.add(new ClientConnectRecordDO() .setIp(ip) @@ -142,7 +142,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { .setType(ClientConnectTypeEnum.CONNECT.getType()) .setMsg(licenseKey) .setCode(SuccessCodeEnum.FAIL.getCode()) - .setErr("当前license无效!") + .setErr("the license invalid!") .setCreateTime(now)); return; } @@ -150,8 +150,8 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { if (null != cmdChannel) { String _clientId = ProxyUtil.getClientIdByLicenseId(licenseDO.getId()); if (!clientId.equals(_clientId)) { - log.warn("[客户端连接] 当前license已被另一节点使用 info:{} _clientId:{}", info, _clientId); - ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被另一节点使用!", licenseKey)); + log.warn("[client connection] the license on another no used info:{} _clientId:{}", info, _clientId); + ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "the license on another no used!", licenseKey)); ctx.channel().close(); clientConnectRecordService.add(new ClientConnectRecordDO() .setIp(ip) @@ -159,13 +159,13 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { .setType(ClientConnectTypeEnum.CONNECT.getType()) .setMsg(licenseKey) .setCode(SuccessCodeEnum.FAIL.getCode()) - .setErr("当前license已被另一节点使用!") + .setErr("the license on another no used!") .setCreateTime(now)); return; } } // 发送认证成功消息 - ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.SUCCESS.getCode(), "认证成功!", licenseKey)); + ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.SUCCESS.getCode(), "auth success!", licenseKey)); clientConnectRecordService.add(new ClientConnectRecordDO() .setIp(ip) @@ -178,7 +178,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler { // 设置当前licenseId对应的客户端ID ProxyUtil.setLicenseIdToClientIdMap(licenseDO.getId(), clientId); - log.warn("[客户端连接] 认证成功 info:{} ", info); + log.warn("[client connection] auth success info:{} ", info); // 更新license在线状态 licenseMapper.updateOnlineStatus(licenseDO.getId(), OnlineStatusEnum.ONLINE.getStatus(), now); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java index b9fd3b44..546f4d6f 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java @@ -60,11 +60,11 @@ public class JobLogService implements IJobCallback { Integer code = 0; String msg = ""; if (null == throwable) { - msg = "执行成功"; - log.debug("job[id={},name={}]执行完毕", jobInfo.getId(), jobInfo.getName()); + msg = "execute success"; + log.debug("job[id={},name={}]execute success", jobInfo.getId(), jobInfo.getName()); } else { - log.error("job[id={},name={}]执行异常", jobInfo.getId(), jobInfo.getName(), throwable); - msg = "执行异常:\r\n" + ExceptionUtils.getStackTrace(throwable); + log.error("job[id={},name={}]execute error", jobInfo.getId(), jobInfo.getName(), throwable); + msg = "execute error:\r\n" + ExceptionUtils.getStackTrace(throwable); code = -1; } jobLogMapper.insert(new JobLogDO() diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java index c2fd3c63..222fa765 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java @@ -53,7 +53,7 @@ public class ProxyMutualService { Date now = new Date(); portMappingMapper.updateOnlineStatus(attachInfo.getLicenseId(), serverPort, OnlineStatusEnum.ONLINE.getStatus(), now); licenseMapper.updateOnlineStatus(attachInfo.getLicenseId(), OnlineStatusEnum.ONLINE.getStatus(), now); - log.info("绑定服务端端口 licenseId:{},ip:{},serverPort:{}", attachInfo.getLicenseId(), attachInfo.getIp(), serverPort); + log.info("bind server port licenseId:{},ip:{},serverPort:{}", attachInfo.getLicenseId(), attachInfo.getIp(), serverPort); } /** @@ -64,7 +64,7 @@ public class ProxyMutualService { Date now = new Date(); portMappingMapper.updateOnlineStatus(attachInfo.getLicenseId(), OnlineStatusEnum.OFFLINE.getStatus(), now); licenseMapper.updateOnlineStatus(attachInfo.getLicenseId(), OnlineStatusEnum.OFFLINE.getStatus(), now); - log.info("客户端下线 licenseId:{},ip:{}", attachInfo.getLicenseId(), attachInfo.getIp()); + log.info("client offline licenseId:{},ip:{}", attachInfo.getLicenseId(), attachInfo.getIp()); } } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java index 3b55ff79..dd10d6e1 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java @@ -232,10 +232,10 @@ public class VisitorChannelService { NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(portMapping.getProtocal()); if (networkProtocolEnum == NetworkProtocolEnum.UDP) { udpServerBootstrap.bind(portMapping.getServerPort()).get(); - log.info("绑定UDP用户端口： {}", portMapping.getServerPort()); + log.info("bind UDP user port： {}", portMapping.getServerPort()); } else { tcpServerBootstrap.bind(portMapping.getServerPort()).get(); - log.info("绑定TCP用户端口： {}", portMapping.getServerPort()); + log.info("bind TCP user port： {}", portMapping.getServerPort()); } } catch (Exception ex) { // BindException表示该端口已经绑定过